diff options
| author | Mickael Istria | 2017-06-25 16:42:05 +0000 |
|---|---|---|
| committer | Markus Knauer | 2017-07-03 13:07:41 +0000 |
| commit | 21a7658574de95508f0e68ae863ed42bbf703d2f (patch) | |
| tree | 9c35722c84fae32ee9d8505e3fe8b1687f4eed68 /releng/org.eclipse.epp.config/parent | |
| parent | 1bc1e9d8d4571f36b76fc10b387c3ea6627d8ae2 (diff) | |
| download | org.eclipse.epp.packages-21a7658574de95508f0e68ae863ed42bbf703d2f.tar.gz org.eclipse.epp.packages-21a7658574de95508f0e68ae863ed42bbf703d2f.tar.xz org.eclipse.epp.packages-21a7658574de95508f0e68ae863ed42bbf703d2f.zip | |
Bug 518965 - Skip assemble-repository step
Those steps seems useless for the target use-case, so let's skip them to
save time, and rely on alternative strategy to create the EPP p2 repo.
Change-Id: Ib7524e631f98919b244ce0d9e2e8f278242c0930
Signed-off-by: Mickael Istria <mistria@redhat.com>
Diffstat (limited to 'releng/org.eclipse.epp.config/parent')
| -rw-r--r-- | releng/org.eclipse.epp.config/parent/pom.xml | 26 | ||||
| -rw-r--r-- | releng/org.eclipse.epp.config/parent/product/pom.xml | 18 |
2 files changed, 34 insertions, 10 deletions
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml index b56eafe9..ee661587 100644 --- a/releng/org.eclipse.epp.config/parent/pom.xml +++ b/releng/org.eclipse.epp.config/parent/pom.xml @@ -25,7 +25,7 @@ <properties> <java.version>1.8</java.version> <maven.version>3.1.1</maven.version> - <tycho.version>1.0.0</tycho.version> + <tycho.version>1.1.0-SNAPSHOT</tycho.version> <tycho.extras.version>${tycho.version}</tycho.extras.version> <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/epp/org.eclipse.epp.packages.git</tycho.scmUrl> <cbi.version>1.1.5-SNAPSHOT</cbi.version> @@ -65,6 +65,10 @@ <id>eclipse-cbi</id> <url>https://repo.eclipse.org/content/groups/cbi/</url> </pluginRepository> + <pluginRepository> + <id>tycho-snapshots</id> + <url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</url> + </pluginRepository> </pluginRepositories> <repositories> @@ -317,6 +321,26 @@ </plugin> <plugin> <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-repository-plugin</artifactId> + <executions> + <execution> + <id>default-assemble-repository</id> + <phase></phase> + <configuration> + <skip>true</skip> + </configuration> + </execution> + <execution> + <id>default-archive-repository</id> + <phase></phase> + <configuration> + <skip>true</skip> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2-director-plugin</artifactId> <version>${tycho.version}</version> <executions> diff --git a/releng/org.eclipse.epp.config/parent/product/pom.xml b/releng/org.eclipse.epp.config/parent/product/pom.xml index 83fc446d..b5ed96a0 100644 --- a/releng/org.eclipse.epp.config/parent/product/pom.xml +++ b/releng/org.eclipse.epp.config/parent/product/pom.xml @@ -41,6 +41,7 @@ <plugin> <groupId>org.eclipse.tycho.extras</groupId> <artifactId>tycho-p2-extras-plugin</artifactId> + <version>1.1.0-SNAPSHOT</version> <executions> <execution> <id>mirror-to-central-epp-repository</id> @@ -49,15 +50,13 @@ <goal>mirror</goal> </goals> <configuration> - <source> - <repository> - <url>${project.build.directory}/repository</url> - </repository> - </source> + <targetPlatformAsSource>true</targetPlatformAsSource> + <currentModuleAsSource>true</currentModuleAsSource> + <source/> <ius> <iu> <query> - <expression>id ~= /*epp*/ && !(id ~= /*org.eclipse.epp.mpc*/) && !(id ~= /*org.eclipse.epp.logging.aeri*/)</expression> + <expression>id ~= /*epp.package*/</expression> </query> </iu> </ius> @@ -68,6 +67,7 @@ <includeOptional>false</includeOptional> <includeNonGreedy>false</includeNonGreedy> <includePacked>true</includePacked> + <mirrorMetadataOnly>false</mirrorMetadataOnly> <append>true</append> </configuration> </execution> @@ -79,7 +79,7 @@ <artifactId>tycho-p2-director-plugin</artifactId> </plugin> - <plugin> + <!-- plugin> <groupId>org.eclipse.cbi.maven.plugins</groupId> <artifactId>eclipse-dmg-packager</artifactId> <executions> @@ -91,11 +91,11 @@ <configuration> <source>${project.build.directory}/products/${build}_eclipse-${eclipse.epp.id}-${eclipse.simultaneous.release.id}-macosx.cocoa.x86_64.tar.gz</source> <sign>${eclipse-sign-dmg-property}</sign> - <connectTimeoutMillis>600000</connectTimeoutMillis> <!-- 10 min --> + <connectTimeoutMillis>600000</connectTimeoutMillis> </configuration> </execution> </executions> - </plugin> + </plugin--> <plugin> <groupId>org.apache.maven.plugins</groupId> |