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 a6fe64c4..7209328a 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 @@ -44,6 +44,7 @@ public void setup() { starterModuleVersion = properties.getProperty("sm.pomversiontest.starterModuleVersion"); substancesModuleVersion = properties.getProperty("sm.pomversiontest.substancesModuleVersion"); + otherModuleVersion = properties.getProperty("sm.pomversiontest.otherModuleVersion"); assertNotNull(starterModuleVersion); assertNotNull(substancesModuleVersion); System.out.println("starterModuleVersion: " + starterModuleVersion); @@ -70,7 +71,11 @@ public void testPomCheck() { Properties properties = rootModel.getProperties(); System.out.println("> checking root"); assertEquals( substancesModuleVersion, rootModel.getVersion(), "version"); - assertEquals(starterModuleVersion, properties.getProperty("gsrs.version"), "gsrs.version:"); + assertEquals(starterModuleVersion, properties.getProperty("gsrs.version"), "gsrs.version"); + assertEquals(otherModuleVersion, properties.getProperty("gsrs.applications-api.version"), "gsrs.applications-api.version"); + assertEquals(otherModuleVersion, properties.getProperty("gsrs.clinical-trials-api.version"), "gsrs.clinical-trials-api.version"); + assertEquals(otherModuleVersion, properties.getProperty("gsrs.products-api.version"), "gsrs.products-api.version"); + List modules = rootModel.getModules(); for (String module : modules) { System.out.println("> checking "+ module); @@ -86,23 +91,23 @@ public void testPomCheck() { boolean clinicalTrialsApiChecked = false; boolean productsApiChecked = false; - for (Dependency dependency : dependencies) { - if (dependency.getGroupId().equals("gov.nih.ncats") && dependency.getArtifactId().equals("applications-api")) { - checkDependencyExtraJarExistsAndFindPathInScript(dependency); - applicationsApiChecked = true; - } - if (dependency.getGroupId().equals("gov.nih.ncats") && dependency.getArtifactId().equals("clinical-trials-api")) { - checkDependencyExtraJarExistsAndFindPathInScript(dependency); - clinicalTrialsApiChecked = true; - } - if (dependency.getGroupId().equals("gov.nih.ncats") && dependency.getArtifactId().equals("products-api")) { - checkDependencyExtraJarExistsAndFindPathInScript(dependency); - productsApiChecked = true; - } - } - assertTrue(applicationsApiChecked); - assertTrue(clinicalTrialsApiChecked); - assertTrue(productsApiChecked); +// for (Dependency dependency : dependencies) { +// if (dependency.getGroupId().equals("gov.nih.ncats") && dependency.getArtifactId().equals("applications-api")) { +// checkDependencyExtraJarExistsAndFindPathInScript(dependency); +// applicationsApiChecked = true; +// } +// if (dependency.getGroupId().equals("gov.nih.ncats") && dependency.getArtifactId().equals("clinical-trials-api")) { +// checkDependencyExtraJarExistsAndFindPathInScript(dependency); +// clinicalTrialsApiChecked = true; +// } +// if (dependency.getGroupId().equals("gov.nih.ncats") && dependency.getArtifactId().equals("products-api")) { +// checkDependencyExtraJarExistsAndFindPathInScript(dependency); +// productsApiChecked = true; +// } +// } +// assertTrue(applicationsApiChecked); +// assertTrue(clinicalTrialsApiChecked); +// assertTrue(productsApiChecked); } } catch (Exception e) { throw new RuntimeException(e); diff --git a/pom.xml b/pom.xml index 58b8ef95..42664145 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.5 + 2.7.18 gov.nih.ncats @@ -32,10 +32,10 @@ 1.8 + 2021.0.8 3.1.2-SNAPSHOT 3.1.2-SNAPSHOT - Hoxton.SR1 - 2.4.5 + 2.7.18 3.1.2-SNAPSHOT 3.1.2-SNAPSHOT 3.1.2-SNAPSHOT