Update minimum Java version to 17

JGit did that in I27e85b3ab4c2e21c86d69d8707eeb9547d788287. Change-Id: I8ada3bd45cc7911388e8104ba2fddccfbf7f8212
eclipse-egit · Jul 11, 2024 · 3fe42cc · 3fe42cc
1 parent 30380f4
commit 3fe42cc
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 33 deletions.
diff --git a/org.eclipse.egit.core.junit/.classpath b/org.eclipse.egit.core.junit/.classpath
@@ -5,7 +5,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF b/org.eclipse.egit.core.junit/META-INF/MANIFEST.MF
@@ -24,6 +24,6 @@ Import-Package: org.eclipse.egit.core;version="[7.0.0,7.1.0)",
  org.eclipse.jgit.transport;version="[7.0.0,7.1.0)",
  org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)",
  org.eclipse.jgit.util;version="[7.0.0,7.1.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: org.eclipse.egit.core.test;version="7.0.0";x-friends:="org.eclipse.egit.core.test,org.eclipse.egit.ui.test,org.eclipse.egit.gitflow.test"
 Bundle-Localization: plugin
diff --git a/org.eclipse.egit.core.test/.classpath b/org.eclipse.egit.core.test/.classpath
@@ -5,7 +5,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/org.eclipse.egit.core.test/META-INF/MANIFEST.MF b/org.eclipse.egit.core.test/META-INF/MANIFEST.MF
@@ -30,4 +30,4 @@ Import-Package: net.bytebuddy;version="[1.7.9,2.0.0)",
  org.mockito;version="[5.4.0,6.0.0)",
  org.mockito.junit;version="[5.4.0,6.0.0)",
  org.mockito.stubbing;version="[5.4.0,6.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/org.eclipse.egit.core/.classpath b/org.eclipse.egit.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/org.eclipse.egit.core/META-INF/MANIFEST.MF b/org.eclipse.egit.core/META-INF/MANIFEST.MF
@@ -61,7 +61,7 @@ Export-Package: org.eclipse.egit.core;version="7.0.0";
  org.eclipse.egit.core.synchronize.dto;version="7.0.0";x-friends:="org.eclipse.egit.ui",
  org.eclipse.egit.core.util;version="7.0.0"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: org.bouncycastle.openpgp;version="[1.77,2)",
  org.bouncycastle.openpgp.bc;version="[1.77,2)",
  org.bouncycastle.pkcs;version="[1.77,2)",

diff --git a/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html b/org.eclipse.egit.doc/help/EGit/Contributor_Guide/Builds.html
@@ -42,7 +42,7 @@ <h1 id="Builds">Builds</h1>
 		<p>Prerequisites for the Maven build are</p>
 		<ul>
 			<li>since 6.7 
-				<a href="https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/201773" target="egit_external">(#201773)</a> Java 17, still compiled for Java 11, required by Tycho 4.0 used to build OSGi artefacts
+				<a href="https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/201773" target="egit_external">(#201773)</a> Java 17
 				<ul>
 					<li>since 6.0 Java 11</li>
 					<li>older versions need Java 8 </li>
@@ -61,7 +61,7 @@ <h1 id="Builds">Builds</h1>
 		<h2 id="JGit_2">JGit</h2>
 		<ul>
 			<li>JGit can be built using Maven or Bazel</li>
-			<li>use Java 17 to run the JGit build, it's compiled for Java 11 but Tycho 4.0 used to build OSGi artefacts requires Java 17</li>
+			<li>use Java 17 to run the JGit build</li>
 			<li>JGit packaging projects (Eclipse features and p2 repository) are built using Maven and Tycho.</li>
 		</ul>
 		<h2 id="EGit_2">EGit</h2>
@@ -90,21 +90,11 @@ <h2 id="Maven_Build">Maven Build</h2>
    &lt;toolchain&gt;
       &lt;type&gt;jdk&lt;/type&gt;
       &lt;provides&gt;
-         &lt;id&gt;JavaSE-1.8&lt;/id&gt;
-         &lt;version&gt;1.8&lt;/version&gt;
+         &lt;id&gt;JavaSE-17&lt;/id&gt;
+         &lt;version&gt;17&lt;/version&gt;
       &lt;/provides&gt;
       &lt;configuration&gt;
-         &lt;jdkHome&gt;/absolute/path/to/jdk1.8&lt;/jdkHome&gt;
-      &lt;/configuration&gt;
-   &lt;/toolchain&gt;
-   &lt;toolchain&gt;
-      &lt;type&gt;jdk&lt;/type&gt;
-      &lt;provides&gt;
-         &lt;id&gt;JavaSE-11&lt;/id&gt;
-         &lt;version&gt;11&lt;/version&gt;
-      &lt;/provides&gt;
-      &lt;configuration&gt;
-         &lt;jdkHome&gt;/absolute/path/to/jdk11&lt;/jdkHome&gt;
+         &lt;jdkHome&gt;/absolute/path/to/jdk17&lt;/jdkHome&gt;
       &lt;/configuration&gt;
    &lt;/toolchain&gt;
 &lt;/toolchains&gt;
@@ -114,6 +104,7 @@ <h2 id="Maven_Build">Maven Build</h2>
 		<ul>
 			<li>EGit versions &gt;= 6.0.0 require at least Java 11 to build, and require a Java 11 toolchain definition for running the tests.</li>
 			<li>EGit versions &gt;= 6.6.0 require at least Java 17 to build, and require a Java 11 toolchain definition for running the tests.</li>
+			<li>EGit versions &gt;= 7.0.0 require at least Java 17</li>
 		</ul>
 		<ul>
 			<li>JGit versions &lt; 6.0.0 with maven require running maven with Java 1.8 in all cases.</li>

diff --git a/org.eclipse.egit.gitflow.test/.classpath b/org.eclipse.egit.gitflow.test/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.test/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.egit.gitflow.test
 Bundle-SymbolicName: org.eclipse.egit.gitflow.test;singleton:=true
 Bundle-Version: 7.0.0.qualifier
 Fragment-Host: org.eclipse.egit.gitflow
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: org.eclipse.egit.core;version="[7.0.0,7.1.0)",
  org.eclipse.jgit.junit;version="[7.0.0,7.1.0)",
  org.junit.rules;version="[4.13.0,5.0.0)",

diff --git a/org.eclipse.egit.gitflow.ui/.classpath b/org.eclipse.egit.gitflow.ui/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Automatic-Module-Name: org.eclipse.egit.gitflow.ui
 Bundle-SymbolicName: org.eclipse.egit.gitflow.ui;singleton:=true
 Bundle-Version: 7.0.0.qualifier
 Bundle-Activator: org.eclipse.egit.gitflow.ui.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin

diff --git a/org.eclipse.egit.gitflow/.classpath b/org.eclipse.egit.gitflow/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF b/org.eclipse.egit.gitflow/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.egit.gitflow;singleton:=true
 Bundle-Version: 7.0.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Activator: org.eclipse.egit.gitflow.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)"

diff --git a/org.eclipse.egit.repository/pom.xml b/org.eclipse.egit.repository/pom.xml
@@ -48,7 +48,7 @@
           </goals>
           <phase>package</phase>
           <configuration>
-           <executionEnvironment>JavaSE-11</executionEnvironment>
+           <executionEnvironment>JavaSE-17</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>. -->

diff --git a/org.eclipse.egit.ui.test/.classpath b/org.eclipse.egit.ui.test/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF b/org.eclipse.egit.ui.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Automatic-Module-Name: org.eclipse.egit.ui.test
 Bundle-SymbolicName: org.eclipse.egit.ui.test;singleton:=true
 Fragment-Host: org.eclipse.egit.ui
 Bundle-Version: 7.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)",
  org.eclipse.core.filesystem;bundle-version="[1.9.500,2.0.0)",
  org.eclipse.core.resources;bundle-version="[3.18.100,4.0.0)",

diff --git a/org.eclipse.egit.ui/.classpath b/org.eclipse.egit.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>

diff --git a/org.eclipse.egit.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.ui/META-INF/MANIFEST.MF
@@ -34,7 +34,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.26.100,4.0.0)",
  org.eclipse.e4.ui.workbench;bundle-version="[1.14.0,2.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.127.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: org.eclipse.egit.core;version="[7.0.0,7.1.0)",
  org.eclipse.egit.core.attributes;version="[7.0.0,7.1.0)",
  org.eclipse.egit.core.credentials;version="[7.0.0,7.1.0)",

diff --git a/pom.xml b/pom.xml
@@ -64,7 +64,7 @@
     <maven-version-minimum>3.9.0</maven-version-minimum>
     <egit-version>7.0.0-SNAPSHOT</egit-version>
     <tycho-version>4.0.6</tycho-version>
-    <java-version>11</java-version>
+    <java-version>17</java-version>
     <ecj-version>3.33.0</ecj-version>
     <spotbugs-maven-plugin-version>4.8.5.0</spotbugs-maven-plugin-version>
     <jgit-site>file:/${basedir}/../../jgit/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/target/repository</jgit-site>