diff --git a/multiapps-controller-api/pom.xml b/multiapps-controller-api/pom.xml
index e441739fbd..113ccad9e3 100644
--- a/multiapps-controller-api/pom.xml
+++ b/multiapps-controller-api/pom.xml
@@ -14,10 +14,6 @@
-
- jakarta.xml.bind
- jakarta.xml.bind-api
-
org.glassfish.jaxb
jaxb-core
@@ -27,7 +23,7 @@
jaxb-runtime
- com.fasterxml.jackson.core
+ tools.jackson.core
jackson-databind
diff --git a/multiapps-controller-client/pom.xml b/multiapps-controller-client/pom.xml
index eba015cffd..1ae71e1513 100644
--- a/multiapps-controller-client/pom.xml
+++ b/multiapps-controller-client/pom.xml
@@ -66,12 +66,12 @@
- com.fasterxml.jackson.core
+ tools.jackson.core
jackson-core
- com.fasterxml.jackson.core
+ tools.jackson.core
jackson-databind
diff --git a/multiapps-controller-core/pom.xml b/multiapps-controller-core/pom.xml
index 9ec1e2ff41..51ad2598d9 100644
--- a/multiapps-controller-core/pom.xml
+++ b/multiapps-controller-core/pom.xml
@@ -36,7 +36,7 @@
jakarta.servlet-api
- com.fasterxml.jackson.core
+ tools.jackson.core
jackson-databind
diff --git a/multiapps-controller-process/pom.xml b/multiapps-controller-process/pom.xml
index 1f4f1fde82..ffd4d4873f 100644
--- a/multiapps-controller-process/pom.xml
+++ b/multiapps-controller-process/pom.xml
@@ -52,7 +52,7 @@
jakarta.servlet-api
- com.fasterxml.jackson.core
+ tools.jackson.core
jackson-databind
diff --git a/multiapps-controller-web/pom.xml b/multiapps-controller-web/pom.xml
index 55eea4f790..038f235d83 100644
--- a/multiapps-controller-web/pom.xml
+++ b/multiapps-controller-web/pom.xml
@@ -99,7 +99,7 @@
jaxb-runtime
- com.fasterxml.jackson.core
+ tools.jackson.core
jackson-databind
diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java
index 115f569e55..eb0beeb4df 100644
--- a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java
+++ b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/DatabaseConfiguration.java
@@ -53,7 +53,6 @@ public DataSourceTransactionManager transactionManager(DataSource dataSource, Ap
return dataSourceTransactionManager;
}
- @Inject
@Bean
@Primary
public LocalContainerEntityManagerFactoryBean defaultEntityManagerFactory(DataSource dataSource,
diff --git a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FileStorageConfiguration.java b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FileStorageConfiguration.java
index 8994c622cf..00d84b1e45 100644
--- a/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FileStorageConfiguration.java
+++ b/multiapps-controller-web/src/main/java/org/cloudfoundry/multiapps/controller/web/configuration/FileStorageConfiguration.java
@@ -1,6 +1,5 @@
package org.cloudfoundry.multiapps.controller.web.configuration;
-import jakarta.inject.Inject;
import org.cloudfoundry.multiapps.controller.core.util.ApplicationConfiguration;
import org.cloudfoundry.multiapps.controller.persistence.util.EnvironmentServicesFinder;
import org.cloudfoundry.multiapps.controller.web.configuration.bean.factory.ObjectStoreFileStorageFactoryBean;
@@ -14,7 +13,6 @@ public class FileStorageConfiguration {
private static final String OBJECT_STORE_SERVICE_NAME = "deploy-service-os";
- @Inject
@Bean
public ObjectStoreFileStorageFactoryBean objectStoreFileStorage(EnvironmentServicesFinder vcapServiceFinder,
ApplicationConfiguration applicationConfiguration) {
diff --git a/pom.xml b/pom.xml
index 753184cf07..71c1c08e2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,48 +15,47 @@
cloudfoundry
../multiapps-controller-coverage/target/site/jacoco-aggregate/jacoco.xml
- 5.13.4
- 1.13.2
- 5.18.0
- 2.2.224
+ 6.0.1
+ 5.20.0
+ 2.4.240
6.1.0
- 2.25.1
+ 2.25.2
2.0.17
- 2.20.0
+ 2.21.0
4.5.0
- 2.4
- 5.5
- 5.3.4
- 4.0.7
+ 2.5
+ 5.5.1
+ 5.3.6
+ 4.0.8
7.2.0
- 6.2.11
- 6.5.4
- 6.3.0
- 2.19.2
+ 6.2.14
+ 6.5.7
+ 7.0.2
+ 2.20
+ 3.0.2
4.33.0
5.1.0
5.14.0.RELEASE
- 1.2.10
+ 1.2.12
1.6.16
2.7.0
- 33.4.8-jre
+ 33.5.0-jre
2.3.0
- 2.10.1
- 1.15.3
+ 2.11.7
+ 1.16.0
3.18.3
1.1.1
- 1.18.0
+ 1.20.0
2.41.0
3.5.0
- 4.0.2
- 4.0.5
- 4.0.5
+ 4.0.4
+ 4.0.6
2.0.1
3.0.0
- 2.1.9
+ 2.1.10
1.28.0
- 3.2.2
- 1.3.1
+ 3.2.3
+ 1.3.5
2.59.0
0.128.7
@@ -186,7 +185,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 3.11.2
+ 3.12.0
@@ -326,7 +325,7 @@
org.junit.platform
junit-platform-launcher
- ${junit-platform.version}
+ ${junit.version}
test
@@ -368,12 +367,6 @@
jaxb-core
${jaxb-core.version}
-
-
- org.glassfish.jaxb
- jaxb-runtime
- ${jaxb-impl.version}
-
@@ -690,17 +683,17 @@
com.fasterxml.jackson.core
jackson-annotations
- ${jackson.version}
+ ${jackson-annotations.version}
-
+
- com.fasterxml.jackson.core
+ tools.jackson.core
jackson-core
${jackson.version}
-
+
- com.fasterxml.jackson.core
+ tools.jackson.core
jackson-databind
${jackson.version}
@@ -886,17 +879,6 @@
-
-
-
-
-
central-sonatype