require java 17

Bananeweizen · Calixte · commit 97d25fb828a6 · 2024-03-19T14:48:18.000-04:00
* require Java 17 at runtime * require Eclipse 2022-09 as minimum target platform version (that's the first platform version requiring Java 17) * require eclipse.core 3.26, which is the plugin version contained in 2022-09. This avoids someone installing an upgrade in an older version * remove Java 11 build * require JUnit 5.9, since that version was delivered with Eclipse 2022-09 See #659 for a discussion, that the main checkstyle project will switch to Java 17 soon. We need to switch latest at the same time, but it's also fine to switch earlier.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest, macos-latest, windows-latest]
-        jdk: [11, 17, 21]
+        jdk: [17, 21]
     runs-on: ${{ matrix.platform }}
     permissions:
       checks: write
@@ -43,6 +43,6 @@ jobs:
     - name: Publish Test Results
       uses: EnricoMi/publish-unit-test-result-action@f355d34d53ad4e7f506f699478db2dd71da9de5f # v2.15.1
       # we only want to attach test results one time, not for every matrix combination
-      if: startsWith(matrix.platform, 'ubuntu') && (matrix.jdk == 11)
+      if: startsWith(matrix.platform, 'ubuntu') && (matrix.jdk == 17)
       with:
         files: '**/target/surefire-reports/*.xml'
diff --git a/docs/partials/index.html b/docs/partials/index.html
@@ -8,7 +8,7 @@ <h1>Eclipse Checkstyle Plugin</h1>
                     <p style="margin-bottom: 5px;">
                         <a class="btn btn-primary btn-outline-inverse btn-lg" target="_blank"
                             href="http://marketplace.eclipse.org/marketplace-client-intro?mpc_install=150"
-                            title="Drag and drop this link into a running Eclipse (2021-06 or higher version) workspace to install the Eclipse Checkstyle Plugin">
+                            title="Drag and drop this link into a running Eclipse (2022-09 or higher version) workspace to install the Eclipse Checkstyle Plugin">
                             <i class="fa fa-plug">
                             </i>
                             Install
@@ -24,7 +24,7 @@ <h1>Eclipse Checkstyle Plugin</h1>
                     <small>
                         <sup>1 </sup>
                         Install via Eclipse Marketplace. Drag and drop this link into a running Eclipse
-                        (2021-06 or higher version) workspace. Latest release 10.14.1, see
+                        (2022-09 or higher version) workspace. Latest release 10.14.1, see
                         <a href="#!/releasenotes">release notes</a>.
                     </small>
                 </div>
diff --git a/docs/partials/install.html b/docs/partials/install.html
@@ -8,11 +8,11 @@ <h1>Installation</h1>
             <p>
                 <a class="btn btn-primary btn-outline-inverse btn-lg" target="_blank"
                     href="http://marketplace.eclipse.org/marketplace-client-intro?mpc_install=150"
-                    title="Drag and drop this link into a running Eclipse (2021-06 or higher version) workspace to install Checkstyle Plugin"
+                    title="Drag and drop this link into a running Eclipse (2022-09 or higher version) workspace to install Checkstyle Plugin"
                         ><i class="fa fa-plug"> </i> Install </a>
             </p>
             <ol>
-                <li>Drag&amp;Drop the link above to a running Eclipse instance (2021-06 or higher version). This will trigger the
+                <li>Drag&amp;Drop the link above to a running Eclipse instance (2022-09 or higher version). This will trigger the
                     Eclipse Marketplace client with the Eclipse Checkstyle Plugin being pre-selected for
                     installation.</li>
                 <li>Confirm the selection of features to install.</li>
diff --git a/net.sf.eclipsecs-feature/feature.xml b/net.sf.eclipsecs-feature/feature.xml
@@ -23,7 +23,7 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.22.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.core.runtime" version="3.26.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources"/>
       <import plugin="org.eclipse.jdt.core"/>
       <import plugin="org.eclipse.team.core"/>
diff --git a/net.sf.eclipsecs-updatesite/pom.xml b/net.sf.eclipsecs-updatesite/pom.xml
@@ -135,9 +135,9 @@
                         <configuration>
                             <repositories>
                                 <repository>
-                                    <id>2021-06</id>
+                                    <id>2022-09</id>
                                     <layout>p2</layout>
-                                    <url>https://download.eclipse.org/releases/2021-06</url>
+                                    <url>https://download.eclipse.org/releases/2022-09</url>
                                 </repository>
                             </repositories>
                             <dependencies>
diff --git a/net.sf.eclipsecs.checkstyle/.classpath b/net.sf.eclipsecs.checkstyle/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry exported="true" kind="lib" path="checkstyle-10.14.1-all.jar" sourcepath="checkstyle-checkstyle-10.14.1.zip"/>
-	<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="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/net.sf.eclipsecs.checkstyle/.settings/org.eclipse.jdt.core.prefs b/net.sf.eclipsecs.checkstyle/.settings/org.eclipse.jdt.core.prefs
@@ -21,9 +21,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -125,7 +125,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
diff --git a/net.sf.eclipsecs.checkstyle/META-INF/MANIFEST.MF b/net.sf.eclipsecs.checkstyle/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: net.sf.eclipsecs.checkstyle
 Bundle-Version: 10.14.1.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Export-Package: .,
  com.puppycrawl.tools.checkstyle,
  com.puppycrawl.tools.checkstyle.api;
diff --git a/net.sf.eclipsecs.core/.classpath b/net.sf.eclipsecs.core/.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/net.sf.eclipsecs.core/.settings/org.eclipse.jdt.core.prefs b/net.sf.eclipsecs.core/.settings/org.eclipse.jdt.core.prefs
@@ -21,9 +21,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -125,7 +125,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
diff --git a/net.sf.eclipsecs.core/META-INF/MANIFEST.MF b/net.sf.eclipsecs.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-Name: %Bundle-Name
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: net.sf.eclipsecs.core;singleton:=true
 Bundle-Version: 10.14.1.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ClassPath: .,
  lib/checkstyle-10.14.1-all.jar
 Bundle-Activator: net.sf.eclipsecs.core.CheckstylePlugin
diff --git a/net.sf.eclipsecs.doc/src/main/resources/partials/index.html b/net.sf.eclipsecs.doc/src/main/resources/partials/index.html
@@ -8,7 +8,7 @@ <h1>Eclipse Checkstyle Plugin</h1>
                     <p style="margin-bottom: 5px;">
                         <a class="btn btn-primary btn-outline-inverse btn-lg" target="_blank"
                             href="http://marketplace.eclipse.org/marketplace-client-intro?mpc_install=150"
-                            title="Drag and drop this link into a running Eclipse (2021-06 or higher version) workspace to install the Eclipse Checkstyle Plugin">
+                            title="Drag and drop this link into a running Eclipse (2022-09 or higher version) workspace to install the Eclipse Checkstyle Plugin">
                             <i class="fa fa-plug">
                             </i>
                             Install
@@ -24,7 +24,7 @@ <h1>Eclipse Checkstyle Plugin</h1>
                     <small>
                         <sup>1 </sup>
                         Install via Eclipse Marketplace. Drag and drop this link into a running Eclipse
-                        (2021-06 or higher version) workspace. Latest release 10.14.1, see
+                        (2022-09 or higher version) workspace. Latest release 10.14.1, see
                         <a href="#!/releasenotes">release notes</a>.
                     </small>
                 </div>
diff --git a/net.sf.eclipsecs.doc/src/main/resources/partials/install.html b/net.sf.eclipsecs.doc/src/main/resources/partials/install.html
@@ -8,11 +8,11 @@ <h1>Installation</h1>
             <p>
                 <a class="btn btn-primary btn-outline-inverse btn-lg" target="_blank"
                     href="http://marketplace.eclipse.org/marketplace-client-intro?mpc_install=150"
-                    title="Drag and drop this link into a running Eclipse (2021-06 or higher version) workspace to install Checkstyle Plugin"
+                    title="Drag and drop this link into a running Eclipse (2022-09 or higher version) workspace to install Checkstyle Plugin"
                         ><i class="fa fa-plug"> </i> Install </a>
             </p>
             <ol>
-                <li>Drag&amp;Drop the link above to a running Eclipse instance (2021-06 or higher version). This will trigger the
+                <li>Drag&amp;Drop the link above to a running Eclipse instance (2022-09 or higher version). This will trigger the
                     Eclipse Marketplace client with the Eclipse Checkstyle Plugin being pre-selected for
                     installation.</li>
                 <li>Confirm the selection of features to install.</li>
diff --git a/net.sf.eclipsecs.sample/.classpath b/net.sf.eclipsecs.sample/.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"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/net.sf.eclipsecs.sample/.settings/org.eclipse.jdt.core.prefs b/net.sf.eclipsecs.sample/.settings/org.eclipse.jdt.core.prefs
@@ -11,9 +11,9 @@ org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -22,7 +22,7 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line=false
diff --git a/net.sf.eclipsecs.sample/META-INF/MANIFEST.MF b/net.sf.eclipsecs.sample/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 10.14.1.qualifier
 Require-Bundle: net.sf.eclipsecs.checkstyle,
  net.sf.eclipsecs.core,
  net.sf.eclipsecs.ui
-Bundle-RequiredExecutionEnvironment: JavaSE-11
+Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
 Import-Package: org.eclipse.core.resources,
diff --git a/net.sf.eclipsecs.target/net.sf.eclipsecs.target.target b/net.sf.eclipsecs.target/net.sf.eclipsecs.target.target
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Eclipse Checkstyle" sequenceNumber="1707931034">
+<target name="Eclipse Checkstyle" sequenceNumber="1710065411">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jdt.feature.group" version="3.18.800.v20210611-1600"/>
-      <unit id="org.eclipse.sdk.ide" version="4.20.0.I20210611-1600"/>
-      <unit id="org.eclipse.emf.feature.group" version="2.26.0.v20210506-1425"/>
-      <unit id="org.eclipse.ecf" version="3.9.102.v20210409-2301"/>
+      <unit id="org.eclipse.jdt.feature.group" version="3.18.1300.v20220831-1800"/>
+      <unit id="org.eclipse.sdk.ide" version="4.25.0.I20220831-1800"/>
+      <unit id="org.eclipse.e4.tools.emf.ui" version="4.7.300.v20220420-0901"/>
+      <unit id="org.eclipse.e4.tools.services" version="4.9.0.v20210427-1802"/>
+      <unit id="org.eclipse.e4.ui.progress" version="0.3.500.v20220717-1456"/>
+      <unit id="org.eclipse.ecf" version="3.10.0.v20210925-0032"/>
       <unit id="org.eclipse.ecf.filetransfer" version="5.1.102.v20210409-2301"/>
       <unit id="org.eclipse.ecf.identity" version="3.9.402.v20210409-2301"/>
-      <unit id="org.eclipse.ecf.provider.filetransfer" version="3.2.601.v20201025-0700"/>
-      <unit id="org.eclipse.tools.layout.spy" version="1.1.0.v20210110-1247"/>
-      <unit id="org.eclipse.ui.trace" version="1.2.0.v20210110-1242"/>
-      <repository location="https://download.eclipse.org/releases/2021-06/202106161001/"/>
-    </location>
-    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.ecf.provider.filetransfer" version="3.2.800.v20220215-0126"/>
+      <unit id="org.eclipse.emf.feature.group" version="2.31.0.v20220817-1401"/>
+      <unit id="org.sat4j.core" version="2.3.6.v20201214"/>
+      <unit id="org.sat4j.pb" version="2.3.6.v20201214"/>
+      <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
       <unit id="junit-jupiter-api" version="5.9.0"/>
       <unit id="junit-jupiter-engine" version="5.9.0"/>
       <unit id="junit-jupiter-migrationsupport" version="5.9.0"/>
@@ -30,12 +31,17 @@
       <unit id="org.apiguardian.api" version="1.1.2"/>
       <repository location="https://download.eclipse.org/releases/2022-09/202209141001/"/>
     </location>
+    <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.objectweb.asm" version="9.3.0.v20220409-0157"/>
+      <unit id="org.objectweb.asm.tree" version="9.3.0.v20220409-0157"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository"/>
+    </location>
     <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven" label="SnakeYaml">
     <dependencies>
     	<dependency>
     		<groupId>org.yaml</groupId>
     		<artifactId>snakeyaml</artifactId>
-    		<version>1.33</version>
+    		<version>2.2</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
@@ -55,7 +61,7 @@
     	<dependency>
     		<groupId>org.dom4j</groupId>
     		<artifactId>dom4j</artifactId>
-    		<version>2.1.3</version>
+    		<version>2.1.4</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
@@ -65,7 +71,7 @@
     	<dependency>
     		<groupId>org.assertj</groupId>
     		<artifactId>assertj-core</artifactId>
-    		<version>3.24.2</version>
+    		<version>3.25.1</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
@@ -75,11 +81,11 @@
     	<dependency>
     		<groupId>org.apache.commons</groupId>
     		<artifactId>commons-lang3</artifactId>
-    		<version>3.12.0</version>
+    		<version>3.14.0</version>
     		<type>jar</type>
     	</dependency>
     </dependencies>
     </location>
   </locations>
-  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 </target>
diff --git a/net.sf.eclipsecs.target/net.sf.eclipsecs.target.tpd b/net.sf.eclipsecs.target/net.sf.eclipsecs.target.tpd
diff --git a/net.sf.eclipsecs.target/readme.md b/net.sf.eclipsecs.target/readme.md
diff --git a/net.sf.eclipsecs.ui/.classpath b/net.sf.eclipsecs.ui/.classpath
diff --git a/net.sf.eclipsecs.ui/.settings/org.eclipse.jdt.core.prefs b/net.sf.eclipsecs.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/net.sf.eclipsecs.ui/META-INF/MANIFEST.MF b/net.sf.eclipsecs.ui/META-INF/MANIFEST.MF
diff --git a/pom.xml b/pom.xml
