diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..f223ac3 --- /dev/null +++ b/Makefile @@ -0,0 +1,7 @@ +SHELL := /bin/bash + +build: + ./gradlew clean build + +test: + ./gradlew test diff --git a/build.gradle b/build.gradle index d75ae2b..06ef10d 100644 --- a/build.gradle +++ b/build.gradle @@ -12,17 +12,17 @@ repositories { } group = 'net.tokensmith' -version = '1.3.4' +version = '1.3.5-SNAPSHOT' description = 'Java implementation of JWT' -sourceCompatibility = 12 -targetCompatibility = 12 +sourceCompatibility = 17 +targetCompatibility = 17 ext { - jacksonVersion = '2.11.0' - log4jVersion = '2.13.3' - slf4jVersion = '1.7.25' - mockitoVersion = '2.28.2' + jacksonVersion = '2.13.1' + log4jVersion = '2.17.2' + slf4jVersion = '1.7.36' + mockitoVersion = '4.5.1' } dependencies { @@ -30,15 +30,14 @@ dependencies { implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jacksonVersion}" implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${jacksonVersion}" - - compile group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}" + implementation group: 'org.slf4j', name: 'slf4j-api', version: "${slf4jVersion}" testImplementation group: 'junit', name: 'junit', version:'4.12' testImplementation group: 'org.hamcrest', name: 'hamcrest-all', version:'1.3' - testCompile "org.mockito:mockito-core:${mockitoVersion}" - testCompile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "${log4jVersion}" - testCompile group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4jVersion}" - testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}" + testImplementation "org.mockito:mockito-core:${mockitoVersion}" + testImplementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: "${log4jVersion}" + testImplementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: "${log4jVersion}" + testImplementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: "${log4jVersion}" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae8df0d..c209bf3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip diff --git a/src/main/java/net/tokensmith/jwt/config/JwtAppFactory.java b/src/main/java/net/tokensmith/jwt/config/JwtAppFactory.java index d2bce8d..21c36d8 100644 --- a/src/main/java/net/tokensmith/jwt/config/JwtAppFactory.java +++ b/src/main/java/net/tokensmith/jwt/config/JwtAppFactory.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import net.tokensmith.jwt.entity.jwk.Key; import net.tokensmith.jwt.entity.jwk.RSAPublicKey; @@ -62,7 +62,7 @@ public ObjectMapper objectMapper() { if (objectMapper == null) { this.objectMapper = new ObjectMapper() .setPropertyNamingStrategy( - PropertyNamingStrategy.SNAKE_CASE + PropertyNamingStrategies.SNAKE_CASE ) .configure(JsonParser.Feature.STRICT_DUPLICATE_DETECTION, true) .registerModule(new Jdk8Module())