Merge branch 'cli-continued' into 'main'

Dependency updates

See merge request !573

.gitignore

@@ -25,4 +25,5 @@ libs
 
 # Node
 node_modules
+package.json
 package-lock.json

build.gradle

@@ -29,7 +29,7 @@
 
 plugins {
   id "application"
-  id "com.diffplug.gradle.spotless" version "${spotlessVersion}"
+  id "com.diffplug.spotless" version "${spotlessVersion}"
   id "com.github.johnrengelman.shadow" version "${shadowVersion}"
   id "com.github.node-gradle.node" version "${nodeVersion}"
   id "com.github.spotbugs" version "${spotbugsVersion}"
@@ -60,6 +60,10 @@ jacoco {
 
 test {
   useJUnitPlatform()
+
+  filter {
+    excludeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTestsLarge"
+  }
 }
 
 jacocoTestReport {

docs/pages/Source-Types.md

@@ -37,7 +37,7 @@ for rupture geometry. Truncated Gutenberg-Richter MFDs are used to model grid so
 magnitudes and rates with logic trees of varying a-value, b-value and maximum magnitude. For grid
 sources the relative rate at each grid node is defined using a spatial PDF (see notes on
 spatial PDFs, [below](#spatial-pdfs)). When realizing each source the spatial PDF value is scaled
-by each regional rate in a rate-tree.
+by each regional rate in a required `rate-tree`.
 
 Grid sources are represented in a model using a logic tree with a `rupture-sets.json` defining the
 ruptures on each branch.  Because gridded seismicity models may be governed by regionally

etc/peer/models/Set2-Case2a-fast/active-crust/gmm-tree.json

 [
-  { "id": "ASK_14", "weight": 1.0 }
+  { "id": "ASK_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case2a/active-crust/gmm-tree.json

 [
-  { "id": "ASK_14", "weight": 1.0 }
+  { "id": "ASK_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case2b-fast/active-crust/gmm-tree.json

 [
-  { "id": "BSSA_14", "weight": 1.0 }
+  { "id": "BSSA_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case2b/active-crust/gmm-tree.json

 [
-  { "id": "BSSA_14", "weight": 1.0 }
+  { "id": "BSSA_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case2c-fast/active-crust/gmm-tree.json

 [
-  { "id": "CB_14", "weight": 1.0 }
+  { "id": "CB_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case2c/active-crust/gmm-tree.json

 [
-  { "id": "CB_14", "weight": 1.0 }
+  { "id": "CB_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case2d-fast/active-crust/gmm-tree.json

 [
-  { "id": "CY_14", "weight": 1.0 }
+  { "id": "CY_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case2d/active-crust/gmm-tree.json

 [
-  { "id": "CY_14", "weight": 1.0 }
+  { "id": "CY_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case3a-fast/active-crust/gmm-tree.json

 [
-  { "id": "ASK_14", "weight": 1.0 }
+  { "id": "ASK_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case3a/active-crust/gmm-tree.json

 [
-  { "id": "ASK_14", "weight": 1.0 }
+  { "id": "ASK_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case3b-fast/active-crust/gmm-tree.json

 [
-  { "id": "BSSA_14", "weight": 1.0 }
+  { "id": "BSSA_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case3b/active-crust/gmm-tree.json

 [
-  { "id": "BSSA_14", "weight": 1.0 }
+  { "id": "BSSA_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case3c-fast/active-crust/gmm-tree.json

 [
-  { "id": "CB_14", "weight": 1.0 }
+  { "id": "CB_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case3c/active-crust/gmm-tree.json

 [
-  { "id": "CB_14", "weight": 1.0 }
+  { "id": "CB_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case3d-fast/active-crust/gmm-tree.json

 [
-  { "id": "CY_14", "weight": 1.0 }
+  { "id": "CY_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case3d/active-crust/gmm-tree.json

 [
-  { "id": "CY_14", "weight": 1.0 }
+  { "id": "CY_14_BASE", "weight": 1.0 }
 ]

etc/peer/models/Set2-Case4a-fast/active-crust/gmm-tree.json

 [
-  { "id": "CY_14", "weight": 1.0 }
+  { "id": "CY_14_BASE", "weight": 1.0 }
 ]