diff --git a/multiapps-controller-api/pom.xml b/multiapps-controller-api/pom.xml index 4c30b41dfa..ee686894b8 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 3a046c8245..6c1e41970b 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 c7ef468b80..01ed07b8db 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 0f1f4913a9..9a47142618 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 c0c8bfe5b2..7cf94db093 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 4e4e67d0dd..f1da8297fa 100644 --- a/pom.xml +++ b/pom.xml @@ -15,50 +15,49 @@ 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.21.0 + 2.4.240 6.1.0 - 2.25.1 + 2.25.3 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.6 + 5.4 + 4.0.8 7.2.0 6.2.11 6.5.4 - 6.3.0 - 2.19.2 + 7.0.2 + 2.20 + 3.0.3 4.33.0 5.1.0 - 5.14.0.RELEASE - 1.2.10 + 5.15.0.RELEASE + 1.3.1 1.6.16 2.7.0 - 33.4.8-jre + 33.5.0-jre 2.3.0 - 2.10.1 - 1.15.3 + 2.12.0 + 1.16.1 3.18.3 1.1.1 - 1.18.0 - 2.39.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 - 2.60.0 - 0.128.7 + 3.2.3 + 1.3.5 + 2.61.0 + 0.128.9 multiapps-controller-client @@ -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