Merge pull request #131 from levigo/feature/dependencies

feat(deps): upgrade spring-boot to 3.3.5
levigo · Nov 5, 2024 · 6c133e9 · 6c133e9
2 parents 1136482 + 0dfcdc3
commit 6c133e9
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 54 deletions.
diff --git a/neverpile-eureka-bom/neverpile-eureka-spring-boot-bom/pom.xml b/neverpile-eureka-bom/neverpile-eureka-spring-boot-bom/pom.xml
@@ -16,8 +16,8 @@
   </modules>
 
   <properties>
-    <dropwizard.version>4.2.25</dropwizard.version>
-    <elasticsearch.version>7.17.19</elasticsearch.version>
+    <dropwizard.version>4.2.28</dropwizard.version>
+    <elasticsearch.version>7.17.25</elasticsearch.version>
   </properties>
 
   <dependencyManagement>

diff --git a/neverpile-eureka-hazelcast/pom.xml b/neverpile-eureka-hazelcast/pom.xml
@@ -42,7 +42,6 @@
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
       <scope>test</scope>
-      <version>${h2.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>

diff --git a/neverpile-eureka-ignite/pom.xml b/neverpile-eureka-ignite/pom.xml
@@ -113,13 +113,11 @@
       <!--    TODO: delete when ignite-aws is updated-->
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
-        <version>4.5.14</version>
       </dependency>
       <!--    TODO: delete when ignite-aws is updated-->
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcprov-ext-jdk15on</artifactId>
-        <version>1.70</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/neverpile-eureka-objectstore-oam/pom.xml b/neverpile-eureka-objectstore-oam/pom.xml
@@ -9,6 +9,11 @@
 	</parent>
 	<artifactId>neverpile-eureka-objectstore-oam</artifactId>
 	<packaging>jar</packaging>
+
+	<properties>
+		<oam-connector.version>0.2.0</oam-connector.version>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>com.neverpile.eureka</groupId>
@@ -21,7 +26,7 @@
 		<dependency>
 			<groupId>com.levigo.oam</groupId>
 			<artifactId>oam-connector</artifactId>
-			<version>0.1.21</version>
+			<version>${oam-connector.version}</version>
 		</dependency>
 		<!-- Test dependencies -->
 		<dependency>

diff --git a/neverpile-eureka-plugin-metadata/pom.xml b/neverpile-eureka-plugin-metadata/pom.xml
@@ -9,6 +9,10 @@
 
   <artifactId>neverpile-eureka-plugin-metadata</artifactId>
 
+  <properties>
+    <mycila-xmltool.version>4.4.ga</mycila-xmltool.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.neverpile.eureka</groupId>
@@ -25,7 +29,7 @@
     <dependency>
       <groupId>com.mycila</groupId>
       <artifactId>mycila-xmltool</artifactId>
-      <version>4.4.ga</version>
+      <version>${mycila-xmltool.version}</version>
     </dependency>
 
     <!-- Test-dependencies -->

diff --git a/neverpile-eureka-search-elastic/pom.xml b/neverpile-eureka-search-elastic/pom.xml
@@ -8,8 +8,11 @@
     <version>0.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>neverpile-eureka-search-elastic</artifactId>
+
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <hppc.version>0.10.0</hppc.version>
+    <joda-time.version>2.13.0</joda-time.version>
   </properties>
 
   <dependencies>
@@ -55,13 +58,13 @@
     <dependency>
       <groupId>com.carrotsearch</groupId>
       <artifactId>hppc</artifactId>
-      <version>0.9.1</version>
+      <version>${hppc.version}</version>
     </dependency>
 
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.12.5</version>
+      <version>${joda-time.version}</version>
     </dependency>
 
     <dependency>
@@ -110,7 +113,7 @@
                     <!-- Docker Image to use -->
                     <image>
                       <alias>elasticsearch</alias>
-                      <name>elasticsearch:7.17.15</name>
+                      <name>elasticsearch:${elasticsearch.version}</name>
                       <run>
                         <namingStrategy>none</namingStrategy>
                         <env>

diff --git a/neverpile-eureka-security-oauth2/pom.xml b/neverpile-eureka-security-oauth2/pom.xml
@@ -13,6 +13,10 @@
 	<artifactId>neverpile-eureka-security-oauth2</artifactId>
 	<packaging>jar</packaging>
 
+	<properties>
+		<jaxb.version>4.0.5</jaxb.version>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -37,12 +41,12 @@
 		<dependency>
 			<groupId>com.sun.xml.bind</groupId>
 			<artifactId>jaxb-core</artifactId>
-			<version>4.0.2</version>
+			<version>${jaxb.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.xml.bind</groupId>
 			<artifactId>jaxb-impl</artifactId>
-			<version>4.0.2</version>
+			<version>${jaxb.version}</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -17,47 +17,47 @@
 
     <atomikos.version>6.0.0</atomikos.version>
     <aws-s3.version>1.12.671</aws-s3.version>
+    <bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
     <cassandra-driver-core.version>4.17.0</cassandra-driver-core.version>
     <ehcache.version>3.10.8</ehcache.version>
-    <elasticsearch.version>7.17.18</elasticsearch.version>
-    <elasticsearch-rest-high-level-client.version>7.17.20</elasticsearch-rest-high-level-client.version>
+    <elasticsearch-rest-high-level-client.version>7.17.25</elasticsearch-rest-high-level-client.version>
+    <elasticsearch.version>7.17.25</elasticsearch.version>
     <eureka-webjar.version>1.0.25</eureka-webjar.version>
     <feign.version>8.18.0</feign.version>
-    <guava.version>33.0.0-jre</guava.version>
-    <h2.version>2.2.224</h2.version>
-    <ignite.version>2.14.0</ignite.version>
-    <ignite-cloud.version>2.13.0</ignite-cloud.version>
+    <guava.version>33.3.1-jre</guava.version>
     <ignite-aws.version>2.11.1</ignite-aws.version>
+    <ignite-cloud.version>2.13.0</ignite-cloud.version>
+    <ignite.version>2.14.0</ignite.version>
     <jetty.version>12.0.5</jetty.version>
-    <lucene.version>8.11.1</lucene.version>
-    <metrics-core.version>4.2.25</metrics-core.version>
+    <lucene.version>8.11.3</lucene.version>
+    <metrics-core.version>4.2.28</metrics-core.version>
     <modelmapper.version>1.1.3</modelmapper.version>
-    <neverpile-commons.version>1.16.7</neverpile-commons.version>
+    <neverpile-commons.version>1.17.0</neverpile-commons.version>
     <opentracing.version>0.33.0</opentracing.version>
-    <spring-boot.version>3.2.11</spring-boot.version>
+    <snakeyaml.version>2.3</snakeyaml.version>
+    <spring-boot-admin.version>3.3.5</spring-boot-admin.version>
+    <spring-boot.version>3.3.5</spring-boot.version>
     <spring-security-oauth2.version>2.6.8</spring-security-oauth2.version>
-    <spring-boot-admin.version>3.2.2</spring-boot-admin.version>
     <springfox.version>3.0.0</springfox.version>
-    <swagger.version>2.2.20</swagger.version>
+    <swagger.version>2.2.25</swagger.version>
     <url-crypto-kit.version>2.1.2</url-crypto-kit.version>
 
     <!-- Test -->
     <commons-io.version>2.11.0</commons-io.version>
     <commons-fileupload.version>1.5</commons-fileupload.version>
     <jmockit.version>1.49</jmockit.version>
-    <mockito-core.version>5.7.0</mockito-core.version>
-    <rest-assured.version>5.3.2</rest-assured.version>
+    <mockito-core.version>5.14.2</mockito-core.version>
+    <rest-assured.version>5.5.0</rest-assured.version>
 
     <!-- plugins -->
-    <docker-maven-plugin.version>0.43.4</docker-maven-plugin.version>
-    <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
+    <docker-maven-plugin.version>0.45.1</docker-maven-plugin.version>
+    <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+    <maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
+    <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
     <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
-    <maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
-    <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
-    <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-    <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
-    <snakeyaml.version>2.2</snakeyaml.version>
-    <bcprov-jdk15on.version>1.70</bcprov-jdk15on.version>
+    <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
+    <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
+    <versions-maven-plugin.version>2.17.1</versions-maven-plugin.version>
   </properties>
 
   <repositories>
@@ -153,13 +153,6 @@
         <version>${project.version}</version>
       </dependency>
 
-      <!-- Need this due to http://apache-ignite-users.70518.x6.nabble.com/Ignite-Version-2-0-startup-H2-error-td12532.html -->
-      <dependency>
-        <groupId>com.h2database</groupId>
-        <artifactId>h2</artifactId>
-        <version>${h2.version}</version>
-      </dependency>
-
       <!-- other stuff -->
       <dependency>
         <groupId>com.google.guava</groupId>
@@ -309,29 +302,24 @@
         <artifactId>snakeyaml</artifactId>
         <version>${snakeyaml.version}</version>
       </dependency>
-      <!--    TODO: delete when ignite-aws is updated-->
+      <!-- TODO: delete when ignite-aws is updated-->
       <dependency>
         <groupId>org.bouncycastle</groupId>
         <artifactId>bcprov-jdk15on</artifactId>
         <version>${bcprov-jdk15on.version}</version>
       </dependency>
-<!--      TODO: to be deleted after when elasticsearch is updated-->
+      <!-- TODO: delete when ignite-aws is updated-->
+      <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcprov-ext-jdk15on</artifactId>
+        <version>${bcprov-jdk15on.version}</version>
+      </dependency>
+     <!-- TODO: to be deleted after when elasticsearch is updated-->
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpclient</artifactId>
         <version>4.5.14</version>
       </dependency>
-      <!-- CVE-2024-7885 -->
-      <dependency>
-        <groupId>io.undertow</groupId>
-        <artifactId>undertow-core</artifactId>
-        <version>2.3.17.Final</version>
-      </dependency>
-      <dependency>
-        <groupId>io.undertow</groupId>
-        <artifactId>undertow-servlet</artifactId>
-        <version>2.3.17.Final</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -408,6 +396,40 @@
           <artifactId>maven-source-plugin</artifactId>
           <version>${maven-source-plugin.version}</version>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>versions-maven-plugin</artifactId>
+          <version>${versions-maven-plugin.version}</version>
+          <configuration>
+            <excludeProperties>modelmapper.version,lucene.version</excludeProperties>
+            <ruleSet>
+              <ignoreVersions>
+                <ignoreVersion>
+                  <type>regex</type>
+                  <version>(.+-SNAPSHOT|.+-M\d|.+-(rc|RC).*)</version>
+                </ignoreVersion>
+                <ignoreVersion>
+                  <type>regex</type>
+                  <version>.+-(alpha|beta).*</version>
+                </ignoreVersion>
+                <ignoreVersion>
+                  <type>regex</type>
+                  <version>.+does-not-exist.*</version>
+                </ignoreVersion>
+              </ignoreVersions>
+            </ruleSet>
+            <properties>
+              <property>
+                <name>elasticsearch.version</name>
+                <version>[7.17.0,7.18.0-!)</version>
+              </property>
+              <property>
+                <name>ignite.version</name>
+                <version>[2.14.0,2.15.0-!)</version>
+              </property>
+            </properties>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>