Merge pull request #17 from Conjur-Enterprise/CNJR-7854

CNJR-7854: Restore JDK8 compatibility

Author: gl-johnson

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [3.0.6] - 2024-02-20
+
+### Fixed
+- Restored compatibility with Java 8 (CNJR-7854)
+
 ## [3.0.5] - 2023-06-08
 
 ### Fixed

Dockerfile.test

@@ -1,15 +1,16 @@
-FROM openjdk:23-slim
+ARG JDK_VERSION=23
+
+FROM eclipse-temurin:${JDK_VERSION}-jdk
 
 MAINTAINER Conjur Inc
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
-    apt-get install -y vim wget curl git maven
-
-RUN mkdir -p /conjurinc/api-java
+    apt-get install -y --no-install-recommends vim wget curl git maven && \
+    rm -rf /var/lib/apt/lists/*
 
 WORKDIR /conjurinc/api-java
 
-COPY . /conjurinc/api-java
+COPY . .
 
-RUN mvn compile
+RUN mvn compile

Jenkinsfile

@@ -125,19 +125,31 @@ pipeline {
       }
     }
 
-    stage('Run tests and archive test results') {
+    stage('Run tests (JDK8)') {
       environment {
         INFRAPOOL_REGISTRY_URL = "registry.tld"
+        INFRAPOOL_JDK_VERSION = "8"
+      }
+      steps {
+        script {
+          INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './bin/test.sh'
+        }
+      }
+    }
+
+    stage('Run tests and archive results (JDK23)') {
+      environment {
+        INFRAPOOL_REGISTRY_URL = "registry.tld"
+        INFRAPOOL_JDK_VERSION = "23"
       }
       steps {
         script {
           lock("api-java-${env.NODE_NAME}") {
             INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './bin/test.sh'
-            INFRAPOOL_EXECUTORV2_AGENT_0.agentStash includes: 'target/surefire-reports/*.xml', name: 'test-results'
+            INFRAPOOL_EXECUTORV2_AGENT_0.agentStash includes: 'target/surefire-reports/*.xml', name: "test-results"
             unstash 'test-results'
           }
         }
-
         junit 'target/surefire-reports/*.xml'
       }
     }

bin/build-tools-image.sh

@@ -2,11 +2,11 @@
 
 set -euo pipefail
 
-# Build tools image
-#FROM maven:${maven_version}-openjdk-${java_version}-slim
+# This container is used to package the library - leave the Java version arg at
+# 8 to ensure we support Java 8 which has LTS until 2030
 docker build \
-    --build-arg maven_version=3.8.4 \
-    --build-arg java_version=11 \
+    --build-arg maven_version=3 \
+    --build-arg java_version=8 \
     -t tools \
     -f tools.Dockerfile \
     .

bin/test.sh

@@ -6,6 +6,7 @@ source bin/utils.sh
 trap finish EXIT
 
 export REGISTRY_URL=${INFRAPOOL_REGISTRY_URL:-"docker.io"}
+export JDK_VERSION=${INFRAPOOL_JDK_VERSION:-8}
 
 function main() {
   finish
@@ -33,7 +34,7 @@ function runOss () {
 
 # Build DAP test container & start the cluster
 function createDAPTestEnvironment() {
-  docker compose build --pull client cuke-master test-dap
+  docker compose build --pull client cuke-master test-dap --build-arg JDK_VERSION="${JDK_VERSION:-8}"
   export CONJUR_APPLIANCE_URL="https://cuke-master"
   docker compose up -d client cuke-master test-dap
 
@@ -94,6 +95,13 @@ function initializeDapCert() {
 
   # Import cert converted above into keystore
   JAVA_PATH=$(docker exec ${dap_test_cid} sh -c 'echo $JAVA_HOME')
+
+  # If Java 8, append /jre to the path
+  JAVA_VERSION=$(docker exec ${dap_test_cid} sh -c '$JAVA_HOME/bin/java -version 2>&1 | head -n 1')
+  if [[ "$JAVA_VERSION" == *"1.8"* ]]; then
+    JAVA_PATH="${JAVA_PATH}/jre"
+  fi
+  
   import_command="keytool \
      -import \
      -alias cuke-master -v \

bin/utils.sh

@@ -6,7 +6,7 @@ function createOssEnvironment() {
   echo '------------------------------------------------------------'
 
   # Build OSS test container & start the cluster
-  docker compose build --pull client conjur postgres test test-https conjur-proxy-nginx
+  docker compose build --pull client conjur postgres test test-https conjur-proxy-nginx --build-arg JDK_VERSION="${JDK_VERSION:-8}"
   export CONJUR_APPLIANCE_URL="http://conjur"
   docker compose up -d client conjur postgres test-https
 
@@ -81,6 +81,13 @@ function initializeOssCert() {
 
   # Import cert converted above into keystore
   JAVA_PATH=$(docker exec ${conjur_test_cid} sh -c 'echo $JAVA_HOME')
+
+  # If Java 8, append /jre to the path
+  JAVA_VERSION=$(docker exec ${dap_test_cid} sh -c '$JAVA_HOME/bin/java -version 2>&1 | head -n 1')
+  if [[ "$JAVA_VERSION" == *"1.8"* ]]; then
+    JAVA_PATH="${JAVA_PATH}/jre"
+  fi
+
   import_command="keytool \
     -import \
     -alias cucumber \

docker-compose.yml

@@ -58,6 +58,8 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.test
+      args:
+        JDK_VERSION: ${JDK_VERSION:-8}
     volumes:
       - ./target:/conjurinc/api-java/target
     environment:
@@ -69,6 +71,8 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.test
+      args:
+        JDK_VERSION: ${JDK_VERSION:-8}
     volumes:
       - ./target:/conjurinc/api-java/target
       - ./test-cert:/test-cert
@@ -84,6 +88,8 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.test
+      args:
+        JDK_VERSION: ${JDK_VERSION:-8}
     volumes:
       - ./target:/conjurinc/api-java/target
       - ./test-cert:/test-cert

pom.xml

@@ -150,34 +150,23 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <jaxrs.version>2.1.1</jaxrs.version>
     </properties>
     <dependencies>
-    
-      <!-- JAXRS Implementation -->
-      <dependency>
-        <groupId>jakarta.ws.rs</groupId>
-        <artifactId>jakarta.ws.rs-api</artifactId>
-        <version>3.1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>jakarta.activation</groupId>
-        <artifactId>jakarta.activation-api</artifactId>
-        <version>2.1.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.glassfish.jersey.core</groupId>
-        <artifactId>jersey-client</artifactId>
-        <version>3.1.5</version>
-      </dependency>
+      <!--
+        JAXRS Implementation
+        You can change any of this, for example if you use Jersey 2.0 or a different implementation
+        (codehaus has one, I think).
+      -->
       <dependency>
-        <groupId>org.glassfish.jersey.inject</groupId>
-        <artifactId>jersey-hk2</artifactId>
-        <version>3.1.5</version>
+        <groupId>javax.ws.rs</groupId>
+        <artifactId>javax.ws.rs-api</artifactId>
+        <version>${jaxrs.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.glassfish.jersey.media</groupId>
-        <artifactId>jersey-media-json-binding</artifactId>
-        <version>3.1.2</version>
+        <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-rs-client</artifactId>
+        <version>3.5.10</version>
       </dependency>
 
       <!-- JSON support -->
@@ -207,13 +196,6 @@
         <version>4.13.1</version>
         <scope>test</scope>
       </dependency>
-
-      <!-- must include JAXB manually post Java 9 -->
-        <dependency>
-          <groupId>jakarta.xml.bind</groupId>
-          <artifactId>jakarta.xml.bind-api</artifactId>
-          <version>4.0.1</version>
-      </dependency> 
     </dependencies>
 
     <build>
@@ -231,15 +213,14 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.20</version>
+            <version>2.22.2</version>
             <configuration>
               <systemPropertyVariables>
                 <CONJUR_ACCOUNT>${env.CONJUR_ACCOUNT}</CONJUR_ACCOUNT>
                 <CONJUR_APPLIANCE_URL>${env.CONJUR_APPLIANCE_URL}</CONJUR_APPLIANCE_URL>
                 <CONJUR_AUTHN_LOGIN>${env.CONJUR_AUTHN_LOGIN}</CONJUR_AUTHN_LOGIN>
                 <CONJUR_AUTHN_API_KEY>${env.CONJUR_AUTHN_API_KEY}</CONJUR_AUTHN_API_KEY>
               </systemPropertyVariables>
-              <argLine>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.net=ALL-UNNAMED</argLine>
             </configuration>
           </plugin>
 

src/main/java/com/cyberark/conjur/api/clients/AuthnClient.java

@@ -3,12 +3,12 @@
 import static com.cyberark.conjur.util.EncodeUriComponent.encodeUriComponent;
 
 import javax.net.ssl.SSLContext;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.ClientBuilder;
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
 
 import com.cyberark.conjur.api.AuthnProvider;
 import com.cyberark.conjur.api.Credentials;

src/main/java/com/cyberark/conjur/api/clients/ResourceClient.java

@@ -1,12 +1,12 @@
 package com.cyberark.conjur.api.clients;
 
 import javax.net.ssl.SSLContext;
-import jakarta.ws.rs.WebApplicationException;
-import jakarta.ws.rs.client.Client;
-import jakarta.ws.rs.client.ClientBuilder;
-import jakarta.ws.rs.client.Entity;
-import jakarta.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
 
 import com.cyberark.conjur.api.Credentials;
 import com.cyberark.conjur.api.Endpoints;