Update gradle build

build.gradle

@@ -31,7 +31,7 @@ plugins {
   id "application"
   id "com.diffplug.spotless" version "${spotlessVersion}"
   id "com.github.johnrengelman.shadow" version "${shadowVersion}"
-  id "com.github.node-gradle.node" version "${nodeVersion}"
+  id "com.github.node-gradle.node" version "${nodePluginVersion}"
   id "com.github.spotbugs" version "${spotbugsVersion}"
   id "com.star-zero.gradle.githook" version "${githooksVersion}"
   id "eclipse-wtp"
@@ -40,32 +40,25 @@ plugins {
   id "maven-publish"
 }
 
-configurations {
-  nshmp
-}
-
 apply from: "${projectDir}/gradle/dependencies.gradle"
 apply from: "${projectDir}/gradle/ext.gradle"
 apply from: "${projectDir}/gradle/jar.gradle"
+apply from: "${projectDir}/gradle/git-hooks.gradle"
+apply from: "${projectDir}/gradle/node.gradle"
 apply from: "${projectDir}/gradle/repositories.gradle"
+apply from: "${projectDir}/gradle/spotbugs.gradle"
+apply from: "${projectDir}/gradle/spotless.gradle"
 
-sourceCompatibility = JavaVersion.VERSION_11
-compileJava.options.encoding = "UTF-8"
 
+compileJava.options.encoding = "UTF-8"
+compileTestJava.options.encoding = "UTF-8"
 mainClassName = "gov.usgs.earthquake.nshmp.www.Application"
+sourceCompatibility = JavaVersion.VERSION_11
 
 jacoco {
   toolVersion = "0.8.4"
 }
 
-test {
-  useJUnitPlatform()
-
-  filter {
-    excludeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTestsLarge"
-  }
-}
-
 jacocoTestReport {
   reports {
     xml.enabled true
@@ -87,7 +80,13 @@ tasks.withType(JavaCompile) {
 }
 
 tasks.withType(JavaExec) {
-  jvmArgs('-noverify', '-Xms2g', '-Xmx8g', '-XX:TieredStopAtLevel=1', '-Dcom.sun.management.jmxremote')
+  jvmArgs(
+    '-noverify',
+    '-Xms2g',
+    '-Xmx8g',
+    '-XX:TieredStopAtLevel=1',
+    '-Dcom.sun.management.jmxremote',
+  )
 }
 
 /* Add HTML reports to SpotBugs */
@@ -105,15 +104,10 @@ task libsClean(type: Delete) {
 }
 clean.dependsOn libsClean
 
-gradle.afterProject {
-  copy {
-    from {
-      configurations.nshmp.collect { zipTree(it) }
-    }
-    into nshmpLib
+test {
+  useJUnitPlatform()
+
+  filter {
+    excludeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTestsLarge"
   }
-  apply from: "${nshmpLibGradleDir}/git-hooks.gradle"
-  apply from: "${nshmpLibGradleDir}/node.gradle"
-  apply from: "${nshmpLibGradleDir}/spotbugs.gradle"
-  apply from: "${nshmpLibGradleDir}/spotless.gradle"
 }

gradle.properties

@@ -7,7 +7,8 @@ jacksonVersion = 2.9.0
 junitVersion = 5.8.2
 micronautVersion = 2.4.1
 mnPluginVersion = 1.4.2
-nodeVersion = 3.0.1
+nodePluginVersion = 3.0.1
+nodeVersion = 16.3.0
 nshmpLibVersion = 0.8.1
 nshmpWsUtilsVersion = 0.1.2
 shadowVersion = 5.2.0

gradle/dependencies.gradle

 
 dependencies {
+  // NSHMP
   implementation "ghsc:nshmp-lib:${nshmpLibVersion}"
   implementation "ghsc:nshmp-ws-utils:${nshmpWsUtilsVersion}"
-  nshmp "ghsc:nshmp-lib:${nshmpLibVersion}@zip"
 
   // AWS
   implementation "com.amazonaws:aws-lambda-java-core:${awsLambdaCoreVersion}"

settings.gradle

 plugins {
-  id "com.alexvasilkov.git-dependencies" version "2.0.1"
+  id "com.alexvasilkov.git-dependencies" version "2.0.3"
 }
 
 rootProject.name = "nshmp-haz"
@@ -19,7 +19,7 @@ git {
   if (user && pass) {
     fetch("https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git", {
       name "nshmp-haz-dep--nshm-hi-2021"
-      tag "main"
+      tag "2.0.0"
     })
   }
 }