From e011fc72fc2600e6f0e301e0a59d7b30fe5c4452 Mon Sep 17 00:00:00 2001 From: Ralph O'Flinn Date: Mon, 18 Oct 2021 00:35:08 -0500 Subject: [PATCH 1/4] Update pom.xml updating packaging to pom from war --- installer/webapp/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml index 6f72babe3..fd20a69c9 100644 --- a/installer/webapp/pom.xml +++ b/installer/webapp/pom.xml @@ -8,7 +8,7 @@ org.vivoweb vitro-installer-webapp 1.12.1-SNAPSHOT - war + pom org.vivoweb From 685d0897a64c21ca2e2fb898f83ed0248c6aff59 Mon Sep 17 00:00:00 2001 From: Ralph O'Flinn Date: Fri, 10 Dec 2021 03:10:11 -0600 Subject: [PATCH 2/4] update gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7af2b2898..e4c9f3351 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,6 @@ utilities/sdb_to_tdb/.work **/bin/ .fake -.ionide \ No newline at end of file +.ionide + +.vscode From 420971464afab225c685777ee9ca87e7b2c7d72c Mon Sep 17 00:00:00 2001 From: Ralph O'Flinn Date: Thu, 16 Dec 2021 01:24:47 -0600 Subject: [PATCH 3/4] [maven-scm-plugin] prepare release vitro-1.12.1 --- api/pom.xml | 6 +++--- dependencies/pom.xml | 4 ++-- home/pom.xml | 4 ++-- installer/home/pom.xml | 4 ++-- installer/pom.xml | 9 +-------- installer/webapp/pom.xml | 4 ++-- pom.xml | 6 ++++-- webapp/pom.xml | 6 +++--- 8 files changed, 19 insertions(+), 24 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index e951420a7..fc0563db3 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-api - 1.12.1-SNAPSHOT + 1.12.1 jar org.vivoweb vitro-project - 1.12.1-SNAPSHOT + 1.12.1 .. @@ -73,7 +73,7 @@ org.vivoweb vitro-dependencies - 1.12.1-SNAPSHOT + 1.12.1 pom diff --git a/dependencies/pom.xml b/dependencies/pom.xml index a5ac32627..929f9b03f 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-dependencies - 1.12.1-SNAPSHOT + 1.12.1 pom org.vivoweb vitro-project - 1.12.1-SNAPSHOT + 1.12.1 .. diff --git a/home/pom.xml b/home/pom.xml index b93558ecd..4d992c598 100644 --- a/home/pom.xml +++ b/home/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-home - 1.12.1-SNAPSHOT + 1.12.1 pom org.vivoweb vitro-project - 1.12.1-SNAPSHOT + 1.12.1 .. diff --git a/installer/home/pom.xml b/installer/home/pom.xml index df47276db..8dcb826d4 100644 --- a/installer/home/pom.xml +++ b/installer/home/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-home - 1.12.1-SNAPSHOT + 1.12.1 pom org.vivoweb vitro-installer - 1.12.1-SNAPSHOT + 1.12.1 .. diff --git a/installer/pom.xml b/installer/pom.xml index e9b742fff..331fa3c0b 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -7,16 +7,9 @@ org.vivoweb vitro-installer - 1.12.1-SNAPSHOT + 1.12.1 pom - - org.vivoweb - vitro-project - 1.12.1-SNAPSHOT - .. - - Vitro Installer diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml index fd20a69c9..d3730e994 100644 --- a/installer/webapp/pom.xml +++ b/installer/webapp/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-webapp - 1.12.1-SNAPSHOT + 1.12.1 pom org.vivoweb vitro-installer - 1.12.1-SNAPSHOT + 1.12.1 .. diff --git a/pom.xml b/pom.xml index 93743c032..81e3495fc 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.vivoweb vitro-project - 1.12.1-SNAPSHOT + 1.12.1 pom Vitro @@ -187,7 +187,9 @@ ossrh https://oss.sonatype.org/ - true + false + true + 10 diff --git a/webapp/pom.xml b/webapp/pom.xml index 14d58410c..0721862f5 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-webapp - 1.12.1-SNAPSHOT + 1.12.1 war org.vivoweb vitro-project - 1.12.1-SNAPSHOT + 1.12.1 .. @@ -41,7 +41,7 @@ org.vivoweb vitro-api - 1.12.1-SNAPSHOT + 1.12.1 From c88626dffc6971e3063a93ad92d186ae9dddc4b6 Mon Sep 17 00:00:00 2001 From: Ralph O'Flinn Date: Thu, 16 Dec 2021 01:25:32 -0600 Subject: [PATCH 4/4] [maven-scm-plugin] prepare development vitro-1.12.2-SNAPSHOT-SNAPSHOT --- api/pom.xml | 6 +++--- dependencies/pom.xml | 4 ++-- home/pom.xml | 4 ++-- installer/home/pom.xml | 4 ++-- installer/pom.xml | 2 +- installer/webapp/pom.xml | 4 ++-- pom.xml | 2 +- webapp/pom.xml | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index fc0563db3..c4d602dd0 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-api - 1.12.1 + 1.12.2-SNAPSHOT jar org.vivoweb vitro-project - 1.12.1 + 1.12.2-SNAPSHOT .. @@ -73,7 +73,7 @@ org.vivoweb vitro-dependencies - 1.12.1 + 1.12.2-SNAPSHOT pom diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 929f9b03f..552e16b36 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-dependencies - 1.12.1 + 1.12.2-SNAPSHOT pom org.vivoweb vitro-project - 1.12.1 + 1.12.2-SNAPSHOT .. diff --git a/home/pom.xml b/home/pom.xml index 4d992c598..0c45ad38c 100644 --- a/home/pom.xml +++ b/home/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-home - 1.12.1 + 1.12.2-SNAPSHOT pom org.vivoweb vitro-project - 1.12.1 + 1.12.2-SNAPSHOT .. diff --git a/installer/home/pom.xml b/installer/home/pom.xml index 8dcb826d4..08dedaf33 100644 --- a/installer/home/pom.xml +++ b/installer/home/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-home - 1.12.1 + 1.12.2-SNAPSHOT pom org.vivoweb vitro-installer - 1.12.1 + 1.12.2-SNAPSHOT .. diff --git a/installer/pom.xml b/installer/pom.xml index 331fa3c0b..e3a2a3dd9 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -7,7 +7,7 @@ org.vivoweb vitro-installer - 1.12.1 + 1.12.2-SNAPSHOT pom Vitro Installer diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml index d3730e994..85fc3187b 100644 --- a/installer/webapp/pom.xml +++ b/installer/webapp/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-webapp - 1.12.1 + 1.12.2-SNAPSHOT pom org.vivoweb vitro-installer - 1.12.1 + 1.12.2-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 81e3495fc..506a42301 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.vivoweb vitro-project - 1.12.1 + 1.12.2-SNAPSHOT pom Vitro diff --git a/webapp/pom.xml b/webapp/pom.xml index 0721862f5..004d1b63b 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-webapp - 1.12.1 + 1.12.2-SNAPSHOT war org.vivoweb vitro-project - 1.12.1 + 1.12.2-SNAPSHOT .. @@ -41,7 +41,7 @@ org.vivoweb vitro-api - 1.12.1 + 1.12.2-SNAPSHOT