From a9c4393e4b4383b8d30c02ea45ef46e51ccf3515 Mon Sep 17 00:00:00 2001
From: Jason Altekruse <jaltekruse@usgs.gov>
Date: Wed, 4 Aug 2021 10:48:11 -0600
Subject: [PATCH 1/2] update master to main, github to gitlab
---
Dockerfile | 2 +-
code.json | 6 +++---
gradle/ext.gradle | 4 ++--
scripts/docker-config.inc.sh | 2 +-
.../gov/usgs/earthquake/nshmp/DeaggCalc.java | 20 +++++++++++--------
.../gov/usgs/earthquake/nshmp/DeaggIml.java | 14 ++++++++-----
.../gov/usgs/earthquake/nshmp/Hazard2018.java | 6 ++++--
.../gov/usgs/earthquake/nshmp/HazardCalc.java | 12 ++++++-----
.../gov/usgs/earthquake/nshmp/RateCalc.java | 14 ++++++++-----
src/main/resources/swagger/index.html | 4 ++--
10 files changed, 50 insertions(+), 34 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 3a5e5a678..e0a43e378 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -66,7 +66,7 @@ ENV IML ""
ENV JAVA_XMX "8g"
ENV MODEL ""
ENV MOUNT_MODEL false
-ENV NSHM_VERSION master
+ENV NSHM_VERSION main
ENV PROGRAM hazard
ENV PROJECT ${project}
ENV RETURN_PERIOD ""
diff --git a/code.json b/code.json
index ba79cd172..f524431f1 100644
--- a/code.json
+++ b/code.json
@@ -12,15 +12,15 @@
"licenses": [
{
"name": "Public Domain, CC0-1.0",
- "URL": "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/master/LICENSE.md"
+ "URL": "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/LICENSE.md"
}
]
},
"repositoryURL": "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/",
- "homepageURL": "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/master/docs",
+ "homepageURL": "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/docs",
"downloadURL": "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/releases/tag/v#.#.#",
- "disclaimerURL": "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/master/DISCLAIMER.md",
+ "disclaimerURL": "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/DISCLAIMER.md",
"vcs": "git",
"laborHours": 1200,
diff --git a/gradle/ext.gradle b/gradle/ext.gradle
index ddd9896f6..7ca613ac7 100644
--- a/gradle/ext.gradle
+++ b/gradle/ext.gradle
@@ -84,7 +84,7 @@ ext {
*/
gitCommand = 'git --git-dir=../nshmp-haz/.git describe --tags'
gitTag = gitCommand.execute().text.replace('\n', '') ?: 'unknown'
- gitLink = '<a href="https://github.com/usgs/nshmp-haz">' + gitTag +'</a>'
+ gitLink = '<a href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz">' + gitTag +'</a>'
propsPath = '/resources/main/app.properties'
docTitle = projectName + ': ' + gitLink
docFooter = '<div style="float: left; font-size: 16px; text-align: right; ' +
@@ -92,7 +92,7 @@ ext {
'<b><a href="https://www.usgs.gov" target="_top">U.S. Geological Survey</a></b> ' +
'– National Seismic Hazard Model Project ' +
'(<a href="https://earthquake.usgs.gov/hazards/" target="_top">NSHMP</a>) ' +
- '– <a href="https://github.com/usgs/nshmp-haz/blob/master/LICENSE.md" ' +
+ '– <a href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/LICENSE.m" ' +
'target="_top">License</a> | <b>' + gitLink + '</b></div>'
docOut = findProperty('javadoc_loc')
thinJar = false
diff --git a/scripts/docker-config.inc.sh b/scripts/docker-config.inc.sh
index e8cba0878..3db50451a 100644
--- a/scripts/docker-config.inc.sh
+++ b/scripts/docker-config.inc.sh
@@ -18,7 +18,7 @@ readonly CONFIG_FILE="${CONFIG_FILE:-config.json}";
readonly CONTEXT_PATH="${CONTEXT_PATH:-/}";
readonly JAVA_XMX="${JAVA_XMX:-8g}";
readonly MODEL=$(echo "${MODEL:-CONUS_2008}" | awk \{'print toupper($0)'\});
-readonly NSHM_VERSION="${NSHM_VERSION:-master}";
+readonly NSHM_VERSION="${NSHM_VERSION:-main}";
readonly PROJECT="${PROJECT:-nshmp-haz}";
readonly PROGRAM=$(echo "${PROGRAM:-hazard}" | awk \{'print tolower($0)'\});
readonly WUS="Western US";
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/DeaggCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/DeaggCalc.java
index 05ad82044..2ea4f3d51 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/DeaggCalc.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/DeaggCalc.java
@@ -44,13 +44,15 @@ public class DeaggCalc {
* on required parameters.
*
* <p>Please refer to the nshmp-haz <a
- * href="https://github.com/usgs/nshmp-haz/wiki" target="_top">wiki</a> for
- * comprehensive descriptions of source models, configuration files, site
- * files, and hazard calculations.
+ * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/docs"
+ * target="_top">docs</a> for comprehensive descriptions of source models,
+ * configuration files, site files, and hazard calculations.
*
- * @see <a href="https://github.com/usgs/nshmp-haz/wiki/Building-&-Running"
- * target="_top"> nshmp-haz wiki</a>
- * @see <a href="https://github.com/usgs/nshmp-haz/tree/master/etc/examples"
+ * @see <a
+ * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Building-&-Running.md"
+ * target="_top"> nshmp-haz Building & Running</a>
+ * @see <a
+ * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples"
* target="_top"> example calculations</a>
*/
public static void main(String[] args) {
@@ -162,8 +164,10 @@ public class DeaggCalc {
private static final String PROGRAM = DeaggCalc.class.getSimpleName();
private static final String USAGE_COMMAND =
"java -cp nshmp-haz.jar gov.usgs.earthquake.nshmp.DeaggCalc model sites returnPeriod [config]";
- private static final String USAGE_URL1 = "https://github.com/usgs/nshmp-haz/wiki";
- private static final String USAGE_URL2 = "https://github.com/usgs/nshmp-haz/tree/master/etc";
+ private static final String USAGE_URL1 =
+ "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/docs";
+ private static final String USAGE_URL2 =
+ "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples";
private static final String SITE_STRING = "name,lon,lat[,vs30,vsInf[,z1p0,z2p5]]";
private static final String USAGE = new StringBuilder()
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/DeaggIml.java b/src/main/java/gov/usgs/earthquake/nshmp/DeaggIml.java
index 3cc37d5d0..e24795f33 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/DeaggIml.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/DeaggIml.java
@@ -49,9 +49,11 @@ public class DeaggIml {
* comprehensive descriptions of source models, configuration files, site
* files, and hazard calculations.
*
- * @see <a href="https://github.com/usgs/nshmp-haz/wiki/Building-&-Running"
- * target="_top"> nshmp-haz wiki</a>
- * @see <a href="https://github.com/usgs/nshmp-haz/tree/master/etc/examples"
+ * @see <a
+ * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Building-&-Running.md"
+ * target="_top"> nshmp-haz Building & Running</a>
+ * @see <a
+ * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples"
* target="_top"> example calculations</a>
*/
public static void main(String[] args) {
@@ -163,8 +165,10 @@ public class DeaggIml {
private static final String PROGRAM = DeaggIml.class.getSimpleName();
private static final String USAGE_COMMAND =
"java -cp nshmp-haz.jar gov.usgs.earthquake.nshmp.DeaggIml model sites iml [config]";
- private static final String USAGE_URL1 = "https://github.com/usgs/nshmp-haz/wiki";
- private static final String USAGE_URL2 = "https://github.com/usgs/nshmp-haz/tree/master/etc";
+ private static final String USAGE_URL1 =
+ "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/docs";
+ private static final String USAGE_URL2 =
+ "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples";
private static final String SITE_STRING = "name,lon,lat[,vs30,vsInf[,z1p0,z2p5]]";
private static final String USAGE = new StringBuilder()
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/Hazard2018.java b/src/main/java/gov/usgs/earthquake/nshmp/Hazard2018.java
index 60df02d9b..144a258ad 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/Hazard2018.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/Hazard2018.java
@@ -331,8 +331,10 @@ public class Hazard2018 {
private static final String PROGRAM = Hazard2018.class.getSimpleName();
private static final String USAGE_COMMAND =
"java -cp nshmp-haz.jar gov.usgs.earthquake.nshmp.Hazard2018 model sites [config]";
- private static final String USAGE_URL1 = "https://github.com/usgs/nshmp-haz/wiki";
- private static final String USAGE_URL2 = "https://github.com/usgs/nshmp-haz/tree/master/etc";
+ private static final String USAGE_URL1 =
+ "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/docs";
+ private static final String USAGE_URL2 =
+ "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples";
private static final String SITE_STRING = "name,lon,lat[,vs30,vsInf[,z1p0,z2p5]]";
private static String version() {
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
index dec96fb77..7aa64522d 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
@@ -59,10 +59,10 @@ public class HazardCalc {
* configuration files, site files, and hazard calculations.
*
* @see <a
- * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/wikis/Building-&-Running"
- * target="_top"> nshmp-haz wiki</a>
+ * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Building-&-Running.md"
+ * target="_top"> nshmp-haz Building & Running</a>
* @see <a
- * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/master/etc/examples"
+ * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples"
* target="_top"> example calculations</a>
*/
public static void main(String[] args) {
@@ -229,8 +229,10 @@ public class HazardCalc {
private static final String PROGRAM = HazardCalc.class.getSimpleName();
private static final String USAGE_COMMAND =
"java -cp nshmp-haz.jar gov.usgs.earthquake.nshmp.HazardCalc model sites [config]";
- private static final String USAGE_URL1 = "https://github.com/usgs/nshmp-haz/wiki";
- private static final String USAGE_URL2 = "https://github.com/usgs/nshmp-haz/tree/master/etc";
+ private static final String USAGE_URL1 =
+ "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/docs";
+ private static final String USAGE_URL2 =
+ "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples";
private static final String SITE_STRING = "name,lon,lat[,vs30,vsInf[,z1p0,z2p5]]";
private static String version() {
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java
index c3afa5fc0..b0ccce124 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java
@@ -58,9 +58,11 @@ public class RateCalc {
* comprehensive descriptions of source models, configuration files, site
* files, and earthquake rate calculations.
*
- * @see <a href="https://github.com/usgs/nshmp-haz/wiki/Building-&-Running"
- * target="_top"> nshmp-haz wiki</a>
- * @see <a href="https://github.com/usgs/nshmp-haz/tree/master/etc/examples"
+ * @see <a
+ * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Building-&-Running.md"
+ * target="_top"> nshmp-haz Building & Running</a>
+ * @see <a
+ * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples"
* target="_top"> example calculations</a>
*/
public static void main(String[] args) {
@@ -212,8 +214,10 @@ public class RateCalc {
private static final String PROGRAM = RateCalc.class.getSimpleName();
private static final String USAGE_COMMAND =
"java -cp nshmp-haz.jar gov.usgs.earthquake.nshmp.RateCalc model sites [config]";
- private static final String USAGE_URL1 = "https://github.com/usgs/nshmp-haz/wiki";
- private static final String USAGE_URL2 = "https://github.com/usgs/nshmp-haz/tree/master/etc";
+ private static final String USAGE_URL1 =
+ "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/docs";
+ private static final String USAGE_URL2 =
+ "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples";
private static final String SITE_STRING = "name,lon,lat";
private static final String USAGE = new StringBuilder()
diff --git a/src/main/resources/swagger/index.html b/src/main/resources/swagger/index.html
index 8a4003d3a..9abcef98e 100644
--- a/src/main/resources/swagger/index.html
+++ b/src/main/resources/swagger/index.html
@@ -39,11 +39,11 @@
<div id="swagger-ui"></div>
<footer class="nshmp-template-footer">
- <a href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/master/LICENSE.md">
+ <a href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/LICENSE.md">
License
</a>
- <a href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/master/DISCLAIMER.md">
+ <a href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/DISCLAIMER.md">
Disclaimer
</a>
--
GitLab
From 385470b01e181458d3d553c6d4e33bf42ed626ca Mon Sep 17 00:00:00 2001
From: "Clayton, Brandon Scott" <bclayton@usgs.gov>
Date: Wed, 4 Aug 2021 17:38:11 +0000
Subject: [PATCH 2/2] Apply 1 suggestion(s) to 1 file(s)
---
gradle/ext.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/ext.gradle b/gradle/ext.gradle
index 7ca613ac7..3cc94336d 100644
--- a/gradle/ext.gradle
+++ b/gradle/ext.gradle
@@ -92,7 +92,7 @@ ext {
'<b><a href="https://www.usgs.gov" target="_top">U.S. Geological Survey</a></b> ' +
'– National Seismic Hazard Model Project ' +
'(<a href="https://earthquake.usgs.gov/hazards/" target="_top">NSHMP</a>) ' +
- '– <a href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/LICENSE.m" ' +
+ '– <a href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/LICENSE.md" ' +
'target="_top">License</a> | <b>' + gitLink + '</b></div>'
docOut = findProperty('javadoc_loc')
thinJar = false
--
GitLab