Updating master to latest version

.github/workflows/github-actions.yml

@@ -0,0 +1,48 @@
+name: GitHub Actions
+run-name: ${{ github.ref_name }} GitHub Actions 🚀
+on: [push, pull_request]
+jobs:
+  Build-Publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code ⬇️
+        uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+      - name: Setup Gradle 🐘
+        uses: gradle/actions/setup-gradle@v3
+      - name: Make gradlew executable
+        run: chmod +x ./gradlew
+      - name: Run build with Gradle Wrapper 🏃
+        run: ./gradlew build -x test
+      - name: Run tests 🧑‍⚕️
+        run: ./gradlew test
+      # Might want to remove this step
+      - name: Archive production artifacts ⬆️
+      # Changed from target 'master' to 'develop' because the rules for the repo are locking my uploads
+        if: github.event.pull_request.base.ref == 'develop'
+        uses: actions/upload-artifact@v4
+        with:
+          name: Artifacts
+          path: ./build/libs/saRestApi-*.jar
+      - uses: jfrog/setup-jfrog-cli@v4
+        env:
+          JF_URL: ${{ secrets.ARTIFACTORY_URL }}
+          JF_USER: ${{ secrets.JFROG_USERNAME }}
+          JF_PASSWORD: ${{ secrets.JFROG_PASSWORD }}
+      - run: |
+          # This command adds a new server configuration to the JFrog CLI
+      - name: Upload to artifactory
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          export BUILD_NAME="saidp-sdk-java"
+          export BUILD_MODULE="sdk-java"
+          export BUILD_NUMBER="1"
+
+          export VERSION=$(cat gradle.properties | grep -Po "\d*\.\d*\.\d*\.\d*")
+
+          jf rt upload "./build/libs/saRestApi-*.jar" radius-release-local/saRestApi/$VERSION/saRestApi-$VERSION.jar --build-name $BUILD_NAME --build-number $BUILD_NUMBER --module $BUILD_MODULE
+          jf rt build-publish $BUILD_NAME $BUILD_NUMBER
+      - run: echo "🍏 This job's status is ${{ job.status }}."

README.md

@@ -1,5 +1,6 @@
 SAAccess
 ===========
+![Build](https://github.com/SecureAuthCorp/saidp-sdk-java/actions/workflows/github-actions.yml/badge.svg)
 
 SAAccess is a solution that allows access to SecureAuth's REST api. The intention
 is to provide a easy and a standard method to to access the SecureAuth Appliance REST
@@ -15,17 +16,17 @@ This is a community driven project, if you would like to contribute please fork
 
 Requirements:
 ------------
-* Requires Java 11
+* Requires Java 21
 * Requires gradle to build the package
 
 Dependencies:
 ------------
-* jackson-jaxrs-json-provider 2.7.3
-* jersey-client 2.5.1
-* Commons Codec 1.10
-* SLF4J 1.7.28
-* jaxb 2.3.0
-* junit 5.1.0
+* jackson-jaxrs-json-provider 2.18.1
+* jersey-client 4.0.0-M1
+* Commons Codec 1.17.1
+* SLF4J 2.0.16
+* jaxb 4.0.5
+* junit 4.13.2
 
 Building:
 --------

build.gradle

@@ -2,12 +2,11 @@
 plugins {
     id 'java'
     id 'application'
-    id 'com.jfrog.artifactory' version '4.10.0'
     id 'jacoco'
+    id "com.github.ben-manes.versions" version "0.51.0"
 }
 
 apply plugin: 'eclipse'
-apply plugin: 'maven'
 apply plugin: 'maven-publish'
 
 group = 'org.secureauth.sarestapi'
@@ -25,15 +24,6 @@ publishing {
     }
 }
 
-artifactory {
-    publish {
-        defaults {
-            publications('mavenJava')
-            publishArtifacts = true
-        }
-    }
-}
-
 // The following task is used internally in the corporation 
 // to use a local version exported in maven local without colliding 
 // with the version uploaded in mavenCentral.
@@ -43,31 +33,33 @@ task buildLocal {
         finalizedBy( compileJava )
     }
 }
-sourceCompatibility = 11.0
+sourceCompatibility = 21.0
 
 dependencies {
-    implementation('com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.7.3')
-    implementation('org.glassfish.jersey.core:jersey-client:2.5.1')
-    implementation('commons-codec:commons-codec:1.10')
-    implementation('org.slf4j:slf4j-api:1.7.36')
-    implementation('javax.xml.bind:jaxb-api:2.3.0')
-    implementation('com.sun.xml.bind:jaxb-core:2.3.0')
-    implementation('com.sun.xml.bind:jaxb-impl:2.3.0')
-    implementation('javax.activation:activation:1.1')
-
-    implementation 'org.slf4j:slf4j-api:1.7.28'
-
-    implementation 'org.apache.logging.log4j:log4j-core:2.18.0'
-    annotationProcessor 'org.apache.logging.log4j:log4j-core:2.18.0'
+    implementation('com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.18.1')
+    implementation('org.glassfish.jersey.core:jersey-client:4.0.0-M1')
+    implementation 'org.glassfish.jersey.media:jersey-media-jaxb:4.0.0-M1'
+    implementation 'org.glassfish.jersey.media:jersey-media-moxy:4.0.0-M1'
+    implementation('commons-codec:commons-codec:1.17.1')
+    implementation('javax.xml.bind:jaxb-api:2.4.0-b180830.0359')
+    implementation('com.sun.xml.bind:jaxb-core:4.0.5')
+    implementation('com.sun.xml.bind:jaxb-impl:4.0.5')
+    implementation('javax.activation:activation:1.1.1')
+    implementation 'com.google.guava:guava:33.3.1-jre'
+    implementation 'jakarta.ws.rs:jakarta.ws.rs-api:4.0.0'
+
+    // Log4j
+    implementation 'org.slf4j:slf4j-api:2.0.16'
+    implementation 'org.apache.logging.log4j:log4j-core:2.24.1'
+    testImplementation 'org.slf4j:slf4j-simple:2.0.16'
 
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'com.google.guava:guava:11.0.2'
-    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.1.0'
-    testImplementation 'org.junit.vintage:junit-vintage-engine:5.5.2'
-    testImplementation 'org.mockito:mockito-core:2.28.2'
-    testImplementation "com.github.tomakehurst:wiremock-jre8:2.21.0"
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.11.3'
+    testImplementation 'org.junit.vintage:junit-vintage-engine:5.11.3'
+    testImplementation 'org.mockito:mockito-core:5.14.2'
+    testImplementation "com.github.tomakehurst:wiremock-jre8:3.0.1"
 
-    testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:2.18.0'
+    testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl:3.0.0-beta2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.5.2'
 
 }
@@ -85,33 +77,16 @@ distributions {
     }
 }
 
-task copyToLib(type: Copy){
-    into "$buildDir/libs"
-    from configurations.runtime
-}
-
-task generate_zip(type: Zip) {
-    description 'Generates a zip file containing the docs and libs directories.'
-    from "$buildDir"
-    include('libs/', 'docs/')
-    archiveName "saidp-sdk-java-${version}.zip"
-}
-
-build.dependsOn( copyToLib )
-build.dependsOn( javadoc )
-generate_zip.finalizedBy( build )
+//task generate_zip(type: Zip) {
+//    description 'Generates a zip file containing the docs and libs directories.'
+//    from "$buildDir"
+//    include('libs/', 'docs/')
+//    archiveFileName("saidp-sdk-java-${version}.zip")
+//}
 
-jacoco {
-    toolVersion = '0.8.4'
-}
-
-jacocoTestReport {
-    reports {
-        xml.enabled false
-        csv.enabled false
-        html.destination file("${buildDir}/coverageReport/html")
-    }
-}
+//build.dependsOn( copyToLib )
+// build.dependsOn( javadoc )
+//generate_zip.finalizedBy( build )
 
 test {
     useJUnitPlatform()

gradle.properties

@@ -1 +1 @@
-currentVersion=1.1.0.9
+currentVersion=1.2.0.1

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists