Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Bettini2016-07-05 08:55:30 +0000
committerLorenzo Bettini2016-07-05 08:55:30 +0000
commitc7c269ed840d5dc6a7b0d19012a5d138d4ea602e (patch)
tree5c3cdee88dbfab174cb5e24a15d20cfe501ccc51
parentc29709ddc0e1229b6dc892980420ef6fcd38b388 (diff)
downloadorg.eclipse.emf-parsley-c7c269ed840d5dc6a7b0d19012a5d138d4ea602e.tar.gz
org.eclipse.emf-parsley-c7c269ed840d5dc6a7b0d19012a5d138d4ea602e.tar.xz
org.eclipse.emf-parsley-c7c269ed840d5dc6a7b0d19012a5d138d4ea602e.zip
add repo properties only when releasing
To avoid problems in standard builds due to load repository http://download.eclipse.org/webtools/releng/repository Change-Id: I21ffa323b5d6f1426a3dd4c5d7fa998bf13b251e
-rw-r--r--releng/org.eclipse.emf.parsley.repository/pom.xml70
1 files changed, 35 insertions, 35 deletions
diff --git a/releng/org.eclipse.emf.parsley.repository/pom.xml b/releng/org.eclipse.emf.parsley.repository/pom.xml
index b53f595af..5eba9f16b 100644
--- a/releng/org.eclipse.emf.parsley.repository/pom.xml
+++ b/releng/org.eclipse.emf.parsley.repository/pom.xml
@@ -32,41 +32,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-eclipserun-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>add-repo-properties</id>
- <goals>
- <goal>eclipse-run</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <appArgLine>-application org.eclipse.wtp.releng.tools.addRepoProperties</appArgLine>
- <argLine><![CDATA[-DartifactRepoDirectory=${project.build.directory}/repository -Dp2MirrorsURL=${p2.mirrorsURL} -Dp2StatsURI=${p2.statsURL} -DstatsTrackedArtifacts=${p2.statsTrackedArtifacts} -DstatsArtifactsSuffix=-${project.version}]]></argLine>
- <work>${project.build.directory}/eclipserun-work-first</work>
- <dependencies>
- <dependency>
- <artifactId>org.eclipse.wtp.releng.tools.feature</artifactId>
- <type>eclipse-feature</type>
- </dependency>
- </dependencies>
- <repositories>
- <repository>
- <url>http://download.eclipse.org/webtools/releng/repository</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <url>http://download.eclipse.org/releases/mars</url>
- <layout>p2</layout>
- </repository>
- </repositories>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<!-- copy the p2 repository into the project root folder
to allow for easier archiving in CI server -->
<artifactId>maven-antrun-plugin</artifactId>
@@ -137,6 +102,41 @@
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-eclipserun-plugin</artifactId>
<version>${tycho-version}</version>
+ <executions>
+ <execution>
+ <id>add-repo-properties</id>
+ <goals>
+ <goal>eclipse-run</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <appArgLine>-application org.eclipse.wtp.releng.tools.addRepoProperties</appArgLine>
+ <argLine><![CDATA[-DartifactRepoDirectory=${project.build.directory}/repository -Dp2MirrorsURL=${p2.mirrorsURL} -Dp2StatsURI=${p2.statsURL} -DstatsTrackedArtifacts=${p2.statsTrackedArtifacts} -DstatsArtifactsSuffix=-${project.version}]]></argLine>
+ <work>${project.build.directory}/eclipserun-work-first</work>
+ <dependencies>
+ <dependency>
+ <artifactId>org.eclipse.wtp.releng.tools.feature</artifactId>
+ <type>eclipse-feature</type>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <repository>
+ <url>http://download.eclipse.org/webtools/releng/repository</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <url>http://download.eclipse.org/releases/mars</url>
+ <layout>p2</layout>
+ </repository>
+ </repositories>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-eclipserun-plugin</artifactId>
+ <version>${tycho-version}</version>
<configuration>
<appArgLine>-application org.eclipse.ant.core.antRunner -buildfile ${project.basedir}/../org.eclipse.emf.parsley.parent/ant/packaging-p2composite.ant p2.composite.add -Dsoftware.download.area=${parsley.download.area} -Dupdates.dir=${parsley.updates.dir} -Dsite.label="Emf Parsley Site" -Dproject.build.directory=${project.build.directory} -DunqualifiedVersion=${unqualifiedVersion} -DbuildQualifier=${buildQualifier}</appArgLine>
<repositories>

Back to the top