[RelEng] Use JavaSE-11 for tests

eclipse-mpc · Oct 1, 2020 · 8ab00c7 · 8ab00c7
1 parent 0817988
commit 8ab00c7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/org.eclipse.epp.mpc-parent/toolchains-sample.xml b/org.eclipse.epp.mpc-parent/toolchains-sample.xml
@@ -45,5 +45,16 @@
         <jdkHome>C:/Program Files/Java/jdk1.8.0/jre</jdkHome>
      </configuration>
   </toolchain>
+  <toolchain>
+     <type>jdk</type>
+     <provides>
+         <id>JavaSE-11</id>
+         <version>1.11</version>
+         <vendor>AdoptOpenJDK</vendor>
+     </provides>
+     <configuration>
+        <jdkHome>C:/Program Files/AdoptOpenJDK/jdk-11.0.0/</jdkHome>
+     </configuration>
+  </toolchain>
 
 </toolchains>
diff --git a/org.eclipse.epp.mpc.tests/META-INF/MANIFEST.MF b/org.eclipse.epp.mpc.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Marketplace Client Tests
 Bundle-SymbolicName: org.eclipse.epp.mpc.tests
 Bundle-Version: 1.8.5.qualifier
 Bundle-Vendor: Eclipse Marketplace Client
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.epp.mpc.core;bundle-version="[1.8.5,2.0.0)",

diff --git a/org.eclipse.epp.mpc.tests/pom.xml b/org.eclipse.epp.mpc.tests/pom.xml
@@ -67,6 +67,7 @@
 
               <!-- run all tests with a space in the application path (this is the osgi.install.area, but the configuration area should follow suit -->
               <work>${project.build.directory}/work/test rcp</work>
+              <useJDK>BREE</useJDK>
             </configuration>
           </plugin>
        </plugins>