Replace checkstyle with PMD

Also update Java language version to 11, which has been the target runtime and documented as the required version since v2.1. Signed-off-by: Mark S. Lewis <[email protected]>
hyperledger · Nov 22, 2024 · 4939a15 · 4939a15
1 parent 85188b7
commit 4939a15
Show file tree

Hide file tree

Showing 129 changed files with 1,941 additions and 2,024 deletions.
diff --git a/build.gradle b/build.gradle
@@ -50,12 +50,13 @@ subprojects {
     version = rootProject.version
 
     java {
-        sourceCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     compileJava {
         if (javaCompiler.get().metadata.languageVersion.canCompileOrRun(10)) {
-            options.release = 8
+            options.release = 11
         }
     }
 

diff --git a/ci/checkstyle/checkstyle.xml b/ci/checkstyle/checkstyle.xml
diff --git a/ci/checkstyle/java-copyright-header.txt b/ci/checkstyle/java-copyright-header.txt
diff --git a/fabric-chaincode-docker/Dockerfile b/fabric-chaincode-docker/Dockerfile
@@ -40,8 +40,8 @@ RUN gradle \
     fabric-chaincode-shim:publishToMavenLocal \
     -x javadoc \
     -x test \
-    -x checkstyleMain \
-    -x checkstyleTest
+    -x pmdMain \
+    -x pmdTest
 
 WORKDIR /root/chaincode-java 
 # Run the Gradle and Maven commands to generate the wrapper variants

diff --git a/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle b/fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle
@@ -7,7 +7,12 @@ group 'org.hyperledger.fabric-chaincode-java'
 version '1.0-SNAPSHOT'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+compileJava {
+    options.compilerArgs.addAll(['--release', '11'])
 }
 
 repositories {

diff --git a/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml b/fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml
@@ -7,7 +7,7 @@
 	<properties>
 
 		<!-- Generic properties -->
-		<java.version>8</java.version>
+		<java.version>11</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 

diff --git a/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle b/fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle
@@ -7,13 +7,12 @@ group 'org.hyperledger.fabric-chaincode-java'
 version '1.0-SNAPSHOT'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 compileJava {
-    if (javaCompiler.get().metadata.languageVersion.canCompileOrRun(10)) {
-        options.release = 8
-    }
+    options.compilerArgs.addAll(['--release', '11'])
 }
 
 repositories {

diff --git a/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle b/fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle
@@ -7,13 +7,12 @@ group 'org.hyperledger.fabric-chaincode-java'
 version '1.0-SNAPSHOT'
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 compileJava {
-    if (javaCompiler.get().metadata.languageVersion.canCompileOrRun(10)) {
-        options.release = 8
-    }
+    options.compilerArgs.addAll(['--release', '11'])
 }
 
 repositories {

diff --git a/fabric-chaincode-integration-test/src/contracts/wrapper-maven/.mvn/wrapper/maven-wrapper.jar b/fabric-chaincode-integration-test/src/contracts/wrapper-maven/.mvn/wrapper/maven-wrapper.jar
diff --git a/...incode-integration-test/src/contracts/wrapper-maven/.mvn/wrapper/maven-wrapper.properties b/...incode-integration-test/src/contracts/wrapper-maven/.mvn/wrapper/maven-wrapper.properties
@@ -6,13 +6,15 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#   https://www.apache.org/licenses/LICENSE-2.0
+#   http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
+wrapperVersion=3.3.2
+distributionType=bin
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar