Skip to content

Commit 3099f3a

Browse files
s-yonkov-yonkovs-yonkov-yonkov
authored
Revert "update dependencies (#1732)" (#1756)
* Revert "update dependencies (#1732)" This reverts commit 1089c00.
1 parent 4067975 commit 3099f3a

File tree

8 files changed

+63
-38
lines changed

8 files changed

+63
-38
lines changed

‎multiapps-controller-api/pom.xml‎

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

1616
<dependencies>
17+
<dependency>
18+
<groupId>jakarta.xml.bind</groupId>
19+
<artifactId>jakarta.xml.bind-api</artifactId>
20+
</dependency>
1721
<dependency>
1822
<groupId>org.glassfish.jaxb</groupId>
1923
<artifactId>jaxb-core</artifactId>
@@ -23,7 +27,7 @@
2327
<artifactId>jaxb-runtime</artifactId>
2428
</dependency>
2529
<dependency>
26-
<groupId>tools.jackson.core</groupId>
30+
<groupId>com.fasterxml.jackson.core</groupId>
2731
<artifactId>jackson-databind</artifactId>
2832
</dependency>
2933
<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>tools.jackson.core</groupId>
69+
<groupId>com.fasterxml.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>tools.jackson.core</groupId>
74+
<groupId>com.fasterxml.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>tools.jackson.core</groupId>
39+
<groupId>com.fasterxml.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>tools.jackson.core</groupId>
55+
<groupId>com.fasterxml.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>tools.jackson.core</groupId>
102+
<groupId>com.fasterxml.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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public DataSourceTransactionManager transactionManager(DataSource dataSource, Ap
5353
return dataSourceTransactionManager;
5454
}
5555

56+
@Inject
5657
@Bean
5758
@Primary
5859
public LocalContainerEntityManagerFactoryBean defaultEntityManagerFactory(DataSource dataSource,

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

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

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

1415
private static final String OBJECT_STORE_SERVICE_NAME = "deploy-service-os";
1516

17+
@Inject
1618
@Bean
1719
public ObjectStoreFileStorageFactoryBean objectStoreFileStorage(EnvironmentServicesFinder vcapServiceFinder,
1820
ApplicationConfiguration applicationConfiguration) {

‎pom.xml‎

Lines changed: 50 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,47 +15,48 @@
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>6.0.1</junit.version>
19-
<mockito.version>5.20.0</mockito.version>
20-
<h2.version>2.4.240</h2.version>
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>
2122
<servlet-api.version>6.1.0</servlet-api.version>
22-
<log4j.version>2.25.2</log4j.version>
23+
<log4j.version>2.25.1</log4j.version>
2324
<slf4j.version>2.0.17</slf4j.version>
24-
<commons-io.version>2.21.0</commons-io.version>
25+
<commons-io.version>2.20.0</commons-io.version>
2526
<commons-collections4.version>4.5.0</commons-collections4.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>
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>
3031
<flowable.version>7.2.0</flowable.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>
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>
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.12</reactor-netty.version>
39+
<reactor-netty.version>1.2.10</reactor-netty.version>
4040
<swagger.version>1.6.16</swagger.version>
4141
<jclouds.version>2.7.0</jclouds.version>
42-
<guava.version>33.5.0-jre</guava.version>
42+
<guava.version>33.4.8-jre</guava.version>
4343
<resilience4j.version>2.3.0</resilience4j.version>
44-
<immutables.version>2.11.7</immutables.version>
45-
<micrometer.version>1.16.0</micrometer.version>
44+
<immutables.version>2.10.1</immutables.version>
45+
<micrometer.version>1.15.3</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.20.0</commons-codec.version>
49-
<multiapps.version>2.41.0</multiapps.version>
48+
<commons-codec.version>1.18.0</commons-codec.version>
49+
<multiapps.version>2.39.0</multiapps.version>
5050
<java-cfenv.version>3.5.0</java-cfenv.version>
51-
<jaxb-api.version>4.0.4</jaxb-api.version>
52-
<jaxb-core.version>4.0.6</jaxb-core.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>
5354
<jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
5455
<jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
55-
<bouncycastle.version>2.1.10</bouncycastle.version>
56+
<bouncycastle.version>2.1.9</bouncycastle.version>
5657
<apache.compress.version>1.28.0</apache.compress.version>
57-
<tika-core.version>3.2.3</tika-core.version>
58-
<commons-logging.version>1.3.5</commons-logging.version>
58+
<tika-core.version>3.2.2</tika-core.version>
59+
<commons-logging.version>1.3.1</commons-logging.version>
5960
<google-cloud.version>2.60.0</google-cloud.version>
6061
<google-cloud-nio.version>0.128.7</google-cloud-nio.version>
6162
</properties>
@@ -185,7 +186,7 @@
185186
<plugin>
186187
<groupId>org.apache.maven.plugins</groupId>
187188
<artifactId>maven-javadoc-plugin</artifactId>
188-
<version>3.12.0</version>
189+
<version>3.11.2</version>
189190
</plugin>
190191
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-release-plugin -->
191192
<plugin>
@@ -325,7 +326,7 @@
325326
<dependency>
326327
<groupId>org.junit.platform</groupId>
327328
<artifactId>junit-platform-launcher</artifactId>
328-
<version>${junit.version}</version>
329+
<version>${junit-platform.version}</version>
329330
<scope>test</scope>
330331
</dependency>
331332
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
@@ -367,6 +368,12 @@
367368
<artifactId>jaxb-core</artifactId>
368369
<version>${jaxb-core.version}</version>
369370
</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>
370377
<!-- Transitive dependency from multiapps-common and liquibase. Pin the version to make sure we're always using
371378
the correct one. -->
372379
<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
@@ -683,17 +690,17 @@
683690
<dependency>
684691
<groupId>com.fasterxml.jackson.core</groupId>
685692
<artifactId>jackson-annotations</artifactId>
686-
<version>${jackson-annotations.version}</version>
693+
<version>${jackson.version}</version>
687694
</dependency>
688-
<!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-core -->
695+
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
689696
<dependency>
690-
<groupId>tools.jackson.core</groupId>
697+
<groupId>com.fasterxml.jackson.core</groupId>
691698
<artifactId>jackson-core</artifactId>
692699
<version>${jackson.version}</version>
693700
</dependency>
694-
<!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-databind -->
701+
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
695702
<dependency>
696-
<groupId>tools.jackson.core</groupId>
703+
<groupId>com.fasterxml.jackson.core</groupId>
697704
<artifactId>jackson-databind</artifactId>
698705
<version>${jackson.version}</version>
699706
</dependency>
@@ -879,6 +886,17 @@
879886
</dependencies>
880887
</dependencyManagement>
881888

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+
882900
<repositories>
883901
<repository>
884902
<id>central-sonatype</id>

0 commit comments

Comments
 (0)