diff options
author | Uwe Stieber | 2014-11-01 16:20:25 +0000 |
---|---|---|
committer | Uwe Stieber | 2014-11-01 16:20:25 +0000 |
commit | 1bc450e38e7c11f4ca2a8675fb636a2e0c484eeb (patch) | |
tree | 35f9eb9aeb0a74446e8dca4ca677a8f115b91e0e | |
parent | 67b313a6527ef0dfadc063d7481dff06762763f6 (diff) | |
download | org.eclipse.tcf-1bc450e38e7c11f4ca2a8675fb636a2e0c484eeb.tar.gz org.eclipse.tcf-1bc450e38e7c11f4ca2a8675fb636a2e0c484eeb.tar.xz org.eclipse.tcf-1bc450e38e7c11f4ca2a8675fb636a2e0c484eeb.zip |
Releng: Adjust the order of Tycho p2-metadata generation relative to the signing
-rw-r--r-- | admin/pom-config.xml | 58 |
1 files changed, 30 insertions, 28 deletions
diff --git a/admin/pom-config.xml b/admin/pom-config.xml index 7a4425834..b38cc9618 100644 --- a/admin/pom-config.xml +++ b/admin/pom-config.xml @@ -249,34 +249,6 @@ </plugin> <plugin> <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-p2-plugin</artifactId> - <version>${tycho-version}</version> - <!-- Signing appears to mess with the baseline repository logic. - Disable the baseline repository until we've figured out what is going on. --> - <!-- - <configuration> - <baselineRepositories> - <repository> - <url>http://download.eclipse.org/tools/tcf/builds/${tcf-stream}/nightly</url> - </repository> - </baselineRepositories> - </configuration> - --> - <executions> - <execution> - <id>p2-metadata</id> - <phase>package</phase> - <goals> - <goal>p2-metadata</goal> - </goals> - </execution> - </executions> - <configuration> - <defaultP2Metadata>false</defaultP2Metadata> - </configuration> - </plugin> - <plugin> - <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2-repository-plugin</artifactId> <version>${tycho-version}</version> <configuration> @@ -370,6 +342,36 @@ </execution> </executions> </plugin> + <!-- Keep the tycho-p2-plugin after the tycho-pack200b-plugin --> + <!-- Tycho p2 metadata generation shall happen _after_ the JAR has been packed. --> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <!-- Signing appears to mess with the baseline repository logic. + Disable the baseline repository until we've figured out what is going on. --> + <!-- + <configuration> + <baselineRepositories> + <repository> + <url>http://download.eclipse.org/tools/tcf/builds/${tcf-stream}/nightly</url> + </repository> + </baselineRepositories> + </configuration> + --> + <executions> + <execution> + <id>p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + <configuration> + <defaultP2Metadata>false</defaultP2Metadata> + </configuration> + </plugin> </plugins> </pluginManagement> </build> |