jdk 17, updates

Author: BrandonArp

.jdkw

@@ -1,5 +1,4 @@
 JDKW_RELEASE=latest
 JDKW_DIST=zulu
-JDKW_BUILD=8.38.0.13
-JDKW_VERSION=8.0.212
-JDKW_VERBOSE=true
+JDKW_BUILD=17.36.13-ca
+JDKW_VERSION=17.0.4

Jenkinsfile

@@ -1,7 +1,6 @@
 pipeline {
   agent {
     kubernetes {
-      yamlFile 'kubes-pod.yaml'
       defaultContainer 'ubuntu'
       activeDeadlineSeconds 3600
       idleMinutes 15

jdk-wrapper.sh

@@ -17,6 +17,12 @@
 # For documentation please refer to:
 # https://github.com/KoskiLabs/jdk-wrapper/blob/master/README.md
 
+HTTP_PROTOCOL="http"
+FILE_PROTOCOL="file"
+
+LATEST_RELEASE="latest"
+SNAPSHOT_RELEASE="snapshot"
+
 log_err() {
   l_prefix=$(date  +'%H:%M:%S')
   printf "[%s] %s\\n" "${l_prefix}" "$@" 1>&2;
@@ -42,37 +48,63 @@ safe_command() {
 
 checksum() {
   l_file="$1"
-  checksum_exec=""
-  checksum_args=""
+  l_checksum_exec=""
+  l_checksum_args=""
   if command -v sha256sum > /dev/null; then
-    checksum_exec="sha256sum"
+    l_checksum_exec="sha256sum"
   elif command -v shasum > /dev/null; then
-    checksum_exec="shasum"
-    checksum_args="-a 256"
+    l_checksum_exec="shasum"
+    l_checksum_args="-a 256"
   elif command -v sha1sum > /dev/null; then
-    checksum_exec="sha1sum"
+    l_checksum_exec="sha1sum"
   elif command -v md5 > /dev/null; then
-    checksum_exec="md5"
+    l_checksum_exec="md5"
   fi
-  if [ -z "${checksum_exec}" ]; then
+  if [ -z "${l_checksum_exec}" ]; then
     log_err "ERROR: No supported checksum command found!"
     exit 1
   fi
-  ${checksum_exec} ${checksum_args} < "${l_file}"
+  ${l_checksum_exec} ${l_checksum_args} < "${l_file}"
 }
 
 rand() {
   awk 'BEGIN {srand();printf "%d\n", (rand() * 10^8);}'
 }
 
-download_if_needed() {
-  file="$1"
-  path="$2"
-  if [ ! -f "${path}/${file}" ]; then
-    jdkw_url="${JDKW_BASE_URI}/releases/download/${JDKW_RELEASE}/${file}"
-    log_out "Downloading ${file} from ${jdkw_url}"
-    safe_command "curl ${curl_options} -f -k -L -o \"${path}/${file}\" \"${jdkw_url}\""
-    safe_command "chmod +x \"${path}/${file}\""
+get_protocol() {
+  case "${JDKW_BASE_URI}" in
+  http://*|https://*)
+    printf "%s" "${HTTP_PROTOCOL}"
+    ;;
+  file://*)
+    printf "%s" "${FILE_PROTOCOL}"
+    ;;
+  *)
+    log_err "ERROR: Unsupported protocol in JDKW_BASE_URI: ${JDKW_BASE_URI}"
+    exit 1
+  esac
+}
+
+obtain_if_needed() {
+  l_file="$1"
+  l_target_path="$2"
+  if [ ! -f "${l_target_path}/${l_file}" ]; then
+    case "${JDKW_BASE_URI}" in
+    http://*|https://*)
+      l_jdkw_url="${JDKW_BASE_URI}/releases/download/${JDKW_RELEASE}/${l_file}"
+      log_out "Downloading ${l_file} from ${l_jdkw_url}"
+      safe_command "curl ${curl_options} -f -k -L -o \"${l_target_path}/${l_file}\" \"${l_jdkw_url}\""
+      ;;
+    file://*)
+      l_jdkw_path="${JDKW_BASE_URI#file://}/${l_file}"
+      log_out "Copying ${l_file} from ${l_jdkw_path}"
+      safe_command "cp \"${l_jdkw_path}\" \"${l_target_path}/${l_file}\""
+      ;;
+    *)
+      log_err "ERROR: Unsupported protocol in JDKW_BASE_URI: ${JDKW_BASE_URI}"
+      exit 1
+    esac
+    safe_command "chmod +x \"${l_target_path}/${l_file}\""
   fi
 }
 
@@ -98,7 +130,6 @@ done < "${l_fifo}"
 safe_command "rm \"${l_fifo}\""
 
 # Process (but do not load) properties from command line arguments
-command=
 cmd_configuration=
 for arg in "$@"; do
   jdkw_arg=$(echo "${arg}" | grep '^JDKW_.*')
@@ -109,13 +140,6 @@ for arg in "$@"; do
   if [ -n "${jdkw_arg}" ]; then
     cmd_configuration="${cmd_configuration}${arg} "
   fi
-  case "${arg}" in
-    *\'*)
-       arg=$(printf "%s" "$arg" | sed "s/'/'\"'\"'/g")
-       ;;
-    *) : ;;
-  esac
-  command="${command} '${arg}'"
 done
 
 # Default base directory to current working directory
@@ -144,7 +168,10 @@ if [ -z "${JDKW_BASE_URI}" ]; then
     JDKW_BASE_URI="https://github.com/KoskiLabs/jdk-wrapper"
 fi
 if [ -z "${JDKW_RELEASE}" ]; then
-  JDKW_RELEASE="latest"
+  JDKW_RELEASE="${LATEST_RELEASE}"
+  if [ $(get_protocol) = "${FILE_PROTOCOL}" ]; then
+    JDKW_RELEASE="${SNAPSHOT_RELEASE}"
+  fi
   log_out "Defaulted to version ${JDKW_RELEASE}"
 fi
 if [ -z "${JDKW_TARGET}" ]; then
@@ -156,7 +183,7 @@ if [ -z "${JDKW_VERBOSE}" ]; then
 fi
 
 # Resolve latest version
-if [ "${JDKW_RELEASE}" = "latest" ]; then
+if [ "${JDKW_RELEASE}" = "${LATEST_RELEASE}" ]; then
   latest_version_json="${TMPDIR:-/tmp}/jdkw-latest-version-$$.$(rand)"
   safe_command "curl ${curl_options} -f -k -L -o \"${latest_version_json}\" -H 'Accept: application/json' \"${JDKW_BASE_URI}/releases/latest\""
   JDKW_RELEASE=$(sed -e 's/.*"tag_name":"\([^"]*\)".*/\1/' < "${latest_version_json}")
@@ -166,6 +193,10 @@ fi
 
 # Ensure target directory exists
 jdkw_path="${JDKW_TARGET}/jdkw/${JDKW_RELEASE}"
+if [ -d "${jdkw_path}" ] && [ "${JDKW_RELEASE}" = "${SNAPSHOT_RELEASE}" ]; then
+  log_out "Removing target snapshot directory ${jdkw_path}"
+  safe_command "rm -rf \"${jdkw_path}\""
+fi
 if [ ! -d "${jdkw_path}" ]; then
   log_out "Creating target directory ${jdkw_path}"
   safe_command "mkdir -p \"${jdkw_path}\""
@@ -174,8 +205,8 @@ fi
 # Download the jdk wrapper version
 jdkw_impl="jdkw-impl.sh"
 jdkw_wrapper="jdk-wrapper.sh"
-download_if_needed "${jdkw_impl}" "${jdkw_path}"
-download_if_needed "${jdkw_wrapper}" "${jdkw_path}"
+obtain_if_needed "${jdkw_impl}" "${jdkw_path}"
+obtain_if_needed "${jdkw_wrapper}" "${jdkw_path}"
 
 # Check whether this wrapper is the one specified for this version
 jdkw_download="${jdkw_path}/${jdkw_wrapper}"

kubes-pod.yaml

@@ -1,5 +1,5 @@
 #Maven download properties
-#Wed May 13 22:36:51 UTC 2020
-checksumAlgorithm=SHA1
+#Wed Jan 19 23:16:22 PST 2022
+distributionUrl=https\://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
 verifyDownload=true
-distributionUrl=https\://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
+checksumAlgorithm=SHA1

maven/maven-wrapper.properties

@@ -18,7 +18,7 @@
   <parent>
     <groupId>com.arpnetworking.build</groupId>
     <artifactId>arpnetworking-parent-pom</artifactId>
-    <version>2.0.10</version>
+    <version>3.0.10</version>
     <relativePath />
   </parent>
 
@@ -68,12 +68,13 @@
 
   <properties>
     <!--Dependency versions-->
-    <akka.grpc.version>2.1.0</akka.grpc.version>
-    <akka.version>2.6.9</akka.version>
-    <grpc.stub.version>1.41.0</grpc.stub.version>
-    <guava.version>30.1-android</guava.version>
-    <protobuf.version>3.11.4</protobuf.version>
-    <protoc.version>3.11.4</protoc.version>
+    <akka.grpc.version>2.1.5</akka.grpc.version>
+    <akka.version>2.6.19</akka.version>
+    <grpc.stub.version>1.48.1</grpc.stub.version>
+    <guava.version>31.1-jre</guava.version>
+    <jax.annotations.version>1.3.2</jax.annotations.version>
+    <protobuf.version>3.21.5</protobuf.version>
+    <protoc.version>3.21.5</protoc.version>
     <scala.version>2.13</scala.version>
 
     <!--Plugin versions-->
@@ -205,7 +206,7 @@
     <dependency>
       <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-http-core_${scala.version}</artifactId>
-      <version>10.2.6</version>
+      <version>10.2.9</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -235,10 +236,16 @@
       <artifactId>grpc-protobuf</artifactId>
       <version>${grpc.stub.version}</version>
     </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>${jax.annotations.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
-      <version>2.13.6</version>
+      <version>2.13.8</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>