diff --git a/README.md b/README.md index 9e184bc..2f66c11 100644 --- a/README.md +++ b/README.md @@ -116,13 +116,13 @@ The project includes a Jenkins file to control a pipeline build. com.codingrodent jackson-json-crypto - 2.2.0 + 3.0.0 ``` ## Include Using Gradle ``` -compile group: 'com.codingrodent', name: 'jackson-json-crypto', version: '2.2.0' +compile group: 'com.codingrodent', name: 'jackson-json-crypto', version: '3.0.0' ``` diff --git a/build.gradle b/build.gradle index 2652ae4..47d198f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,36 +1,37 @@ +import com.github.spotbugs.snom.Effort + buildscript { repositories { mavenCentral() mavenLocal() - jcenter() maven { - url "https://plugins.gradle.org/m2/" + url="https://plugins.gradle.org/m2/" } } dependencies { //Check for the latest version here: http://plugins.gradle.org/plugin/com.jfrog.artifactory - classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '4.+') + classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '5.2.5') } } plugins { - id "com.github.spotbugs" version "4.6.0" + id "com.github.spotbugs" version "6.0.18" id 'java' id 'idea' id 'maven-publish' id 'jacoco' } -apply plugin: 'maven' +apply plugin: 'maven-publish' apply plugin: 'com.jfrog.artifactory' java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } -task setVersion { +tasks.register('setVersion') { if (System.env.BUILD_NUMBER) { version = projectVersionMajor + '.' + projectVersionMinor + '.' + System.env.BUILD_NUMBER } else { @@ -39,7 +40,7 @@ task setVersion { } jar { - baseName = projectName + archiveBaseName = projectName manifest { attributes 'Implementation-Title': projectName, @@ -47,8 +48,9 @@ jar { } } -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' +tasks.register('sourcesJar', Jar) { + dependsOn classes + archiveClassifier = 'sources' from sourceSets.main.allSource } @@ -56,12 +58,13 @@ javadoc { options.addBooleanOption('html5', true) } -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' +tasks.register('javadocJar', Jar) { + dependsOn javadoc + archiveClassifier = 'javadoc' from javadoc.destinationDir } -task createPom { +tasks.register('createPom') { doLast { pom { @@ -108,8 +111,8 @@ repositories { } jacoco { - toolVersion = "0.8.6" - reportsDir = file("$buildDir/customJacocoReportDir") + toolVersion = "0.8.12" + reportsDirectory = file("$buildDir/customJacocoReportDir") } test { @@ -127,16 +130,16 @@ test { jacocoTestReport { reports { - xml.enabled true - csv.enabled false - html.destination = file("${buildDir}/jacocoHtml") + xml.required = true + csv.required = false + html.outputLocation = file("${buildDir}/jacocoHtml") } } spotbugs { - toolVersion = '4.2.0' + toolVersion = '4.8.6' ignoreFailures = false - effort = 'max' + effort = Effort.MAX } @@ -155,7 +158,6 @@ artifactory { repoKey = 'gradle-dev-local' username = "${artifactory_user}" password = "${artifactory_password}" - maven = true } defaults { @@ -174,23 +176,23 @@ artifactory { dependencies { - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.12.0' - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.12.0' - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.12.0' - implementation group: 'javax.validation', name: 'validation-api', version: '2.0.1.Final' - implementation group: 'org.hibernate', name: 'hibernate-validator', version: '6.1.7.Final' - implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30' - implementation group: 'org.glassfish', name: 'javax.el', version: '3.0.0' - implementation group: 'javax.el', name: 'javax.el-api', version: '3.0.0' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.18.3' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.18.3' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-annotations', version: '2.18.3' + implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.1.1' + implementation group: 'org.hibernate.validator', name: 'hibernate-validator', version: '8.0.2.Final' + implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.17' + implementation group: 'jakarta.el', name: 'jakarta.el-api', version: '6.0.1' // - testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0' - testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.0' - testCompile group: 'org.easymock', name: 'easymock', version: '4.2' - testCompile group: 'org.hamcrest', name: 'hamcrest', version: '2.2' + testImplementation group: 'org.glassfish', name: 'jakarta.el', version: '4.0.2' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.0' + testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.7.0' + testImplementation group: 'org.easymock', name: 'easymock', version: '5.5.0' + testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '3.0' } wrapper { - gradleVersion = '6.7.1' + gradleVersion = '8.13' distributionType = Wrapper.DistributionType.BIN } diff --git a/bundle.bat b/bundle.bat index f906e76..f511440 100644 --- a/bundle.bat +++ b/bundle.bat @@ -1,5 +1,5 @@ -set VER="2.2.0" +set VER="3.0.0" gpg -ab jackson-json-crypto-%VER%.jar gpg -ab jackson-json-crypto-%VER%.pom diff --git a/gradle.properties b/gradle.properties index 7873e9e..a7bb905 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ # projectName=jackson-json-crypto # -projectVersionMajor=2 -projectVersionMinor=2 +projectVersionMajor=3 +projectVersionMinor=0 projectVersionBuild=0 # artifactory_user=admin diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d9ca16..2733ed5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/codingrodent/jackson/crypto/EncryptedJson.java b/src/main/java/com/codingrodent/jackson/crypto/EncryptedJson.java index be37ec9..094c747 100644 --- a/src/main/java/com/codingrodent/jackson/crypto/EncryptedJson.java +++ b/src/main/java/com/codingrodent/jackson/crypto/EncryptedJson.java @@ -28,7 +28,7 @@ of this software and associated documentation files (the "Software"), to deal import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.util.Arrays; /** diff --git a/src/main/java/com/codingrodent/jackson/crypto/EncryptionService.java b/src/main/java/com/codingrodent/jackson/crypto/EncryptionService.java index f94d042..498b216 100644 --- a/src/main/java/com/codingrodent/jackson/crypto/EncryptionService.java +++ b/src/main/java/com/codingrodent/jackson/crypto/EncryptionService.java @@ -29,7 +29,7 @@ of this software and associated documentation files (the "Software"), to deal import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.validation.*; +import jakarta.validation.*; import java.util.Set; /** diff --git a/src/main/resources/com/codingrodent/jackson/crypto/config.properties b/src/main/resources/com/codingrodent/jackson/crypto/config.properties index 0b83903..8ca50e4 100644 --- a/src/main/resources/com/codingrodent/jackson/crypto/config.properties +++ b/src/main/resources/com/codingrodent/jackson/crypto/config.properties @@ -1,3 +1,3 @@ -projectVersionMajor=2 -projectVersionMinor=2 +projectVersionMajor=3 +projectVersionMinor=0 projectVersionBuild=0 \ No newline at end of file diff --git a/src/test/java/com/codingrodent/jackson/crypto/CryptoGetterTest.java b/src/test/java/com/codingrodent/jackson/crypto/CryptoGetterTest.java index 83b496f..70d6b89 100644 --- a/src/test/java/com/codingrodent/jackson/crypto/CryptoGetterTest.java +++ b/src/test/java/com/codingrodent/jackson/crypto/CryptoGetterTest.java @@ -27,7 +27,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; -import javax.validation.Validation; +import jakarta.validation.Validation; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/codingrodent/jackson/crypto/CryptoModuleTest.java b/src/test/java/com/codingrodent/jackson/crypto/CryptoModuleTest.java index 3b550fb..2e4346c 100644 --- a/src/test/java/com/codingrodent/jackson/crypto/CryptoModuleTest.java +++ b/src/test/java/com/codingrodent/jackson/crypto/CryptoModuleTest.java @@ -53,7 +53,7 @@ public void getModuleName() { public void version() { var cryptoModule = new CryptoModule(); var version = cryptoModule.version(); - assertEquals("2.2.0", version.toString()); + assertEquals("3.0.0", version.toString()); assertEquals(CryptoModule.ARTIFACT_ID, version.getArtifactId()); assertEquals(CryptoModule.GROUP_ID, version.getGroupId()); } diff --git a/src/test/java/com/codingrodent/jackson/crypto/CryptoPropertyTest.java b/src/test/java/com/codingrodent/jackson/crypto/CryptoPropertyTest.java index 2296480..004b3a8 100644 --- a/src/test/java/com/codingrodent/jackson/crypto/CryptoPropertyTest.java +++ b/src/test/java/com/codingrodent/jackson/crypto/CryptoPropertyTest.java @@ -27,7 +27,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; -import javax.validation.Validation; +import jakarta.validation.Validation; import static org.junit.jupiter.api.Assertions.assertEquals;