From 2c04930c764b8a0a747ff99dfc2be0e9bb6ec3eb Mon Sep 17 00:00:00 2001 From: Hu Date: Wed, 22 Nov 2023 08:17:08 -0500 Subject: [PATCH 1/5] update pom files for release --- gsrs-core-entities/pom.xml | 39 +++++++++++++++++++++++++++--- gsrs-core-test/pom.xml | 37 ++++++++++++++++++++++++++-- gsrs-core/pom.xml | 37 +++++++++++++++++++++++++++- gsrs-scheduled-tasks/pom.xml | 37 +++++++++++++++++++++++++++- gsrs-spring-akka/pom.xml | 36 ++++++++++++++++++++++++++- gsrs-spring-legacy-indexer/pom.xml | 33 +++++++++++++++++++------ pom.xml | 14 ++++++++--- 7 files changed, 214 insertions(+), 19 deletions(-) diff --git a/gsrs-core-entities/pom.xml b/gsrs-core-entities/pom.xml index cbd18c5c..44ec9df9 100644 --- a/gsrs-core-entities/pom.xml +++ b/gsrs-core-entities/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -64,7 +64,40 @@ poi-ooxml 5.2.2 - - + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + diff --git a/gsrs-core-test/pom.xml b/gsrs-core-test/pom.xml index cb3c637a..974d7461 100644 --- a/gsrs-core-test/pom.xml +++ b/gsrs-core-test/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -53,5 +53,38 @@ true - + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + diff --git a/gsrs-core/pom.xml b/gsrs-core/pom.xml index 08cf4c76..f3b1d997 100644 --- a/gsrs-core/pom.xml +++ b/gsrs-core/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -94,4 +94,39 @@ 32.0.1-jre + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + diff --git a/gsrs-scheduled-tasks/pom.xml b/gsrs-scheduled-tasks/pom.xml index 6df3d934..7728f11a 100644 --- a/gsrs-scheduled-tasks/pom.xml +++ b/gsrs-scheduled-tasks/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -80,4 +80,39 @@ true + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + diff --git a/gsrs-spring-akka/pom.xml b/gsrs-spring-akka/pom.xml index a36ccc4b..40c6b73a 100644 --- a/gsrs-spring-akka/pom.xml +++ b/gsrs-spring-akka/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -33,4 +33,38 @@ 2.5.32 + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + diff --git a/gsrs-spring-legacy-indexer/pom.xml b/gsrs-spring-legacy-indexer/pom.xml index a9bb1809..8e4e8cf6 100644 --- a/gsrs-spring-legacy-indexer/pom.xml +++ b/gsrs-spring-legacy-indexer/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -117,17 +117,15 @@ - + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + org.apache.maven.plugins maven-javadoc-plugin - 2.9 - ${project.build.directory}/delombok + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + attach-javadocs + + jar + + + diff --git a/pom.xml b/pom.xml index 6a86b030..d9bec926 100644 --- a/pom.xml +++ b/pom.xml @@ -30,15 +30,19 @@ 1.8 - 3.1-SNAPSHOT + 3.1 2.4.5 2.17.2 gov.nih.ncats gsrs-spring-boot - 3.1-SNAPSHOT + 3.1 gsrs-starter Spring Starter for GSRS project + https://github.com/ncats/gsrs-spring-starter + + https://github.com/ncats/gsrs-spring-starter.git + @@ -83,10 +87,10 @@ oss.sonatype.org-snapshot https://oss.sonatype.org/content/repositories/snapshots - false + true - true + false @@ -103,4 +107,6 @@ + + From 550d989de41f3772589337817fdcdf404e9a089c Mon Sep 17 00:00:00 2001 From: Hu Date: Wed, 22 Nov 2023 12:02:25 -0500 Subject: [PATCH 2/5] more update to pom files --- gsrs-data-exchange/pom.xml | 39 +++++++++++++-- gsrs-spring-boot-autoconfigure/pom.xml | 52 +++++++++++++++++++- gsrs-spring-boot-starter/pom.xml | 2 +- gsrs-spring-legacy-cache/pom.xml | 36 +++++++++++++- gsrs-spring-legacy-sequence-indexer/pom.xml | 37 +++++++++++++- gsrs-spring-legacy-structure-indexer/pom.xml | 42 ++++++++++++++-- 6 files changed, 196 insertions(+), 12 deletions(-) diff --git a/gsrs-data-exchange/pom.xml b/gsrs-data-exchange/pom.xml index 60d76c05..e3f06769 100644 --- a/gsrs-data-exchange/pom.xml +++ b/gsrs-data-exchange/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -59,9 +59,42 @@ gov.nih.ncats gsrs-scheduled-tasks - 3.1-SNAPSHOT + ${gsrs.version} compile - + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + \ No newline at end of file diff --git a/gsrs-spring-boot-autoconfigure/pom.xml b/gsrs-spring-boot-autoconfigure/pom.xml index 59a3ba39..2eb5afac 100644 --- a/gsrs-spring-boot-autoconfigure/pom.xml +++ b/gsrs-spring-boot-autoconfigure/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -41,6 +41,56 @@ 8 + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.projectlombok + lombok-maven-plugin + 1.18.0.0 + + ${project.basedir}/src/main/java + ${project.build.directory}/delombok + false + + + + generate-sources + + delombok + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${project.build.directory}/delombok + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + diff --git a/gsrs-spring-boot-starter/pom.xml b/gsrs-spring-boot-starter/pom.xml index 86193573..794c3a7a 100644 --- a/gsrs-spring-boot-starter/pom.xml +++ b/gsrs-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 diff --git a/gsrs-spring-legacy-cache/pom.xml b/gsrs-spring-legacy-cache/pom.xml index 6c56312a..8e3b5596 100644 --- a/gsrs-spring-legacy-cache/pom.xml +++ b/gsrs-spring-legacy-cache/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -54,4 +54,38 @@ ${gsrs.version} + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + diff --git a/gsrs-spring-legacy-sequence-indexer/pom.xml b/gsrs-spring-legacy-sequence-indexer/pom.xml index d1187a8a..f51cf3e6 100644 --- a/gsrs-spring-legacy-sequence-indexer/pom.xml +++ b/gsrs-spring-legacy-sequence-indexer/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -38,5 +38,38 @@ spring-boot-starter-test - + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + diff --git a/gsrs-spring-legacy-structure-indexer/pom.xml b/gsrs-spring-legacy-structure-indexer/pom.xml index 0281710b..71967fe0 100644 --- a/gsrs-spring-legacy-structure-indexer/pom.xml +++ b/gsrs-spring-legacy-structure-indexer/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -16,18 +16,18 @@ gov.nih.ncats molwitch - 0.6.5-SNAPSHOT + 0.6.5 gov.nih.ncats molwitch-cdk - 1.0.14-SNAPSHOT + 1.0.14 test gov.nih.ncats structure-indexer - 0.0.14-SNAPSHOT + 0.0.15 gov.nih.ncats @@ -50,4 +50,38 @@ + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + From 6e1e1c8878cded0ff7bc3e75442dacd9135c9406 Mon Sep 17 00:00:00 2001 From: Hu Date: Wed, 22 Nov 2023 16:44:05 -0500 Subject: [PATCH 3/5] update more pom files --- gsrs-discovery/pom.xml | 36 ++++++++++++++++++-- gsrs-rest-api/pom.xml | 55 ++++++++++++++++++++++++++++++- gsrs-spring-boot-starter/pom.xml | 27 +++++++++++++++ gsrs-spring-starter-tests/pom.xml | 32 +++++++++++++++++- 4 files changed, 145 insertions(+), 5 deletions(-) diff --git a/gsrs-discovery/pom.xml b/gsrs-discovery/pom.xml index 09ed3033..2a8a2c87 100644 --- a/gsrs-discovery/pom.xml +++ b/gsrs-discovery/pom.xml @@ -10,7 +10,7 @@ gov.nih.ncats gsrs-discovery - 3.1-SNAPSHOT + 3.1 gsrs-discovery Demo project for Spring Boot @@ -88,6 +88,36 @@ spring-boot-maven-plugin 2.4.5 + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + + attach-javadocs + + jar + + + + @@ -97,10 +127,10 @@ oss.sonatype.org-snapshot https://oss.sonatype.org/content/repositories/snapshots - false + true - true + false diff --git a/gsrs-rest-api/pom.xml b/gsrs-rest-api/pom.xml index 50a1cc07..b0d2b781 100644 --- a/gsrs-rest-api/pom.xml +++ b/gsrs-rest-api/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -34,4 +34,57 @@ true + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.projectlombok + lombok-maven-plugin + 1.18.0.0 + + ${project.basedir}/src/main/java + ${project.build.directory}/delombok + false + + + + generate-sources + + delombok + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${project.build.directory}/delombok + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + + diff --git a/gsrs-spring-boot-starter/pom.xml b/gsrs-spring-boot-starter/pom.xml index 794c3a7a..8a05f5d7 100644 --- a/gsrs-spring-boot-starter/pom.xml +++ b/gsrs-spring-boot-starter/pom.xml @@ -36,6 +36,33 @@ ${java.version} + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + javadoc-jar + package + + jar + + + javadoc + + + + sources-jar + package + + jar + + + sources + + + + diff --git a/gsrs-spring-starter-tests/pom.xml b/gsrs-spring-starter-tests/pom.xml index 0c5f6966..8dd9986a 100644 --- a/gsrs-spring-starter-tests/pom.xml +++ b/gsrs-spring-starter-tests/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -20,6 +20,36 @@ 9 + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + -Xdoclint:none + -Xdoclint:none + -Xdoclint:none + + + + attach-javadocs + + jar + + + + From ac01a492fa66a74477a3128ccd19bb318beb134a Mon Sep 17 00:00:00 2001 From: Hu Date: Mon, 27 Nov 2023 13:51:32 -0500 Subject: [PATCH 4/5] update more pom files --- gsrs-controlled-vocabulary-api/pom.xml | 40 +++++++++++++++++++++++++- gsrs-controlled-vocabulary/pom.xml | 37 +++++++++++++++++++++++- 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/gsrs-controlled-vocabulary-api/pom.xml b/gsrs-controlled-vocabulary-api/pom.xml index 1d631380..e0047940 100644 --- a/gsrs-controlled-vocabulary-api/pom.xml +++ b/gsrs-controlled-vocabulary-api/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -41,4 +41,42 @@ + diff --git a/gsrs-controlled-vocabulary/pom.xml b/gsrs-controlled-vocabulary/pom.xml index 9581d753..b36f092d 100644 --- a/gsrs-controlled-vocabulary/pom.xml +++ b/gsrs-controlled-vocabulary/pom.xml @@ -5,7 +5,7 @@ gsrs-spring-boot gov.nih.ncats - 3.1-SNAPSHOT + 3.1 4.0.0 @@ -153,4 +153,39 @@ + From 78f653c358dc45ccd4a31ae31171b70b4a9b8e4f Mon Sep 17 00:00:00 2001 From: Hu Date: Mon, 27 Nov 2023 15:45:36 -0500 Subject: [PATCH 5/5] comment out release related part --- gsrs-core-entities/pom.xml | 4 ++-- gsrs-core-test/pom.xml | 3 ++- gsrs-core/pom.xml | 4 ++-- gsrs-data-exchange/pom.xml | 3 ++- gsrs-discovery/pom.xml | 7 ++++--- gsrs-rest-api/pom.xml | 5 +++-- gsrs-scheduled-tasks/pom.xml | 4 ++-- gsrs-spring-akka/pom.xml | 3 ++- gsrs-spring-boot-autoconfigure/pom.xml | 3 ++- gsrs-spring-boot-starter/pom.xml | 3 ++- gsrs-spring-legacy-cache/pom.xml | 3 ++- gsrs-spring-legacy-indexer/pom.xml | 3 ++- gsrs-spring-legacy-sequence-indexer/pom.xml | 3 ++- gsrs-spring-legacy-structure-indexer/pom.xml | 3 ++- gsrs-spring-starter-tests/pom.xml | 3 ++- pom.xml | 4 ++-- 16 files changed, 35 insertions(+), 23 deletions(-) diff --git a/gsrs-core-entities/pom.xml b/gsrs-core-entities/pom.xml index 44ec9df9..f6cb65e1 100644 --- a/gsrs-core-entities/pom.xml +++ b/gsrs-core-entities/pom.xml @@ -65,7 +65,7 @@ 5.2.2 - + diff --git a/gsrs-core-test/pom.xml b/gsrs-core-test/pom.xml index 974d7461..fd0b93c7 100644 --- a/gsrs-core-test/pom.xml +++ b/gsrs-core-test/pom.xml @@ -53,6 +53,7 @@ true + diff --git a/gsrs-core/pom.xml b/gsrs-core/pom.xml index f3b1d997..1c8ef9ff 100644 --- a/gsrs-core/pom.xml +++ b/gsrs-core/pom.xml @@ -94,7 +94,7 @@ 32.0.1-jre - + diff --git a/gsrs-data-exchange/pom.xml b/gsrs-data-exchange/pom.xml index e3f06769..91aeee39 100644 --- a/gsrs-data-exchange/pom.xml +++ b/gsrs-data-exchange/pom.xml @@ -63,6 +63,7 @@ compile + \ No newline at end of file diff --git a/gsrs-discovery/pom.xml b/gsrs-discovery/pom.xml index 2a8a2c87..fb57e785 100644 --- a/gsrs-discovery/pom.xml +++ b/gsrs-discovery/pom.xml @@ -88,6 +88,7 @@ spring-boot-maven-plugin 2.4.5 + @@ -127,10 +128,10 @@ oss.sonatype.org-snapshot https://oss.sonatype.org/content/repositories/snapshots - true + false - false + true diff --git a/gsrs-rest-api/pom.xml b/gsrs-rest-api/pom.xml index b0d2b781..7016d341 100644 --- a/gsrs-rest-api/pom.xml +++ b/gsrs-rest-api/pom.xml @@ -33,7 +33,8 @@ lombok true - + + diff --git a/gsrs-scheduled-tasks/pom.xml b/gsrs-scheduled-tasks/pom.xml index 7728f11a..2d061a54 100644 --- a/gsrs-scheduled-tasks/pom.xml +++ b/gsrs-scheduled-tasks/pom.xml @@ -80,7 +80,7 @@ true - + diff --git a/gsrs-spring-akka/pom.xml b/gsrs-spring-akka/pom.xml index 40c6b73a..6c2ec8ba 100644 --- a/gsrs-spring-akka/pom.xml +++ b/gsrs-spring-akka/pom.xml @@ -33,6 +33,7 @@ 2.5.32 + diff --git a/gsrs-spring-boot-autoconfigure/pom.xml b/gsrs-spring-boot-autoconfigure/pom.xml index 2eb5afac..525ead72 100644 --- a/gsrs-spring-boot-autoconfigure/pom.xml +++ b/gsrs-spring-boot-autoconfigure/pom.xml @@ -41,6 +41,7 @@ 8 + diff --git a/gsrs-spring-boot-starter/pom.xml b/gsrs-spring-boot-starter/pom.xml index 8a05f5d7..d910606b 100644 --- a/gsrs-spring-boot-starter/pom.xml +++ b/gsrs-spring-boot-starter/pom.xml @@ -36,6 +36,7 @@ ${java.version} + diff --git a/gsrs-spring-legacy-cache/pom.xml b/gsrs-spring-legacy-cache/pom.xml index 8e3b5596..29d2226e 100644 --- a/gsrs-spring-legacy-cache/pom.xml +++ b/gsrs-spring-legacy-cache/pom.xml @@ -54,6 +54,7 @@ ${gsrs.version} + diff --git a/gsrs-spring-legacy-indexer/pom.xml b/gsrs-spring-legacy-indexer/pom.xml index 8e4e8cf6..128c01d9 100644 --- a/gsrs-spring-legacy-indexer/pom.xml +++ b/gsrs-spring-legacy-indexer/pom.xml @@ -135,6 +135,7 @@ + diff --git a/gsrs-spring-legacy-sequence-indexer/pom.xml b/gsrs-spring-legacy-sequence-indexer/pom.xml index f51cf3e6..ff1ec4d1 100644 --- a/gsrs-spring-legacy-sequence-indexer/pom.xml +++ b/gsrs-spring-legacy-sequence-indexer/pom.xml @@ -38,6 +38,7 @@ spring-boot-starter-test + diff --git a/gsrs-spring-legacy-structure-indexer/pom.xml b/gsrs-spring-legacy-structure-indexer/pom.xml index 71967fe0..5329e1d1 100644 --- a/gsrs-spring-legacy-structure-indexer/pom.xml +++ b/gsrs-spring-legacy-structure-indexer/pom.xml @@ -50,6 +50,7 @@ + diff --git a/gsrs-spring-starter-tests/pom.xml b/gsrs-spring-starter-tests/pom.xml index 8dd9986a..7cf5758f 100644 --- a/gsrs-spring-starter-tests/pom.xml +++ b/gsrs-spring-starter-tests/pom.xml @@ -20,6 +20,7 @@ 9 + diff --git a/pom.xml b/pom.xml index d9bec926..c5ecc402 100644 --- a/pom.xml +++ b/pom.xml @@ -87,10 +87,10 @@ oss.sonatype.org-snapshot https://oss.sonatype.org/content/repositories/snapshots - true + false - false + true