Skip to content

Commit 0788f77

Browse files
s-yonkov-yonkovs-yonkov-yonkov
authored
Update dependencies (#1758)
LMCROSSITXSADEPLOY-3380
1 parent 92682cb commit 0788f77

File tree

8 files changed

+50
-74
lines changed

8 files changed

+50
-74
lines changed

‎multiapps-controller-api/pom.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
</parent>
1515

1616
<dependencies>
17-
<dependency>
18-
<groupId>jakarta.xml.bind</groupId>
19-
<artifactId>jakarta.xml.bind-api</artifactId>
20-
</dependency>
2117
<dependency>
2218
<groupId>org.glassfish.jaxb</groupId>
2319
<artifactId>jaxb-core</artifactId>
@@ -27,7 +23,7 @@
2723
<artifactId>jaxb-runtime</artifactId>
2824
</dependency>
2925
<dependency>
30-
<groupId>com.fasterxml.jackson.core</groupId>
26+
<groupId>tools.jackson.core</groupId>
3127
<artifactId>jackson-databind</artifactId>
3228
</dependency>
3329
<dependency>

‎multiapps-controller-client/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@
6464
<groupId>org.springframework.security</groupId>
6565
<artifactId>spring-security-oauth2-client</artifactId>
6666
</dependency>
67-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
67+
<!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-core -->
6868
<dependency>
69-
<groupId>com.fasterxml.jackson.core</groupId>
69+
<groupId>tools.jackson.core</groupId>
7070
<artifactId>jackson-core</artifactId>
7171
</dependency>
72-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
72+
<!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-databind -->
7373
<dependency>
74-
<groupId>com.fasterxml.jackson.core</groupId>
74+
<groupId>tools.jackson.core</groupId>
7575
<artifactId>jackson-databind</artifactId>
7676
</dependency>
7777
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
@@ -113,7 +113,7 @@
113113
<plugin>
114114
<groupId>org.apache.maven.plugins</groupId>
115115
<artifactId>maven-surefire-plugin</artifactId>
116-
<version>3.5.3</version>
116+
<version>3.5.4</version>
117117
<configuration>
118118
<excludes>
119119
<exclude>**/*</exclude>

‎multiapps-controller-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<artifactId>jakarta.servlet-api</artifactId>
3737
</dependency>
3838
<dependency>
39-
<groupId>com.fasterxml.jackson.core</groupId>
39+
<groupId>tools.jackson.core</groupId>
4040
<artifactId>jackson-databind</artifactId>
4141
</dependency>
4242
<dependency>

‎multiapps-controller-process/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<artifactId>jakarta.servlet-api</artifactId>
5353
</dependency>
5454
<dependency>
55-
<groupId>com.fasterxml.jackson.core</groupId>
55+
<groupId>tools.jackson.core</groupId>
5656
<artifactId>jackson-databind</artifactId>
5757
</dependency>
5858
<dependency>

‎multiapps-controller-web/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<artifactId>jaxb-runtime</artifactId>
100100
</dependency>
101101
<dependency>
102-
<groupId>com.fasterxml.jackson.core</groupId>
102+
<groupId>tools.jackson.core</groupId>
103103
<artifactId>jackson-databind</artifactId>
104104
</dependency>
105105
<dependency>

‎multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public DataSourceTransactionManager transactionManager(DataSource dataSource, Ap
5353
return dataSourceTransactionManager;
5454
}
5555

56-
@Inject
5756
@Bean
5857
@Primary
5958
public LocalContainerEntityManagerFactoryBean defaultEntityManagerFactory(DataSource dataSource,

‎multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FileStorageConfiguration.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.cloudfoundry.multiapps.controller.web.configuration;
22

3-
import jakarta.inject.Inject;
43
import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
54
import org.cloudfoundry.multiapps.controller.persistence.util.EnvironmentServicesFinder;
65
import org.cloudfoundry.multiapps.controller.web.configuration.bean.factory.ObjectStoreFileStorageFactoryBean;
@@ -14,7 +13,6 @@ public class FileStorageConfiguration {
1413

1514
private static final String OBJECT_STORE_SERVICE_NAME = "deploy-service-os";
1615

17-
@Inject
1816
@Bean
1917
public ObjectStoreFileStorageFactoryBean objectStoreFileStorage(EnvironmentServicesFinder vcapServiceFinder,
2018
ApplicationConfiguration applicationConfiguration) {

‎pom.xml‎

Lines changed: 41 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -15,50 +15,50 @@
1515
<sonar.organization>cloudfoundry</sonar.organization>
1616
<sonar.coverage.jacoco.xmlReportPaths>../multiapps-controller-coverage/target/site/jacoco-aggregate/jacoco.xml
1717
</sonar.coverage.jacoco.xmlReportPaths>
18-
<junit.version>5.13.4</junit.version>
19-
<junit-platform.version>1.13.2</junit-platform.version>
20-
<mockito.version>5.18.0</mockito.version>
21-
<h2.version>2.2.224</h2.version>
18+
<junit.version>6.0.1</junit.version>
19+
<mockito.version>5.21.0</mockito.version>
20+
<h2.version>2.4.240</h2.version>
2221
<servlet-api.version>6.1.0</servlet-api.version>
23-
<log4j.version>2.25.1</log4j.version>
22+
<log4j.version>2.25.3</log4j.version>
2423
<slf4j.version>2.0.17</slf4j.version>
25-
<commons-io.version>2.20.0</commons-io.version>
24+
<commons-io.version>2.21.0</commons-io.version>
2625
<commons-collections4.version>4.5.0</commons-collections4.version>
27-
<snakeyaml.version>2.4</snakeyaml.version>
28-
<httpclient.version>5.5</httpclient.version>
29-
<httpcore.version>5.3.4</httpcore.version>
30-
<eclipselink.version>4.0.7</eclipselink.version>
26+
<snakeyaml.version>2.5</snakeyaml.version>
27+
<httpclient.version>5.6</httpclient.version>
28+
<httpcore.version>5.4</httpcore.version>
29+
<eclipselink.version>4.0.9</eclipselink.version>
3130
<flowable.version>7.2.0</flowable.version>
3231
<spring.version>6.2.11</spring.version>
3332
<spring-security.version>6.5.4</spring-security.version>
34-
<hikari.version>6.3.0</hikari.version>
35-
<jackson.version>2.19.2</jackson.version>
33+
<hikari.version>7.0.2</hikari.version>
34+
<jackson-annotations.version>2.20</jackson-annotations.version>
35+
<jackson.version>3.0.3</jackson.version>
3636
<liquibase.version>4.33.0</liquibase.version>
3737
<liquibase-slf4j.version>5.1.0</liquibase-slf4j.version>
38-
<cloudfoundry-client.version>5.14.0.RELEASE</cloudfoundry-client.version>
39-
<reactor-netty.version>1.2.10</reactor-netty.version>
38+
<cloudfoundry-client.version>5.15.0.RELEASE</cloudfoundry-client.version>
39+
<reactor-netty.version>1.2.13</reactor-netty.version>
4040
<swagger.version>1.6.16</swagger.version>
4141
<jclouds.version>2.7.0</jclouds.version>
42-
<guava.version>33.4.8-jre</guava.version>
42+
<guava.version>33.5.0-jre</guava.version>
4343
<resilience4j.version>2.3.0</resilience4j.version>
44-
<immutables.version>2.10.1</immutables.version>
45-
<micrometer.version>1.15.3</micrometer.version>
46-
<aliyun-sdk-oss.version>3.18.3</aliyun-sdk-oss.version>
44+
<immutables.version>2.12.1</immutables.version>
45+
<micrometer.version>1.16.1</micrometer.version>
46+
<aliyun-sdk-oss.version>3.18.4</aliyun-sdk-oss.version>
47+
<!-- auto-service hasn't had a new release since 12.06.2023 - should check for alternatives in the future -->
4748
<auto-service.version>1.1.1</auto-service.version>
48-
<commons-codec.version>1.18.0</commons-codec.version>
49+
<commons-codec.version>1.20.0</commons-codec.version>
4950
<multiapps.version>2.42.0</multiapps.version>
5051
<java-cfenv.version>3.5.0</java-cfenv.version>
51-
<jaxb-api.version>4.0.2</jaxb-api.version>
52-
<jaxb-core.version>4.0.5</jaxb-core.version>
53-
<jaxb-impl.version>4.0.5</jaxb-impl.version>
52+
<jaxb-api.version>4.0.4</jaxb-api.version>
53+
<jaxb-core.version>4.0.6</jaxb-core.version>
5454
<jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
5555
<jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
56-
<bouncycastle.version>2.1.9</bouncycastle.version>
56+
<bouncycastle.version>2.1.10</bouncycastle.version>
5757
<apache.compress.version>1.28.0</apache.compress.version>
58-
<tika-core.version>3.2.2</tika-core.version>
59-
<commons-logging.version>1.3.1</commons-logging.version>
60-
<google-cloud.version>2.60.0</google-cloud.version>
61-
<google-cloud-nio.version>0.128.7</google-cloud-nio.version>
58+
<tika-core.version>3.2.3</tika-core.version>
59+
<commons-logging.version>1.3.5</commons-logging.version>
60+
<google-cloud.version>2.61.0</google-cloud.version>
61+
<google-cloud-nio.version>0.128.9</google-cloud-nio.version>
6262
</properties>
6363
<modules>
6464
<module>multiapps-controller-client</module>
@@ -115,7 +115,7 @@
115115
<plugin>
116116
<groupId>org.apache.maven.plugins</groupId>
117117
<artifactId>maven-compiler-plugin</artifactId>
118-
<version>3.14.0</version>
118+
<version>3.14.1</version>
119119
<configuration>
120120
<source>17</source>
121121
<target>17</target>
@@ -142,25 +142,25 @@
142142
<plugin>
143143
<groupId>org.apache.maven.plugins</groupId>
144144
<artifactId>maven-jar-plugin</artifactId>
145-
<version>3.2.0</version>
145+
<version>3.5.0</version>
146146
</plugin>
147147
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-war-plugin -->
148148
<plugin>
149149
<groupId>org.apache.maven.plugins</groupId>
150150
<artifactId>maven-war-plugin</artifactId>
151-
<version>3.4.0</version>
151+
<version>3.5.1</version>
152152
</plugin>
153153
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-resources-plugin -->
154154
<plugin>
155155
<groupId>org.apache.maven.plugins</groupId>
156156
<artifactId>maven-resources-plugin</artifactId>
157-
<version>3.2.0</version>
157+
<version>3.4.0</version>
158158
</plugin>
159159
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-surefire-plugin -->
160160
<plugin>
161161
<groupId>org.apache.maven.plugins</groupId>
162162
<artifactId>maven-surefire-plugin</artifactId>
163-
<version>3.5.3</version>
163+
<version>3.5.4</version>
164164
<configuration>
165165
<!-- Surefire excludes nested classes by default, so we need to explicitly specify that nothing should
166166
be excluded. -->
@@ -186,13 +186,13 @@
186186
<plugin>
187187
<groupId>org.apache.maven.plugins</groupId>
188188
<artifactId>maven-javadoc-plugin</artifactId>
189-
<version>3.11.2</version>
189+
<version>3.12.0</version>
190190
</plugin>
191191
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-release-plugin -->
192192
<plugin>
193193
<groupId>org.apache.maven.plugins</groupId>
194194
<artifactId>maven-release-plugin</artifactId>
195-
<version>3.1.1</version>
195+
<version>3.3.1</version>
196196
</plugin>
197197
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-gpg-plugin -->
198198
<plugin>
@@ -241,7 +241,7 @@
241241
<plugin>
242242
<groupId>org.jacoco</groupId>
243243
<artifactId>jacoco-maven-plugin</artifactId>
244-
<version>0.8.13</version>
244+
<version>0.8.14</version>
245245
</plugin>
246246
</plugins>
247247
</pluginManagement>
@@ -326,7 +326,7 @@
326326
<dependency>
327327
<groupId>org.junit.platform</groupId>
328328
<artifactId>junit-platform-launcher</artifactId>
329-
<version>${junit-platform.version}</version>
329+
<version>${junit.version}</version>
330330
<scope>test</scope>
331331
</dependency>
332332
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
@@ -368,12 +368,6 @@
368368
<artifactId>jaxb-core</artifactId>
369369
<version>${jaxb-core.version}</version>
370370
</dependency>
371-
<!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl -->
372-
<dependency>
373-
<groupId>org.glassfish.jaxb</groupId>
374-
<artifactId>jaxb-runtime</artifactId>
375-
<version>${jaxb-impl.version}</version>
376-
</dependency>
377371
<!-- Transitive dependency from multiapps-common and liquibase. Pin the version to make sure we're always using
378372
the correct one. -->
379373
<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
@@ -690,17 +684,17 @@
690684
<dependency>
691685
<groupId>com.fasterxml.jackson.core</groupId>
692686
<artifactId>jackson-annotations</artifactId>
693-
<version>${jackson.version}</version>
687+
<version>${jackson-annotations.version}</version>
694688
</dependency>
695-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
689+
<!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-core -->
696690
<dependency>
697-
<groupId>com.fasterxml.jackson.core</groupId>
691+
<groupId>tools.jackson.core</groupId>
698692
<artifactId>jackson-core</artifactId>
699693
<version>${jackson.version}</version>
700694
</dependency>
701-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
695+
<!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-databind -->
702696
<dependency>
703-
<groupId>com.fasterxml.jackson.core</groupId>
697+
<groupId>tools.jackson.core</groupId>
704698
<artifactId>jackson-databind</artifactId>
705699
<version>${jackson.version}</version>
706700
</dependency>
@@ -886,17 +880,6 @@
886880
</dependencies>
887881
</dependencyManagement>
888882

889-
<distributionManagement>
890-
<!--<snapshotRepository>
891-
<id>central</id>
892-
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
893-
</snapshotRepository>-->
894-
<!--<repository>
895-
<id>central</id>
896-
<url>https://central.sonatype.com</url>
897-
</repository>-->
898-
</distributionManagement>
899-
900883
<repositories>
901884
<repository>
902885
<id>central-sonatype</id>

0 commit comments

Comments
 (0)