Skip to content

Commit 1089c00

Browse files
s-yonkov-yonkovs-yonkov-yonkov
authored
update dependencies (#1732)
1 parent f97fc3e commit 1089c00

File tree

8 files changed

+37
-62
lines changed

8 files changed

+37
-62
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@
6666
</dependency>
6767
<!-- https://mvnrepository.com/artifact/com.fasterxml.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>
7272
<!-- https://mvnrepository.com/artifact/com.fasterxml.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 -->

‎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: 31 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -15,48 +15,47 @@
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.20.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.2</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.5.1</httpclient.version>
28+
<httpcore.version>5.3.6</httpcore.version>
29+
<eclipselink.version>4.0.8</eclipselink.version>
3130
<flowable.version>7.2.0</flowable.version>
32-
<spring.version>6.2.11</spring.version>
33-
<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>
31+
<spring.version>6.2.14</spring.version>
32+
<spring-security.version>6.5.7</spring-security.version>
33+
<hikari.version>7.0.2</hikari.version>
34+
<jackson-annotations.version>2.20</jackson-annotations.version>
35+
<jackson.version>3.0.2</jackson.version>
3636
<liquibase.version>4.33.0</liquibase.version>
3737
<liquibase-slf4j.version>5.1.0</liquibase-slf4j.version>
3838
<cloudfoundry-client.version>5.14.0.RELEASE</cloudfoundry-client.version>
39-
<reactor-netty.version>1.2.10</reactor-netty.version>
39+
<reactor-netty.version>1.2.12</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>
44+
<immutables.version>2.11.7</immutables.version>
45+
<micrometer.version>1.16.0</micrometer.version>
4646
<aliyun-sdk-oss.version>3.18.3</aliyun-sdk-oss.version>
4747
<auto-service.version>1.1.1</auto-service.version>
48-
<commons-codec.version>1.18.0</commons-codec.version>
48+
<commons-codec.version>1.20.0</commons-codec.version>
4949
<multiapps.version>2.41.0</multiapps.version>
5050
<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>
51+
<jaxb-api.version>4.0.4</jaxb-api.version>
52+
<jaxb-core.version>4.0.6</jaxb-core.version>
5453
<jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
5554
<jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
56-
<bouncycastle.version>2.1.9</bouncycastle.version>
55+
<bouncycastle.version>2.1.10</bouncycastle.version>
5756
<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>
57+
<tika-core.version>3.2.3</tika-core.version>
58+
<commons-logging.version>1.3.5</commons-logging.version>
6059
<google-cloud.version>2.59.0</google-cloud.version>
6160
<google-cloud-nio.version>0.128.7</google-cloud-nio.version>
6261
</properties>
@@ -186,7 +185,7 @@
186185
<plugin>
187186
<groupId>org.apache.maven.plugins</groupId>
188187
<artifactId>maven-javadoc-plugin</artifactId>
189-
<version>3.11.2</version>
188+
<version>3.12.0</version>
190189
</plugin>
191190
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-release-plugin -->
192191
<plugin>
@@ -326,7 +325,7 @@
326325
<dependency>
327326
<groupId>org.junit.platform</groupId>
328327
<artifactId>junit-platform-launcher</artifactId>
329-
<version>${junit-platform.version}</version>
328+
<version>${junit.version}</version>
330329
<scope>test</scope>
331330
</dependency>
332331
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
@@ -368,12 +367,6 @@
368367
<artifactId>jaxb-core</artifactId>
369368
<version>${jaxb-core.version}</version>
370369
</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>
377370
<!-- Transitive dependency from multiapps-common and liquibase. Pin the version to make sure we're always using
378371
the correct one. -->
379372
<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
@@ -690,17 +683,17 @@
690683
<dependency>
691684
<groupId>com.fasterxml.jackson.core</groupId>
692685
<artifactId>jackson-annotations</artifactId>
693-
<version>${jackson.version}</version>
686+
<version>${jackson-annotations.version}</version>
694687
</dependency>
695-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
688+
<!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-core -->
696689
<dependency>
697-
<groupId>com.fasterxml.jackson.core</groupId>
690+
<groupId>tools.jackson.core</groupId>
698691
<artifactId>jackson-core</artifactId>
699692
<version>${jackson.version}</version>
700693
</dependency>
701-
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
694+
<!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-databind -->
702695
<dependency>
703-
<groupId>com.fasterxml.jackson.core</groupId>
696+
<groupId>tools.jackson.core</groupId>
704697
<artifactId>jackson-databind</artifactId>
705698
<version>${jackson.version}</version>
706699
</dependency>
@@ -886,17 +879,6 @@
886879
</dependencies>
887880
</dependencyManagement>
888881

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-
900882
<repositories>
901883
<repository>
902884
<id>central-sonatype</id>

0 commit comments

Comments
 (0)