Issue #340: update to Checkstyle 10.0

Calixte · Calixte · commit b8270708cdd4 · 2022-04-25T20:34:25.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -28,13 +28,7 @@ install:
 matrix:
   fast_finish: true
   include:
-    # JDK 8 (minimal supported Java version of eclipse-cs)
-    - jdk: openjdk8
-      env:
-        - DESC="install (openjdk8)"
-        - CMD="mvn install && git diff"
-
-    # JDK 11 (Long Term Support version)
+    # JDK 11 (minimal supported Java version of eclipse-cs)
     - jdk: openjdk11
       env:
         - DESC="install (openjdk11)"
diff --git a/net.sf.eclipsecs.branding/.classpath b/net.sf.eclipsecs.branding/.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-1.8"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/net.sf.eclipsecs.branding/META-INF/MANIFEST.MF b/net.sf.eclipsecs.branding/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@ Bundle-Name: Eclipse Checkstyle
 Bundle-SymbolicName: net.sf.eclipsecs.branding
 Bundle-Version: 9.3.0.qualifier
 Bundle-Vendor: Eclipse Checkstyle Project
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: net.sf.eclipsecs.branding
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-9.3-all.jar" sourcepath="checkstyle-checkstyle-9.3.zip"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry exported="true" kind="lib" path="checkstyle-10.0-all.jar" sourcepath="checkstyle-checkstyle-10.0.zip"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
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: 9.3.0.qualifier
 Bundle-Vendor: Eclipse Checkstyle Project
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: .,
  com.google.common.base;version="9.3.0",
  com.google.common.cache;version="9.3.0",
@@ -38,5 +38,5 @@ Export-Package: .,
  com.puppycrawl.tools.checkstyle.utils,
  org.apache.commons.beanutils;version="9.3.0"
 Bundle-ClassPath: .,
- checkstyle-9.3-all.jar
+ checkstyle-10.0-all.jar
 Automatic-Module-Name: net.sf.eclipsecs.checkstyle
diff --git a/net.sf.eclipsecs.checkstyle/build.properties b/net.sf.eclipsecs.checkstyle/build.properties
@@ -1,6 +1,6 @@
 bin.includes = META-INF/,\
                .,\
                license/,\
-               checkstyle-9.3-all.jar
+               checkstyle-10.0-all.jar
 jars.compile.order = .
 source.. = metadata/
diff --git a/net.sf.eclipsecs.checkstyle/checkstyle-10.0-all.jar b/net.sf.eclipsecs.checkstyle/checkstyle-10.0-all.jar
diff --git a/net.sf.eclipsecs.checkstyle/pom.xml b/net.sf.eclipsecs.checkstyle/pom.xml
@@ -11,7 +11,7 @@
     <name>Checkstyle Core Library Plugin</name>
     
     <properties>
-        <checkstyle.version>9.3</checkstyle.version>
+        <checkstyle.version>10.0</checkstyle.version>
     </properties>
     <build>
         <plugins>
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-1.8"/>
+	<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.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="com/puppycrawl/tools/checkstyle/meta/**"/>
@@ -10,6 +10,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/dom4j-2.1.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/snakeyaml-1.26.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/javassist-3.28.0-GA.jar"/>
-	<classpathentry kind="lib" path="lib/checkstyle-9.3-all.jar"/>
+	<classpathentry kind="lib" path="lib/checkstyle-10.0-all.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/net.sf.eclipsecs.core/META-INF/MANIFEST.MF b/net.sf.eclipsecs.core/META-INF/MANIFEST.MF
@@ -3,12 +3,12 @@ Bundle-Name: Eclipse Checkstyle
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: net.sf.eclipsecs.core;singleton:=true
 Bundle-Version: 9.3.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ClassPath: .,
  lib/dom4j-2.1.3.jar,
  lib/snakeyaml-1.26.jar,
  lib/javassist-3.28.0-GA.jar,
- lib/checkstyle-9.3-all.jar
+ lib/checkstyle-10.0-all.jar
 Bundle-Activator: net.sf.eclipsecs.core.CheckstylePlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Checkstyle Project
diff --git a/net.sf.eclipsecs.core/build.properties b/net.sf.eclipsecs.core/build.properties
@@ -9,7 +9,7 @@ bin.includes = .,\
                core.properties,\
                lib/dom4j-2.1.3.jar, \
                lib/snakeyaml-1.26.jar, \
-               lib/checkstyle-9.3-all.jar
+               lib/checkstyle-10.0-all.jar
                
 source.. = src/
 
diff --git a/net.sf.eclipsecs.core/lib/checkstyle-10.0-all.jar b/net.sf.eclipsecs.core/lib/checkstyle-10.0-all.jar
diff --git a/net.sf.eclipsecs.doc/.classpath b/net.sf.eclipsecs.doc/.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-1.8"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/net.sf.eclipsecs.doc/META-INF/MANIFEST.MF b/net.sf.eclipsecs.doc/META-INF/MANIFEST.MF
@@ -4,5 +4,5 @@ Bundle-Name: Eclipse Checkstyle Documentation
 Bundle-SymbolicName: net.sf.eclipsecs.doc;singleton:=true
 Bundle-Version: 9.3.0.qualifier
 Bundle-Vendor: Eclipse Checkstyle Project
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: net.sf.eclipsecs.doc
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-1.8"/>
+	<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.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
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: 9.3.0.qualifier
 Require-Bundle: net.sf.eclipsecs.checkstyle,
  net.sf.eclipsecs.core,
  net.sf.eclipsecs.ui
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Eclipse Checkstyle Project
 Import-Package: org.eclipse.core.resources,
diff --git a/net.sf.eclipsecs.target/Maven update check.launch b/net.sf.eclipsecs.target/Maven update check.launch
@@ -12,6 +12,6 @@
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${git_work_tree:/net.sf.eclipsecs.core}"/>
 </launchConfiguration>
diff --git a/net.sf.eclipsecs.target/Update version numbers.launch b/net.sf.eclipsecs.target/Update version numbers.launch
@@ -16,6 +16,6 @@
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${git_work_tree:/net.sf.eclipsecs.core}"/>
 </launchConfiguration>
diff --git a/net.sf.eclipsecs.target/net.sf.eclipsecs.target.target b/net.sf.eclipsecs.target/net.sf.eclipsecs.target.target
@@ -21,5 +21,5 @@
       <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
     </location>
   </locations>
-  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 </target>
diff --git a/net.sf.eclipsecs.target/net.sf.eclipsecs.target.tpd b/net.sf.eclipsecs.target/net.sf.eclipsecs.target.tpd
@@ -2,7 +2,7 @@
 // Read https://github.com/eclipse-cbi/targetplatform-dsl for more details.
 target "Eclipse Checkstyle"
 with source configurePhase
-environment JavaSE-1.8
+environment JavaSE-11
 
 // use the latest version of Juno only, to avoid downloading all children of the Juno composite update site
 location "https://download.eclipse.org/releases/juno/201303010900/" {
diff --git a/net.sf.eclipsecs.ui/.classpath b/net.sf.eclipsecs.ui/.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-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
diff --git a/net.sf.eclipsecs.ui/META-INF/MANIFEST.MF b/net.sf.eclipsecs.ui/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Bundle-ClassPath: .,
  lib/jfreechart-1.0.19.jar,
  lib/jfreechart-1.0.19-swt.jar,
  lib/jcommon-1.0.23.jar
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Localization: plugin
 Export-Package: net.sf.eclipsecs.ui,
  net.sf.eclipsecs.ui.properties.filter,
diff --git a/pom.xml b/pom.xml
@@ -323,8 +323,8 @@
                         </execution>
                     </executions>
                     <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
+                        <source>11</source>
+                        <target>11</target>
                     </configuration>
                 </plugin>
                 <plugin>
