Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace checkstyle with PMD #362

Merged
merged 1 commit into from
Nov 22, 2024
+1,941 −2,024
Merged

Replace checkstyle with PMD #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
108 changes: 0 additions & 108 deletions ci/checkstyle/checkstyle.xml
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions ci/checkstyle/java-copyright-header.txt
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions fabric-chaincode-docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion fabric-chaincode-integration-test/src/contracts/bare-gradle/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion fabric-chaincode-integration-test/src/contracts/bare-maven/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
7 changes: 3 additions & 4 deletions fabric-chaincode-integration-test/src/contracts/fabric-ledger-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 3 additions & 4 deletions fabric-chaincode-integration-test/src/contracts/fabric-shim-api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Binary file modified fabric-chaincode-integration-test/src/contracts/wrapper-maven/.mvn/wrapper/maven-wrapper.jar
View file
Open in desktop
Binary file not shown.
8 changes: 5 additions & 3 deletions ...incode-integration-test/src/contracts/wrapper-maven/.mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading