merge changes from 3.1.1 post public

ncats · Oct 22, 2024 · 790e4b1 · 790e4b1
1 parent 3c3ddda
commit 790e4b1
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 26 deletions.
diff --git a/...aJars/applications-api-3.1.1-SNAPSHOT.jar → ...aJars/applications-api-3.1.2-SNAPSHOT.jar b/...aJars/applications-api-3.1.1-SNAPSHOT.jar → ...aJars/applications-api-3.1.2-SNAPSHOT.jar
diff --git a/...rs/clinical-trials-api-3.1.1-SNAPSHOT.jar → ...rs/clinical-trials-api-3.1.2-SNAPSHOT.jar b/...rs/clinical-trials-api-3.1.1-SNAPSHOT.jar → ...rs/clinical-trials-api-3.1.2-SNAPSHOT.jar
diff --git a/extraJars/products-api-3.1.1-SNAPSHOT.jar → extraJars/products-api-3.1.2-SNAPSHOT.jar b/extraJars/products-api-3.1.1-SNAPSHOT.jar → extraJars/products-api-3.1.2-SNAPSHOT.jar
diff --git a/gsrs-fda-substance-extension/pom.xml b/gsrs-fda-substance-extension/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gsrs-module-substances</artifactId>
         <groupId>gov.nih.ncats</groupId>
-        <version>3.1.1.1</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -110,7 +110,7 @@
         <dependency>
             <groupId>gov.nih.ncats</groupId>
             <artifactId>applications-api</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>${gsrs.applications-api.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.logging.log4j</groupId>
@@ -139,7 +139,7 @@
         <dependency>
             <groupId>gov.nih.ncats</groupId>
             <artifactId>products-api</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>${gsrs.products-api.version}</version> 
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.logging.log4j</groupId>
@@ -168,7 +168,7 @@
         <dependency>
             <groupId>gov.nih.ncats</groupId>
             <artifactId>clinical-trials-api</artifactId>
-            <version>3.1.1-SNAPSHOT</version>
+            <version>${gsrs.clinical-trials-api.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.logging.log4j</groupId>

diff --git a/gsrs-module-substance-example/pom.xml b/gsrs-module-substance-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gsrs-module-substances</artifactId>
         <groupId>gov.nih.ncats</groupId>
-        <version>3.1.1.1</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -339,7 +339,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.11.0</version>
+            <version>2.14.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/gsrs-module-substances-api/pom.xml b/gsrs-module-substances-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gsrs-module-substances</artifactId>
         <groupId>gov.nih.ncats</groupId>
-        <version>3.1.1.1</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/gsrs-module-substances-core/pom.xml b/gsrs-module-substances-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gsrs-module-substances</artifactId>
         <groupId>gov.nih.ncats</groupId>
-        <version>3.1.1.1</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/gsrs-module-substances-data-exchange/pom.xml b/gsrs-module-substances-data-exchange/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gsrs-module-substances</artifactId>
         <groupId>gov.nih.ncats</groupId>
-        <version>3.1.1.1</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/gsrs-module-substances-dto/pom.xml b/gsrs-module-substances-dto/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gsrs-module-substances</artifactId>
         <groupId>gov.nih.ncats</groupId>
-        <version>3.1.1.1</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
 
 

diff --git a/gsrs-module-substances-spring-boot-autoconfigure/pom.xml b/gsrs-module-substances-spring-boot-autoconfigure/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gsrs-module-substances</artifactId>
         <groupId>gov.nih.ncats</groupId>
-        <version>3.1.1.1</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/gsrs-module-substances-spring-boot-starter/pom.xml b/gsrs-module-substances-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gsrs-module-substances</artifactId>
         <groupId>gov.nih.ncats</groupId>
-        <version>3.1.1.1</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/gsrs-module-substances-tests/pom.xml b/gsrs-module-substances-tests/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gsrs-module-substances</artifactId>
         <groupId>gov.nih.ncats</groupId>
-        <version>3.1.1.1</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
 
 

diff --git a/gsrs-ncats-substance-extension/pom.xml b/gsrs-ncats-substance-extension/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>gsrs-module-substances</artifactId>
         <groupId>gov.nih.ncats</groupId>
-        <version>3.1.1.1</version>
+        <version>3.1.2-SNAPSHOT</version>
     </parent>
     <properties>
         <!--java.version>11</java.version-->

diff --git a/installExtraJars.cmd b/installExtraJars.cmd
@@ -1,4 +1,4 @@
-mvnw.cmd install:install-file -Dfile=extraJars/applications-api-3.1.1-SNAPSHOT.jar
-mvnw.cmd install:install-file -Dfile=extraJars/products-api-3.1.1-SNAPSHOT.jar
-mvnw.cmd install:install-file -Dfile=extraJars/clinical-trials-api-3.1.1-SNAPSHOT.jar
+mvnw.cmd install:install-file -Dfile=extraJars/applications-api-3.1.2-SNAPSHOT.jar
+mvnw.cmd install:install-file -Dfile=extraJars/products-api-3.1.2-SNAPSHOT.jar
+mvnw.cmd install:install-file -Dfile=extraJars/clinical-trials-api-3.1.2-SNAPSHOT.jar
 mvnw.cmd install:install-file -Dfile=extraJars/Featureize-Nitrosamines-0.0.3-SNAPSHOT.jar
diff --git a/installExtraJars.sh b/installExtraJars.sh
@@ -1,4 +1,4 @@
-./mvnw install:install-file -Dfile=extraJars/applications-api-3.1.1-SNAPSHOT.jar
-./mvnw install:install-file -Dfile=extraJars/products-api-3.1.1-SNAPSHOT.jar
-./mvnw install:install-file -Dfile=extraJars/clinical-trials-api-3.1.1-SNAPSHOT.jar
+./mvnw install:install-file -Dfile=extraJars/applications-api-3.1.2-SNAPSHOT.jar
+./mvnw install:install-file -Dfile=extraJars/products-api-3.1.2-SNAPSHOT.jar
+./mvnw install:install-file -Dfile=extraJars/clinical-trials-api-3.1.2-SNAPSHOT.jar
 ./mvnw install:install-file -Dfile=extraJars/Featureize-Nitrosamines-0.0.3-SNAPSHOT.jar
diff --git a/pom-version.properties b/pom-version.properties
@@ -1,4 +1,6 @@
 # For use in project pom version check test
-sm.pomversiontest.starterModuleVersion=3.1.1
-sm.pomversiontest.substancesModuleVersion=3.1.1.1
-sm.pomversiontest.otherModuleVersion=3.1.1-SNAPSHOT
+# Need to adjust test for api versions
+# mvn test -Dtest=gsrs.substances.tests.SubstancesPomsVersionTest -DdoPomCheck=true -pl gsrs-module-substances-tests
+sm.pomversiontest.starterModuleVersion=3.1.2-SNAPSHOT
+sm.pomversiontest.substancesModuleVersion=3.1.2-SNAPSHOT
+sm.pomversiontest.otherModuleVersion=3.1.2-SNAPSHOT
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     </parent>
     <groupId>gov.nih.ncats</groupId>
     <artifactId>gsrs-module-substances</artifactId>
-    <version>3.1.1.1</version>
+    <version>3.1.2-SNAPSHOT</version>
     <name>GSRS Substance Module</name>
     <description>Substance Module for GSRS Spring Boot</description>
     <url>https://github.com/ncats/gsrs-spring-module-substances</url>
@@ -33,8 +33,11 @@
     <properties>
         <java.version>1.8</java.version>
         <spring-cloud.version>Hoxton.SR1</spring-cloud.version>
-        <gsrs.version>3.1.1</gsrs.version>
-        <gsrs.substance.version>3.1.1.1</gsrs.substance.version>
+        <gsrs.version>3.1.2-SNAPSHOT</gsrs.version>
+        <gsrs.substance.version>3.1.2-SNAPSHOT</gsrs.substance.version>
+        <gsrs.applications-api.version>3.1.2-SNAPSHOT</gsrs.applications-api.version>
+        <gsrs.clinical-trials-api.version>3.1.2-SNAPSHOT</gsrs.clinical-trials-api.version>
+        <gsrs.products-api.version>3.1.2-SNAPSHOT</gsrs.products-api.version>
         <spring-boot.version>2.4.5</spring-boot.version>
         <log4j2.version>2.17.2</log4j2.version>
     </properties>