diff options
author | Camille Letavernier | 2014-08-20 15:43:03 +0000 |
---|---|---|
committer | Camille Letavernier | 2014-08-20 15:43:03 +0000 |
commit | 2ddada0845b7a24ce8f308483bac2f789e8f9a5b (patch) | |
tree | 117668cf401281d7809326dd9f41bd2a5b160722 /releng | |
parent | f5dedf98b7d157dcab57c71c5a3e6d4818ab6a6d (diff) | |
download | org.eclipse.papyrus-2ddada0845b7a24ce8f308483bac2f789e8f9a5b.tar.gz org.eclipse.papyrus-2ddada0845b7a24ce8f308483bac2f789e8f9a5b.tar.xz org.eclipse.papyrus-2ddada0845b7a24ce8f308483bac2f789e8f9a5b.zip |
[Releng - Tycho] Fix pack200, Update Repositories & Rmaps
Diffstat (limited to 'releng')
9 files changed, 64 insertions, 83 deletions
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap index 99face3f51c..7932f414c73 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly-tests/build.rmap @@ -211,7 +211,7 @@ <!-- EMF Facet -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMF Facet",0) -->
- <rm:uri format="{0}/facet/updates/integration/0.4.0/I201405190853/">
+ <rm:uri format="{0}/facet/updates/integration/0.4.1/I201407310909/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -219,7 +219,7 @@ <!-- MDT UML2 -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MDT UML2",0) -->
- <rm:uri format="{0}/modeling/mdt/uml2/updates/5.0">
+ <rm:uri format="{0}/modeling/mdt/uml2/updates/5.0.x">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -290,7 +290,7 @@ <!-- GMP -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("GMF Runtime",0) -->
- <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/maintenance/M201408081400/">
+ <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/maintenance/M201408201453/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap index 2d0bd5f3ab7..479a1402ce9 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-extra-nightly/build.rmap @@ -318,7 +318,7 @@ <!-- EMF Facet -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("EMF Facet",0) -->
- <rm:uri format="{0}/facet/updates/integration/0.4.0/I201405190853/">
+ <rm:uri format="{0}/facet/updates/integration/0.4.1/I201407310909/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -326,7 +326,7 @@ <!-- MDT UML2 -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MDT UML2",0) -->
- <rm:uri format="{0}/modeling/mdt/uml2/updates/5.0">
+ <rm:uri format="{0}/modeling/mdt/uml2/updates/5.0.x">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -400,7 +400,7 @@ <!-- GMP -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("GMF Runtime",0) -->
- <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/maintenance/M201408081400/">
+ <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/maintenance/M201408201453/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap index 75905681636..9e876ddaa6c 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly-tests/build.rmap @@ -262,7 +262,7 @@ <!-- MDT UML2 -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MDT UML2",0) -->
- <rm:uri format="{0}/modeling/mdt/uml2/updates/5.0">
+ <rm:uri format="{0}/modeling/mdt/uml2/updates/5.0.x">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -334,7 +334,7 @@ <!-- GMP -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("GMF Runtime",0) -->
- <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/maintenance/M201408081400/">
+ <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/maintenance/M201408201453/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap index d2993cd072d..803cc5bcd41 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap @@ -465,7 +465,7 @@ <!-- MDT UML2 -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("MDT UML2",0) -->
- <rm:uri format="{0}/modeling/mdt/uml2/updates/5.0">
+ <rm:uri format="{0}/modeling/mdt/uml2/updates/5.0.x">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
@@ -537,7 +537,7 @@ <!-- GMP -->
<rm:provider componentTypes="eclipse.feature,osgi.bundle" mutable="false" readerType="p2" source="false">
<!-- updateFrom("GMF Runtime",0) -->
- <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/maintenance/M201408081400/">
+ <rm:uri format="{0}/modeling/gmp/gmf-runtime/updates/maintenance/M201408201453/">
<bc:propertyRef key="eclipse.downloads"/>
</rm:uri>
</rm:provider>
diff --git a/releng/top-pom-dev.xml b/releng/top-pom-dev.xml index 26d92e7c9da..a1bf265ce33 100755 --- a/releng/top-pom-dev.xml +++ b/releng/top-pom-dev.xml @@ -137,20 +137,6 @@ <defaultP2Metadata>false</defaultP2Metadata> </configuration> </plugin> - <!-- Pack200 --> - <plugin> - <groupId>org.eclipse.tycho.extras</groupId> - <artifactId>tycho-pack200b-plugin</artifactId> - <version>${tychoExtrasVersion}</version> - <executions> - <execution> - <id>pack200-pack</id> - <goals> - <goal>pack</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> </project>
\ No newline at end of file diff --git a/releng/top-pom-extra-tests.xml b/releng/top-pom-extra-tests.xml index f07b720a70e..0883908fe25 100644 --- a/releng/top-pom-extra-tests.xml +++ b/releng/top-pom-extra-tests.xml @@ -54,7 +54,7 @@ <id>emft-emffacet</id>
<layout>p2</layout>
<!-- updateFrom("EMF Facet",0) -->
- <url>http://download.eclipse.org/facet/updates/integration/0.4.0/I201405190853/</url>
+ <url>http://download.eclipse.org/facet/updates/integration/0.4.1/I201407310909/</url>
</repository>
<repository>
<id>emf-cdo</id>
@@ -126,7 +126,7 @@ <id>gmp-gmf-runtime</id>
<layout>p2</layout>
<!-- updateFrom("GMF Runtime",0) -->
- <url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/maintenance/M201408081400/</url>
+ <url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/maintenance/M201408201453/</url>
</repository>
<repository>
<id>gmf-tooling</id>
@@ -162,7 +162,7 @@ <id>mdt-uml2</id>
<layout>p2</layout>
<!-- updateFrom("MDT UML2",0) -->
- <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0</url>
+ <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0.x</url>
</repository>
<repository>
<id>mmt-qvto</id>
@@ -308,20 +308,6 @@ </dependencies>
</configuration>
</plugin>
- <!-- Pack200 -->
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-pack200b-plugin</artifactId>
- <version>${tychoExtrasVersion}</version>
- <executions>
- <execution>
- <id>pack200-pack</id>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/releng/top-pom-extras.xml b/releng/top-pom-extras.xml index 50b31aea456..dc01959a4c1 100755 --- a/releng/top-pom-extras.xml +++ b/releng/top-pom-extras.xml @@ -165,7 +165,7 @@ <id>emft-emffacet</id>
<layout>p2</layout>
<!-- updateFrom("EMF Facet",0) -->
- <url>http://download.eclipse.org/facet/updates/integration/0.4.0/I201405190853/</url>
+ <url>http://download.eclipse.org/facet/updates/integration/0.4.1/I201407310909/</url>
</repository>
<repository>
<id>emf-cdo</id>
@@ -237,7 +237,7 @@ <id>gmp-gmf-runtime</id>
<layout>p2</layout>
<!-- updateFrom("GMF Runtime",0) -->
- <url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/maintenance/M201408081400/</url>
+ <url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/maintenance/M201408201453/</url>
</repository>
<repository>
<id>gmf-tooling</id>
@@ -273,7 +273,7 @@ <id>mdt-uml2</id>
<layout>p2</layout>
<!-- updateFrom("MDT UML2",0) -->
- <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0</url>
+ <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0.x</url>
</repository>
<repository>
<id>mmt-qvto</id>
@@ -389,24 +389,19 @@ </execution>
</executions>
</plugin>
+ <!-- Pack200 -->
<plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho-version}</version>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
<executions>
<execution>
- <id>attach-p2-metadata</id>
- <phase>package</phase>
+ <id>pack200-normalize</id>
<goals>
- <goal>p2-metadata</goal>
+ <goal>normalize</goal>
</goals>
</execution>
</executions>
- <configuration>
- <defaultP2Metadata>false</defaultP2Metadata>
- </configuration>
</plugin>
- <!-- Pack200 -->
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId>
@@ -420,6 +415,23 @@ </execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <defaultP2Metadata>false</defaultP2Metadata>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/releng/top-pom-main-tests.xml b/releng/top-pom-main-tests.xml index 4da8068853e..468470fbff6 100644 --- a/releng/top-pom-main-tests.xml +++ b/releng/top-pom-main-tests.xml @@ -153,7 +153,7 @@ <id>gmp-gmf-runtime</id>
<layout>p2</layout>
<!-- updateFrom("GMF Runtime",0) -->
- <url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/maintenance/M201408081400/</url>
+ <url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/maintenance/M201408201453/</url>
</repository>
<repository>
<id>gmf-tooling</id>
@@ -189,7 +189,7 @@ <id>mdt-uml2</id>
<layout>p2</layout>
<!-- updateFrom("MDT UML2",0) -->
- <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0</url>
+ <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0.x</url>
</repository>
<repository>
<id>mmt-qvto</id>
@@ -336,20 +336,6 @@ </dependencies>
</configuration>
</plugin>
- <!-- Pack200 -->
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-pack200b-plugin</artifactId>
- <version>${tychoExtrasVersion}</version>
- <executions>
- <execution>
- <id>pack200-pack</id>
- <goals>
- <goal>pack</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/releng/top-pom-main.xml b/releng/top-pom-main.xml index e919b328e44..9467e5488ab 100755 --- a/releng/top-pom-main.xml +++ b/releng/top-pom-main.xml @@ -372,7 +372,7 @@ <id>gmp-gmf-runtime</id>
<layout>p2</layout>
<!-- updateFrom("GMF Runtime",0) -->
- <url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/maintenance/M201408081400/</url>
+ <url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/maintenance/M201408201453/</url>
</repository>
<repository>
<id>gmf-tooling</id>
@@ -408,7 +408,7 @@ <id>mdt-uml2</id>
<layout>p2</layout>
<!-- updateFrom("MDT UML2",0) -->
- <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0</url>
+ <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0.x</url>
</repository>
<repository>
<id>mmt-qvto</id>
@@ -538,24 +538,19 @@ </execution>
</executions>
</plugin>
+ <!-- Pack200 -->
<plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho-version}</version>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-pack200a-plugin</artifactId>
<executions>
<execution>
- <id>attach-p2-metadata</id>
- <phase>package</phase>
+ <id>pack200-normalize</id>
<goals>
- <goal>p2-metadata</goal>
+ <goal>normalize</goal>
</goals>
</execution>
</executions>
- <configuration>
- <defaultP2Metadata>false</defaultP2Metadata>
- </configuration>
</plugin>
- <!-- Pack200 -->
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId>
@@ -569,6 +564,23 @@ </execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>attach-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <defaultP2Metadata>false</defaultP2Metadata>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
@@ -606,7 +618,6 @@ <executions>
<execution>
<id>sign</id>
- <phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
|