diff --git a/multiapps-controller-api/pom.xml b/multiapps-controller-api/pom.xml index ee686894b8..4c30b41dfa 100644 --- a/multiapps-controller-api/pom.xml +++ b/multiapps-controller-api/pom.xml @@ -14,6 +14,10 @@ + + jakarta.xml.bind + jakarta.xml.bind-api + org.glassfish.jaxb jaxb-core @@ -23,7 +27,7 @@ jaxb-runtime - tools.jackson.core + com.fasterxml.jackson.core jackson-databind diff --git a/multiapps-controller-client/pom.xml b/multiapps-controller-client/pom.xml index 6c1e41970b..3a046c8245 100644 --- a/multiapps-controller-client/pom.xml +++ b/multiapps-controller-client/pom.xml @@ -66,12 +66,12 @@ - tools.jackson.core + com.fasterxml.jackson.core jackson-core - tools.jackson.core + com.fasterxml.jackson.core jackson-databind diff --git a/multiapps-controller-core/pom.xml b/multiapps-controller-core/pom.xml index 01ed07b8db..c7ef468b80 100644 --- a/multiapps-controller-core/pom.xml +++ b/multiapps-controller-core/pom.xml @@ -36,7 +36,7 @@ jakarta.servlet-api - tools.jackson.core + com.fasterxml.jackson.core jackson-databind diff --git a/multiapps-controller-process/pom.xml b/multiapps-controller-process/pom.xml index 9a47142618..0f1f4913a9 100644 --- a/multiapps-controller-process/pom.xml +++ b/multiapps-controller-process/pom.xml @@ -52,7 +52,7 @@ jakarta.servlet-api - tools.jackson.core + com.fasterxml.jackson.core jackson-databind diff --git a/multiapps-controller-web/pom.xml b/multiapps-controller-web/pom.xml index 7cf94db093..c0c8bfe5b2 100644 --- a/multiapps-controller-web/pom.xml +++ b/multiapps-controller-web/pom.xml @@ -99,7 +99,7 @@ jaxb-runtime - tools.jackson.core + com.fasterxml.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 eb0beeb4df..115f569e55 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,6 +53,7 @@ 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 00d84b1e45..8994c622cf 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,5 +1,6 @@ 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; @@ -13,6 +14,7 @@ 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 ceaf6da57e..4e4e67d0dd 100644 --- a/pom.xml +++ b/pom.xml @@ -15,47 +15,48 @@ cloudfoundry ../multiapps-controller-coverage/target/site/jacoco-aggregate/jacoco.xml - 6.0.1 - 5.20.0 - 2.4.240 + 5.13.4 + 1.13.2 + 5.18.0 + 2.2.224 6.1.0 - 2.25.2 + 2.25.1 2.0.17 - 2.21.0 + 2.20.0 4.5.0 - 2.5 - 5.5.1 - 5.3.6 - 4.0.8 + 2.4 + 5.5 + 5.3.4 + 4.0.7 7.2.0 - 6.2.14 - 6.5.7 - 7.0.2 - 2.20 - 3.0.2 + 6.2.11 + 6.5.4 + 6.3.0 + 2.19.2 4.33.0 5.1.0 5.14.0.RELEASE - 1.2.12 + 1.2.10 1.6.16 2.7.0 - 33.5.0-jre + 33.4.8-jre 2.3.0 - 2.11.7 - 1.16.0 + 2.10.1 + 1.15.3 3.18.3 1.1.1 - 1.20.0 - 2.41.0 + 1.18.0 + 2.39.0 3.5.0 - 4.0.4 - 4.0.6 + 4.0.2 + 4.0.5 + 4.0.5 2.0.1 3.0.0 - 2.1.10 + 2.1.9 1.28.0 - 3.2.3 - 1.3.5 + 3.2.2 + 1.3.1 2.60.0 0.128.7 @@ -185,7 +186,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.12.0 + 3.11.2 @@ -325,7 +326,7 @@ org.junit.platform junit-platform-launcher - ${junit.version} + ${junit-platform.version} test @@ -367,6 +368,12 @@ jaxb-core ${jaxb-core.version} + + + org.glassfish.jaxb + jaxb-runtime + ${jaxb-impl.version} + @@ -683,17 +690,17 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson-annotations.version} + ${jackson.version} - + - tools.jackson.core + com.fasterxml.jackson.core jackson-core ${jackson.version} - + - tools.jackson.core + com.fasterxml.jackson.core jackson-databind ${jackson.version} @@ -879,6 +886,17 @@ + + + + + central-sonatype