Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2019-03-14 17:25:39 -0400
committerMichael Keppler2019-03-15 12:49:22 -0400
commit73925448c5e875e09a5596443b47c6fec8d4e9ca (patch)
tree864800ec605f3d5606fe2f9baab06d1f43dc2a16 /org.eclipse.egit.repository
parent11ca19912d54f1d7a4d85028c1120a88ad499ac4 (diff)
downloadegit-73925448c5e875e09a5596443b47c6fec8d4e9ca.tar.gz
egit-73925448c5e875e09a5596443b47c6fec8d4e9ca.tar.xz
egit-73925448c5e875e09a5596443b47c6fec8d4e9ca.zip
Tycho repository build: specify execution environment
The default is JavaSE-1.7. If we don't specify it explicitly, typcho-eclipserun appears to use a JRE 7, which doesn't understand some of the command-line options needed on the new Kubernetes build infrastructure. Change-Id: I34e2b6f7b0c06e520ad8594522ccdf6e3f75b434 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.repository')
-rw-r--r--org.eclipse.egit.repository/pom.xml47
1 files changed, 24 insertions, 23 deletions
diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml
index 158b956f8..e370d9839 100644
--- a/org.eclipse.egit.repository/pom.xml
+++ b/org.eclipse.egit.repository/pom.xml
@@ -120,29 +120,30 @@
</goals>
<phase>package</phase>
<configuration>
- <appArgLine>-application org.eclipse.wtp.releng.tools.addRepoProperties</appArgLine>
- <!-- See <http://wiki.eclipse.org/Equinox/p2/p2.mirrorsURL>. -->
- <!-- See <http://wiki.eclipse.org/Equinox_p2_download_stats>. -->
- <argLine>-DartifactRepoDirectory=${project.build.directory}/repository -Dp2MirrorsURL=${p2MirrorsURL} -Dp2StatsURI=${p2StatsURL} -DstatsTrackedArtifacts=${statsTrackedArtifacts} -DstatsArtifactsSuffix=-${project.version}</argLine>
- <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/staging/neon/</url>
- <layout>p2</layout>
- </repository>
- </repositories>
- </configuration>
- </execution>
- </executions>
+ <executionEnvironment>JavaSE-1.8</executionEnvironment>
+ <appArgLine>-application org.eclipse.wtp.releng.tools.addRepoProperties</appArgLine>
+ <!-- See <http://wiki.eclipse.org/Equinox/p2/p2.mirrorsURL>. -->
+ <!-- See <http://wiki.eclipse.org/Equinox_p2_download_stats>. -->
+ <argLine>-DartifactRepoDirectory=${project.build.directory}/repository -Dp2MirrorsURL=${p2MirrorsURL} -Dp2StatsURI=${p2StatsURL} -DstatsTrackedArtifacts=${statsTrackedArtifacts} -DstatsArtifactsSuffix=-${project.version}</argLine>
+ <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/staging/neon/</url>
+ <layout>p2</layout>
+ </repository>
+ </repositories>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>

Back to the top