Paren pom upgrade may 2020 (#128)

* Upgrade parent pom and conform to new requirements.

* Upgrade assembly plugin.

* Converted Javadoc from <code> to {@link ...} and {@code ...}

* Added package-info.java files.

* Converted to java.time.

* Undid nullable to optional. Resolved findbugs vs spotbugs.

* Rebased and resolved.

Author: vjkoskela

.jdkw

@@ -1,4 +1,4 @@
 JDKW_RELEASE=latest
 JDKW_DIST=zulu
-JDKW_BUILD=8.27.0.7
-JDKW_VERSION=8.0.162
+JDKW_BUILD=8.38.0.13
+JDKW_VERSION=8.0.212

README.md

@@ -78,7 +78,7 @@ For example:
   "aggregationPort": 7065,
   "maxConnectionTimeout": "PT2M",
   "minConnectionTimeout": "PT1M",
-  "jvmMetricsCollectionInterval": "PT.5S",
+  "jvmMetricsCollectionInterval": "PT0.5S",
   "rebalanceConfiguration": {
     "maxParallel": 100,
     "threshold": 500

config/config.conf

@@ -9,7 +9,7 @@ httpStatusPath="/status"
 httpVersionPath="/version"
 aggregationHost="0.0.0.0"
 aggregationPort=7065
-jvmMetricsCollectionInterval="PT.5S"
+jvmMetricsCollectionInterval="PT0.5S"
 maxConnectionTimeout="PT2M"
 minConnectionTimeout="PT1M"
 clusterHostSuffix=".cluster"

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}"

maven/maven-wrapper.properties

@@ -1,5 +1,5 @@
 #Maven download properties
-#Thu Feb 22 06:38:47 UTC 2018
+#Fri May 08 03:14:08 UTC 2020
 checksumAlgorithm=SHA1
 verifyDownload=true
-distributionUrl=https\://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
+distributionUrl=https\://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip

pom.xml

@@ -18,7 +18,7 @@
   <parent>
     <groupId>com.arpnetworking.build</groupId>
     <artifactId>arpnetworking-parent-pom</artifactId>
-    <version>1.1.7</version>
+    <version>2.0.6</version>
     <relativePath />
   </parent>
 
@@ -107,25 +107,23 @@
     <akka.kryo.version>0.5.2</akka.kryo.version>
     <apache.httpclient.version>4.5.2</apache.httpclient.version>
     <apache.httpcore.version>4.4.5</apache.httpcore.version>
-    <arpnetworking.commons.version>1.13.3</arpnetworking.commons.version>
+    <arpnetworking.commons.version>1.20.0</arpnetworking.commons.version>
     <aspectjrt.version>1.9.1</aspectjrt.version>
     <asynchttpclient.version>2.0.24</asynchttpclient.version>
     <cglib.version>3.2.5</cglib.version>
     <commons.codec.version>1.10</commons.codec.version>
     <ebean.version>6.8.1</ebean.version>
-    <findbugs.annotations.version>3.0.1</findbugs.annotations.version>
     <flyway.version>3.2.1</flyway.version>
     <guava.version>23.4-jre</guava.version>
     <guice.version>4.1.0</guice.version>
     <hamcrest.version>2.0.0.0</hamcrest.version>
     <hikari.version>2.5.1</hikari.version>
     <fastutil.version>8.3.1</fastutil.version>
     <h2.version>1.4.193</h2.version>
-    <jackson.version>2.9.2</jackson.version>
+    <jackson.version>2.9.8</jackson.version>
     <javassist.version>3.22.0-GA</javassist.version>
     <javassist.maven.core.version>0.2.1</javassist.maven.core.version>
     <javax.persistence.version>1.0.2</javax.persistence.version>
-    <joda.time.version>2.9.9</joda.time.version>
     <jsr305.version>3.0.2</jsr305.version>
     <junit.version>4.12</junit.version>
     <junitparams.version>1.0.5</junitparams.version>
@@ -152,6 +150,7 @@
     <scala.library.version>2.12.3</scala.library.version>
     <signalfx.protoc.version>0.0.23</signalfx.protoc.version>
     <slf4j.version>1.7.25</slf4j.version>
+    <spotbugs.annotations.version>3.1.12</spotbugs.annotations.version>
     <typesafe.config.version>1.3.1</typesafe.config.version>
     <typesafe.ssl.config.version>0.2.2</typesafe.ssl.config.version>
     <wiremock.version>2.12.0</wiremock.version>
@@ -162,11 +161,11 @@
     <aspectj.maven.plugin.version>1.11</aspectj.maven.plugin.version>
     <docker.maven.plugin.version>0.15.9</docker.maven.plugin.version>
     <javassist.maven.plugin.version>0.1.2</javassist.maven.plugin.version>
-    <maven.assembly.plugin.version>2.6</maven.assembly.plugin.version>
+    <maven.assembly.plugin.version>3.3.0</maven.assembly.plugin.version>
     <rpm.maven.plugin.version>2.1.5</rpm.maven.plugin.version>
 
     <!-- Findbugs -->
-    <findbugs.exclude>${project.basedir}/findbugs.exclude.xml</findbugs.exclude>
+    <spotbugs.exclude>${project.basedir}/spotbugs.exclude.xml</spotbugs.exclude>
 
     <!-- Code Coverage -->
     <jacoco.check.line.coverage>0.25</jacoco.check.line.coverage>
@@ -208,8 +207,8 @@
         <artifactId>maven-checkstyle-plugin</artifactId>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -554,8 +553,8 @@
       <exclusions>
         <!-- TODO(ville): Remove suppression once findbugs to spotbugs migration is complete in CAGG -->
         <exclusion>
-          <groupId>com.github.spotbugs</groupId>
-          <artifactId>spotbugs-annotations</artifactId>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>findbugs-annotations</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -566,22 +565,15 @@
       <exclusions>
         <!-- TODO(ville): Remove suppression once findbugs to spotbugs migration is complete in CAGG -->
         <exclusion>
-          <groupId>com.github.spotbugs</groupId>
-          <artifactId>spotbugs-annotations</artifactId>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>findbugs-annotations</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
     <dependency>
       <groupId>com.arpnetworking.metrics.extras</groupId>
       <artifactId>jvm-extra</artifactId>
       <version>${metrics.jvm.extra.version}</version>
-      <exclusions>
-        <!-- TODO(ville): Remove suppression once findbugs to spotbugs migration is complete in CAGG -->
-        <exclusion>
-          <groupId>com.github.spotbugs</groupId>
-          <artifactId>spotbugs-annotations</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <!-- Google -->
     <dependency>
@@ -636,13 +628,13 @@
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jdk8</artifactId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
       <version>${jackson.version}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-joda</artifactId>
+      <artifactId>jackson-datatype-jdk8</artifactId>
       <version>${jackson.version}</version>
       <scope>runtime</scope>
     </dependency>
@@ -749,11 +741,13 @@
       <groupId>com.arpnetworking.commons</groupId>
       <artifactId>commons</artifactId>
       <version>${arpnetworking.commons.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>${joda.time.version}</version>
+      <exclusions>
+        <!-- TODO(ville): Remove suppression once findbugs to spotbugs migration is complete -->
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>findbugs-annotations</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>net.sf.oval</groupId>
@@ -785,9 +779,9 @@
       <version>${jsr305.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>findbugs-annotations</artifactId>
-      <version>${findbugs.annotations.version}</version>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <version>${spotbugs.annotations.version}</version>
     </dependency>
     <dependency>
       <groupId>org.scala-lang</groupId>
@@ -833,6 +827,13 @@
       <groupId>org.reflections</groupId>
       <artifactId>reflections</artifactId>
       <version>${reflections.version}</version>
+      <exclusions>
+        <!-- TODO(ville): Remove suppression once findbugs to spotbugs migration is complete in CAGG -->
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>findbugs-annotations</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.aspectj</groupId>