Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2020-08-17 04:08:37 -0400
committerEd Merks2020-08-17 04:24:28 -0400
commitfab48f69f8ff1c7e80b292823d643ff614e18abf (patch)
tree01461fa517333ca740635dfc4b8b3eb0a9b4d7f3
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>
-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
-rw-r--r--tests/org.eclipse.emf.test.xml/META-INF/MANIFEST.MF8
-rw-r--r--tests/org.eclipse.emf.test.xml/pom.xml2
5 files changed, 8 insertions, 8 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>
diff --git a/tests/org.eclipse.emf.test.xml/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.test.xml/META-INF/MANIFEST.MF
index 621fbf95c..577fce1fb 100644
--- a/tests/org.eclipse.emf.test.xml/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.test.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.test.xml;singleton:=true
-Bundle-Version: 2.13.0.qualifier
+Bundle-Version: 2.14.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,11 +15,11 @@ Export-Package: org.eclipse.emf.test.xml,
org.eclipse.emf.test.xml.xsdecore
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.18.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)",
- org.eclipse.xsd;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.xsd;bundle-version="[2.18.0,3.0.0)",
org.junit;bundle-version="[4.12.0,5.0.0)",
- org.eclipse.emf.test.common;bundle-version="[1.8.0,2.0.0)"
+ org.eclipse.emf.test.common;bundle-version="[1.9.0,2.0.0)"
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.emf.test.xml
diff --git a/tests/org.eclipse.emf.test.xml/pom.xml b/tests/org.eclipse.emf.test.xml/pom.xml
index e73df128e..1f714c59f 100644
--- a/tests/org.eclipse.emf.test.xml/pom.xml
+++ b/tests/org.eclipse.emf.test.xml/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.test.xml</artifactId>
- <version>2.13.0-SNAPSHOT</version>
+ <version>2.14.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
</project>

Back to the top