Merge pull request #397 from ncats/springBoot27x

Spring boot27x
ncats · Feb 22, 2025 · 710af09 · 710af09
2 parents dcdabf5 + f6229db
commit 710af09
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
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
@@ -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<String> 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
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.5</version>
+        <version>2.7.18</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>gov.nih.ncats</groupId>
@@ -32,10 +32,10 @@
     </scm>
     <properties>
         <java.version>1.8</java.version>
+        <spring-cloud.version>2021.0.8</spring-cloud.version>
         <gsrs.version>3.1.2-SNAPSHOT</gsrs.version>
         <gsrs.substance.version>3.1.2-SNAPSHOT</gsrs.substance.version>
-        <spring-cloud.version>Hoxton.SR1</spring-cloud.version>
-        <spring-boot.version>2.4.5</spring-boot.version>
+        <spring-boot.version>2.7.18</spring-boot.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>