HPCC4J-523 Incorrect Java version linking based on JDK (#622)

* HPCC4J-523 Incorrect Java version linking based on JDK - Updated POM file to use release configuration - Updated Github actions to use JDK 11 required by release build feature Signed-off-by: James McMullan [email protected] * Removed redundant javadoc return annotation * Code review changes --------- Signed-off-by: James McMullan [email protected]
hpcc-systems · Jul 18, 2023 · 35a357f · 35a357f
1 parent 44ff5fd
commit 35a357f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 23 deletions.
diff --git a/.github/workflows/BuildTestCandidateAndMaster.yml b/.github/workflows/BuildTestCandidateAndMaster.yml
@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
 
     # speed things up with caching from https://docs.github.com/en/actions/guides/building-and-testing-java-with-maven
     - name: Cache Maven packages

diff --git a/.github/workflows/JAPIPRBuildAction.yml b/.github/workflows/JAPIPRBuildAction.yml
@@ -18,10 +18,11 @@ jobs:
         git config user.name 'hpccsystems development'
         git rebase origin/${{ github.event.pull_request.base.ref }}
         git log --pretty=one -n 15
-    - name: Set up JDK 1.8
+
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
 
     # speed things up with caching from https://docs.github.com/en/actions/guides/building-and-testing-java-with-maven
     - name: Cache Maven packages
@@ -30,6 +31,6 @@ jobs:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
-        
+
     - name: Build with Maven
       run: mvn -B package --file pom.xml
diff --git a/.github/workflows/Nightly.yml b/.github/workflows/Nightly.yml
@@ -3,17 +3,17 @@ name: hpcc4j Nightly
 on:
   schedule:
   - cron: "0 2 * * 1-5"
-  
+
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
+    - name: Set up JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
     - name: Build with Maven
       run: mvn -B package --file pom.xml
diff --git a/.github/workflows/httpsUnitTests.yml b/.github/workflows/httpsUnitTests.yml
@@ -14,10 +14,10 @@ jobs:
 
     steps:
 
-    - name: Setup JDK 1.8
+    - name: Setup JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
 
     - name: Install K8s
       uses: balchua/[email protected]
@@ -100,14 +100,19 @@ jobs:
         sudo -- sh -c -e "echo '${{ env.ROWSERVICE_IP }} rowservice.default' >> /etc/hosts";
         sudo -- sh -c -e "echo '${{ env.SQL_TO_ECL_IP }} sql2ecl.default' >> /etc/hosts";
 
+    # Notes:
+    # Using keytool -import -cacerts doesn't work as expected, need to specify the cacerts path explicitly
+    # Path changed between JDK 8 & 11, Command for JDK 8:
+    # sudo keytool -import -keystore $JAVA_HOME/jre/lib/security/cacerts -storepass changeit -noprompt -alias eclwatch-tls -file cert.der
     - name: Trust Certs
       run: |
         openssl s_client -showcerts -connect eclwatch.default:8010 < /dev/null | openssl x509 -outform DER > cert.der
-        sudo keytool -import -keystore $JAVA_HOME/jre/lib/security/cacerts -storepass changeit -noprompt -alias eclwatch-tls -file cert.der
+        sudo keytool -import -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -noprompt -alias eclwatch-tls -file cert.der
         openssl s_client -showcerts -connect rowservice.default:7600 < /dev/null | openssl x509 -outform DER > cert.der
-        sudo keytool -import -keystore $JAVA_HOME/jre/lib/security/cacerts -storepass changeit -noprompt -alias dafilesrv-tls -file cert.der
+        sudo keytool -import -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -noprompt -alias dafilesrv-tls -file cert.der
         openssl s_client -showcerts -connect sql2ecl.default:8510 < /dev/null | openssl x509 -outform DER > cert.der
-        sudo keytool -import -keystore $JAVA_HOME/jre/lib/security/cacerts -storepass changeit -noprompt -alias sqltoecl-tls -file cert.der
+        sudo keytool -import -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit -noprompt -alias sqltoecl-tls -file cert.der
+
 
     # speed things up with caching from https://docs.github.com/en/actions/guides/building-and-testing-java-with-maven
     - name: Cache Maven packages

diff --git a/.github/workflows/javadocTest.yml b/.github/workflows/javadocTest.yml
@@ -1,6 +1,6 @@
 name: Javadoc Test
 
-on: 
+on:
   pull_request:
     branches:
       - "master"
@@ -11,13 +11,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      
+
     - uses: actions/checkout@v2
 
-    - name: Setup JDK 1.8
+    - name: Setup JDK 11
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
 
     # speed things up with caching from https://docs.github.com/en/actions/guides/building-and-testing-java-with-maven
     - name: Cache Maven packages
@@ -26,6 +26,6 @@ jobs:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
-  
+
     - name: Build with Maven
       run: mvn -B -Dmaven.test.skip=True clean install javadoc:javadoc
diff --git a/pom.xml b/pom.xml
@@ -31,8 +31,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.version>3.8.0</maven.compiler.version>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.release>8</maven.compiler.release>
     <maven.assembly.version>3.1.1</maven.assembly.version>
     <sonatype.staging.version>1.6.8</sonatype.staging.version>
     <sonatype.staging.autorelease>false</sonatype.staging.autorelease>
@@ -203,8 +202,7 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>${maven.compiler.version}</version>
           <configuration>
-            <source>${maven.compiler.source}</source>
-            <target>${maven.compiler.target}</target>
+            <release>${maven.compiler.release}</release>
             <groups>${maven.compiler.groups}</groups>
             <excludedGroups>${maven.compiler.excludedGroups}</excludedGroups>
           </configuration>

diff --git a/wsclient/src/main/java/org/hpccsystems/ws/client/HPCCWsWorkUnitsClient.java b/wsclient/src/main/java/org/hpccsystems/ws/client/HPCCWsWorkUnitsClient.java
@@ -793,7 +793,6 @@ public void publishWU(String wuid) throws Exception
      *             the array of esp exception wrapper
      * @param wuinfodetailsparams
      *            - workunit info request wrapper
-     * @return - ECLWorkunit object with information pertaining to the WU
      * @throws Exception a {@link java.lang.Exception} object.
      *             - Caller must handle exceptions
      * @throws ArrayOfEspExceptionWrapper a {@link org.hpccsystems.ws.client.wrappers.ArrayOfEspExceptionWrapper} object.