Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorEd Merks2020-08-17 04:08:37 -0400
committerEd Merks2020-08-17 04:24:28 -0400
commitfab48f69f8ff1c7e80b292823d643ff614e18abf (patch)
tree01461fa517333ca740635dfc4b8b3eb0a9b4d7f3 /releng
parent09496f3d1afb01acfacfa692b10b6ab883c44ef9 (diff)
downloadorg.eclipse.emf-fab48f69f8ff1c7e80b292823d643ff614e18abf.tar.gz
org.eclipse.emf-fab48f69f8ff1c7e80b292823d643ff614e18abf.tar.xz
org.eclipse.emf-fab48f69f8ff1c7e80b292823d643ff614e18abf.zip
[Releng] Increment versions for test.xml
Also fix the environment used to run ant. And fix the local tycho build to use Java 11. Signed-off-by: Ed Merks <ed.merks@gmail.com>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.parent/plugins/pom.xml2
-rw-r--r--releng/org.eclipse.emf.releng/EMF.setup2
-rw-r--r--releng/org.eclipse.emf.releng/publish/pom.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/releng/org.eclipse.emf.parent/plugins/pom.xml b/releng/org.eclipse.emf.parent/plugins/pom.xml
index f7fb1e50f..533605197 100644
--- a/releng/org.eclipse.emf.parent/plugins/pom.xml
+++ b/releng/org.eclipse.emf.parent/plugins/pom.xml
@@ -158,7 +158,7 @@
</execution>
</executions>
<configuration>
- <executionEnvironment>JavaSE-1.8</executionEnvironment>
+ <executionEnvironment>JavaSE-11</executionEnvironment>
<appArgLine>-consolelog -debug -application org.eclipse.ant.core.antRunner -data target/workspace -quiet -buildfile .externalToolBuilders/copyExample.ant</appArgLine>
<argLine>-Dbuild.project=. -Dproject=${project.artifactId}</argLine>
<repositories>
diff --git a/releng/org.eclipse.emf.releng/EMF.setup b/releng/org.eclipse.emf.releng/EMF.setup
index c6208b084..d23235c67 100644
--- a/releng/org.eclipse.emf.releng/EMF.setup
+++ b/releng/org.eclipse.emf.releng/EMF.setup
@@ -261,7 +261,7 @@
<setupTask
xsi:type="setup:StringSubstitutionTask"
name="maven.build.java.home"
- value="${jre.location-1.8}">
+ value="${jre.location-11}">
<description>The location used to specify JAVA_HOME in the External Tools Configurations for Build EMF and Build EMF Releng</description>
</setupTask>
<setupTask
diff --git a/releng/org.eclipse.emf.releng/publish/pom.xml b/releng/org.eclipse.emf.releng/publish/pom.xml
index 6d90b66bf..c57840d0f 100644
--- a/releng/org.eclipse.emf.releng/publish/pom.xml
+++ b/releng/org.eclipse.emf.releng/publish/pom.xml
@@ -66,7 +66,7 @@
<url>https://download.eclipse.org/cbi/updates/aggregator/headless/4.8/I20180518-0759</url>
</repository>
</repositories>
- <executionEnvironment>JavaSE-1.8</executionEnvironment>
+ <executionEnvironment>JavaSE-11</executionEnvironment>
</configuration>
</plugin>
<plugin>

Back to the top