Merge pull request #372 from ncats/awmisc_adjust_jars_and_version_chg

Make changes for version shift
ncats · Sep 24, 2024 · 0087d63 · 0087d63
2 parents d333521 + e62026b
commit 0087d63
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/extraJars/applications-api-3.1-SNAPSHOT.jar b/extraJars/applications-api-3.1-SNAPSHOT.jar
diff --git a/extraJars/applications-api-3.1.1-SNAPSHOT.jar b/extraJars/applications-api-3.1.1-SNAPSHOT.jar
diff --git a/extraJars/clinical-trials-api-3.1.1-SNAPSHOT.jar b/extraJars/clinical-trials-api-3.1.1-SNAPSHOT.jar
diff --git a/extraJars/products-api-3.1.1-SNAPSHOT.jar b/extraJars/products-api-3.1.1-SNAPSHOT.jar
diff --git a/...odule-substances-tests/src/test/java/gsrs/substances/tests/SubstancesPomsVersionTest.java b/...odule-substances-tests/src/test/java/gsrs/substances/tests/SubstancesPomsVersionTest.java
@@ -22,9 +22,9 @@ public class SubstancesPomsVersionTest {
 
     // Set to true when testing in IDE
     boolean turnOffPomParameterCheck = false;
-
-    String shortVersion;
-    String longVersion;
+    String starterModuleVersion;
+    String substancesModuleVersion;
+    String otherModuleVersion;
     String rootDir;
     String propertiesFile;
     String installExtraJarsScriptText;
@@ -40,11 +40,14 @@ public void setup() {
 
         try {
             Properties properties = PomUtilities.readPomVersionProperties(rootDir + "/" + propertiesFile);
-            shortVersion = properties.getProperty("project.shortVersion");
-            longVersion = properties.getProperty("project.longVersion");
-            assertNotNull(shortVersion);
-            System.out.println("shortVersion: " + shortVersion);
-            System.out.println("longVersion: " + longVersion);
+
+
+            starterModuleVersion = properties.getProperty("sm.pomversiontest.starterModuleVersion");
+            substancesModuleVersion = properties.getProperty("sm.pomversiontest.substancesModuleVersion");
+            assertNotNull(starterModuleVersion);
+            assertNotNull(substancesModuleVersion);
+            System.out.println("starterModuleVersion: " + starterModuleVersion);
+            System.out.println("substancesModuleVersion: " + substancesModuleVersion);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -66,16 +69,16 @@ public void testPomCheck() {
             rootModel = PomUtilities.readPomToModel(rootDir + "/pom.xml");
             Properties properties = rootModel.getProperties();
             System.out.println("> checking root");
-            assertEquals( longVersion, rootModel.getVersion(), "version");
-            assertEquals(longVersion, properties.getProperty("gsrs.version"), "gsrs.version:");
+            assertEquals( substancesModuleVersion, rootModel.getVersion(), "version");
+            assertEquals(starterModuleVersion, properties.getProperty("gsrs.version"), "gsrs.version:");
             List<String> modules = rootModel.getModules();
             for (String module : modules) {
                 System.out.println("> checking "+ module);
                 Model moduleModel;
                 try {
                     moduleModel = PomUtilities.readPomToModel(rootDir + "/" + module + "/pom.xml");
                     String checkVersion = moduleModel.getParent().getVersion();
-                    assertEquals (longVersion, checkVersion, "parent/version");
+                    assertEquals (substancesModuleVersion, checkVersion, "parent/version");
 
                     if (module.equals("gsrs-fda-substance-extension")) {
                         List<Dependency> dependencies = moduleModel.getDependencies();

diff --git a/pom-version.properties b/pom-version.properties
@@ -1,3 +1,4 @@
 # For use in project pom version check test
-project.shortVersion=3.1.1
-project.longVersion=3.1.1-SNAPSHOT
+sm.pomversiontest.starterModuleVersion=3.1.1
+sm.pomversiontest.substancesModuleVersion=3.1.1.1
+sm.pomversiontest.otherModuleVersion=3.1.1-SNAPSHOT