move tycho-p2-plugin and tycho-source-feature-plugin to the features/pom.xml so it actually runs Signed-off-by: nickboldt <nboldt@redhat.com>
diff --git a/features/pom.xml b/features/pom.xml index b1ff35a..6235628 100644 --- a/features/pom.xml +++ b/features/pom.xml
@@ -10,6 +10,18 @@ <groupId>org.eclipse.datatools</groupId> <artifactId>features</artifactId> <packaging>pom</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-source-feature-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + </plugin> + </plugins> + </build> <modules> <module>org.eclipse.datatools.common.doc.user</module> <module>org.eclipse.datatools.connectivity.doc.user</module>
diff --git a/pom.xml b/pom.xml index 0a48e0d..992f10f 100644 --- a/pom.xml +++ b/pom.xml
@@ -106,29 +106,7 @@ <version>${tycho-version}</version> <extensions>true</extensions> </plugin> - <!-- to skip this check, use -Dtycho.baseline=disable --> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <version>${tycho-version}</version> - <executions> - <execution> - <id>attached-p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - <configuration> - <baselineReplace>none</baselineReplace> - <baselineRepositories> - <repository> - <url>${lastStableRepository}</url> - </repository> - </baselineRepositories> - </configuration> - </plugin> + <!-- to skip this check, use -DskipBaselineComparison=true --> <plugin> <groupId>org.eclipse.tycho.extras</groupId> @@ -221,20 +199,6 @@ </executions> </plugin> <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-source-feature-plugin</artifactId> - <version>${tycho-extras-version}</version> - <executions> - <execution> - <id>source-feature</id> - <phase>package</phase> - <goals> - <goal>source-feature</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-packaging-plugin</artifactId> <version>${tycho-version}</version> @@ -277,6 +241,48 @@ </configuration> </plugin> </plugins> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-source-feature-plugin</artifactId> + <version>${tycho-extras-version}</version> + <executions> + <execution> + <id>source-feature</id> + <phase>package</phase> + <goals> + <goal>source-feature</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- to skip this check, use -Dtycho.baseline=disable --> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attached-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + <configuration> + <!-- <baselineReplace>none</baselineReplace> --> + <!-- <baselineRepositories> + <repository> + <url>${lastStableRepository}</url> + </repository> + </baselineRepositories> --> + </configuration> + </plugin> + </plugins> + </pluginManagement> </build> <profiles>