diff --git a/extraJars/applications-api-3.1-SNAPSHOT.jar b/extraJars/applications-api-3.1-SNAPSHOT.jar deleted file mode 100644 index 834f6ad6f..000000000 Binary files a/extraJars/applications-api-3.1-SNAPSHOT.jar and /dev/null differ diff --git a/extraJars/applications-api-3.1.1-SNAPSHOT.jar b/extraJars/applications-api-3.1.1-SNAPSHOT.jar new file mode 100644 index 000000000..13aa94f25 Binary files /dev/null and b/extraJars/applications-api-3.1.1-SNAPSHOT.jar differ diff --git a/extraJars/clinical-trials-api-3.1.1-SNAPSHOT.jar b/extraJars/clinical-trials-api-3.1.1-SNAPSHOT.jar index ea68087fb..97905f1c9 100644 Binary files a/extraJars/clinical-trials-api-3.1.1-SNAPSHOT.jar and b/extraJars/clinical-trials-api-3.1.1-SNAPSHOT.jar differ diff --git a/extraJars/products-api-3.1.1-SNAPSHOT.jar b/extraJars/products-api-3.1.1-SNAPSHOT.jar index 24cfcb038..b54a1d374 100644 Binary files a/extraJars/products-api-3.1.1-SNAPSHOT.jar and b/extraJars/products-api-3.1.1-SNAPSHOT.jar differ diff --git a/gsrs-module-substances-tests/src/test/java/gsrs/substances/tests/SubstancesPomsVersionTest.java b/gsrs-module-substances-tests/src/test/java/gsrs/substances/tests/SubstancesPomsVersionTest.java index 7697c3fb5..a6fe64c40 100644 --- a/gsrs-module-substances-tests/src/test/java/gsrs/substances/tests/SubstancesPomsVersionTest.java +++ b/gsrs-module-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,8 +69,8 @@ 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 modules = rootModel.getModules(); for (String module : modules) { System.out.println("> checking "+ module); @@ -75,7 +78,7 @@ public void testPomCheck() { 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 dependencies = moduleModel.getDependencies(); diff --git a/pom-version.properties b/pom-version.properties index 391fde4b5..fa208adff 100644 --- 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