bump update site and root/folder poms to 1.14.300-SNAPSHOT; switch to tycho 2.5 and remove pack200 stuff Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/examples/pom.xml b/examples/pom.xml index 4ce58a9..4f9ea95 100644 --- a/examples/pom.xml +++ b/examples/pom.xml
@@ -5,10 +5,11 @@ <parent> <groupId>org.eclipse.datatools</groupId> <artifactId>org.eclipse.datatools</artifactId> - <version>1.14.102-SNAPSHOT</version> + <version>1.14.300-SNAPSHOT</version> </parent> <groupId>org.eclipse.datatools</groupId> <artifactId>examples</artifactId> + <version>1.14.102-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.eclipse.datatools.connectivity.oda.jdbc.dbprofile.sample</module>
diff --git a/features/pom.xml b/features/pom.xml index 5d0f02d..1ba641c 100644 --- a/features/pom.xml +++ b/features/pom.xml
@@ -5,10 +5,11 @@ <parent> <groupId>org.eclipse.datatools</groupId> <artifactId>org.eclipse.datatools</artifactId> - <version>1.14.102-SNAPSHOT</version> + <version>1.14.300-SNAPSHOT</version> </parent> <groupId>org.eclipse.datatools</groupId> <artifactId>features</artifactId> + <version>1.14.102-SNAPSHOT</version> <packaging>pom</packaging> <build> <plugins>
diff --git a/plugins/pom.xml b/plugins/pom.xml index 1a77de9..06828da 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml
@@ -5,10 +5,11 @@ <parent> <groupId>org.eclipse.datatools</groupId> <artifactId>org.eclipse.datatools</artifactId> - <version>1.14.102-SNAPSHOT</version> + <version>1.14.300-SNAPSHOT</version> </parent> <groupId>org.eclipse.datatools</groupId> <artifactId>plugins</artifactId> + <version>1.14.102-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>connectivity</module>
diff --git a/pom.xml b/pom.xml index 0a63a2b..3739aa8 100644 --- a/pom.xml +++ b/pom.xml
@@ -4,12 +4,12 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.datatools</groupId> <artifactId>org.eclipse.datatools</artifactId> - <version>1.14.102-SNAPSHOT</version> + <version>1.14.300-SNAPSHOT</version> <packaging>pom</packaging> <properties> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/datatools/org.eclipse.datatools.git</tycho.scmUrl> - <tycho-version>2.3.0</tycho-version> + <tycho-version>2.5.0</tycho-version> <tycho-extras-version>${tycho-version}</tycho-extras-version> <tycho-repo.url>https://oss.sonatype.org/content/repositories/public/</tycho-repo.url> <tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url> @@ -294,23 +294,6 @@ </configuration> </plugin> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200a-plugin</artifactId> - <version>${tycho-extras-version}</version> - <configuration> - <fork>true</fork> - </configuration> - <executions> - <execution> - <id>pack200-normalize</id> - <goals> - <goal>normalize</goal> - </goals> - <phase>verify</phase> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-jarsigner-plugin</artifactId> <version>${cbi-plugins.version}</version> @@ -325,23 +308,6 @@ </executions> </plugin> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tycho-extras-version}</version> - <configuration> - <fork>true</fork> - </configuration> - <executions> - <execution> - <id>pack200-pack</id> - <goals> - <goal>pack</goal> - </goals> - <phase>verify</phase> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2-plugin</artifactId> <version>${tycho-version}</version>
diff --git a/site/pom.xml b/site/pom.xml index 7277ed7..b66ab31 100644 --- a/site/pom.xml +++ b/site/pom.xml
@@ -5,10 +5,9 @@ <parent> <groupId>org.eclipse.datatools</groupId> <artifactId>org.eclipse.datatools</artifactId> - <version>1.14.102-SNAPSHOT</version> + <version>1.14.300-SNAPSHOT</version> </parent> <groupId>org.eclipse.datatools</groupId> <artifactId>site</artifactId> - <version>1.14.201-SNAPSHOT</version> <packaging>eclipse-repository</packaging> </project>
diff --git a/tests/pom.xml b/tests/pom.xml index 4235b79..44d7ccb 100644 --- a/tests/pom.xml +++ b/tests/pom.xml
@@ -5,10 +5,11 @@ <parent> <groupId>org.eclipse.datatools</groupId> <artifactId>org.eclipse.datatools</artifactId> - <version>1.14.102-SNAPSHOT</version> + <version>1.14.300-SNAPSHOT</version> </parent> <groupId>org.eclipse.datatools</groupId> <artifactId>tests</artifactId> + <version>1.14.102-SNAPSHOT</version> <packaging>pom</packaging> <modules> <module>org.eclipse.datatools.connectivity.oda.consumer.testdriver</module>