Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions multiapps-controller-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
</parent>

<dependencies>
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
Expand All @@ -27,7 +23,7 @@
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions multiapps-controller-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
Expand Down
2 changes: 1 addition & 1 deletion multiapps-controller-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion multiapps-controller-process/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion multiapps-controller-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ public DataSourceTransactionManager transactionManager(DataSource dataSource, Ap
return dataSourceTransactionManager;
}

@Inject
@Bean
@Primary
public LocalContainerEntityManagerFactoryBean defaultEntityManagerFactory(DataSource dataSource,
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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) {
Expand Down
84 changes: 33 additions & 51 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,50 +15,49 @@
<sonar.organization>cloudfoundry</sonar.organization>
<sonar.coverage.jacoco.xmlReportPaths>../multiapps-controller-coverage/target/site/jacoco-aggregate/jacoco.xml
</sonar.coverage.jacoco.xmlReportPaths>
<junit.version>5.13.4</junit.version>
<junit-platform.version>1.13.2</junit-platform.version>
<mockito.version>5.18.0</mockito.version>
<h2.version>2.2.224</h2.version>
<junit.version>6.0.1</junit.version>
<mockito.version>5.21.0</mockito.version>
<h2.version>2.4.240</h2.version>
<servlet-api.version>6.1.0</servlet-api.version>
<log4j.version>2.25.1</log4j.version>
<log4j.version>2.25.3</log4j.version>
<slf4j.version>2.0.17</slf4j.version>
<commons-io.version>2.20.0</commons-io.version>
<commons-io.version>2.21.0</commons-io.version>
<commons-collections4.version>4.5.0</commons-collections4.version>
<snakeyaml.version>2.4</snakeyaml.version>
<httpclient.version>5.5</httpclient.version>
<httpcore.version>5.3.4</httpcore.version>
<eclipselink.version>4.0.7</eclipselink.version>
<snakeyaml.version>2.5</snakeyaml.version>
<httpclient.version>5.6</httpclient.version>
<httpcore.version>5.4</httpcore.version>
<eclipselink.version>4.0.8</eclipselink.version>
<flowable.version>7.2.0</flowable.version>
<spring.version>6.2.11</spring.version>
<spring-security.version>6.5.4</spring-security.version>
<hikari.version>6.3.0</hikari.version>
<jackson.version>2.19.2</jackson.version>
<hikari.version>7.0.2</hikari.version>
<jackson-annotations.version>2.20</jackson-annotations.version>
<jackson.version>3.0.3</jackson.version>
<liquibase.version>4.33.0</liquibase.version>
<liquibase-slf4j.version>5.1.0</liquibase-slf4j.version>
<cloudfoundry-client.version>5.14.0.RELEASE</cloudfoundry-client.version>
<reactor-netty.version>1.2.10</reactor-netty.version>
<cloudfoundry-client.version>5.15.0.RELEASE</cloudfoundry-client.version>
<reactor-netty.version>1.3.1</reactor-netty.version>
<swagger.version>1.6.16</swagger.version>
<jclouds.version>2.7.0</jclouds.version>
<guava.version>33.4.8-jre</guava.version>
<guava.version>33.5.0-jre</guava.version>
<resilience4j.version>2.3.0</resilience4j.version>
<immutables.version>2.10.1</immutables.version>
<micrometer.version>1.15.3</micrometer.version>
<immutables.version>2.12.0</immutables.version>
<micrometer.version>1.16.1</micrometer.version>
<aliyun-sdk-oss.version>3.18.3</aliyun-sdk-oss.version>
<auto-service.version>1.1.1</auto-service.version>
<commons-codec.version>1.18.0</commons-codec.version>
<multiapps.version>2.39.0</multiapps.version>
<commons-codec.version>1.20.0</commons-codec.version>
<multiapps.version>2.41.0</multiapps.version>
<java-cfenv.version>3.5.0</java-cfenv.version>
<jaxb-api.version>4.0.2</jaxb-api.version>
<jaxb-core.version>4.0.5</jaxb-core.version>
<jaxb-impl.version>4.0.5</jaxb-impl.version>
<jaxb-api.version>4.0.4</jaxb-api.version>
<jaxb-core.version>4.0.6</jaxb-core.version>
<jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
<jakarta.annotation-api.version>3.0.0</jakarta.annotation-api.version>
<bouncycastle.version>2.1.9</bouncycastle.version>
<bouncycastle.version>2.1.10</bouncycastle.version>
<apache.compress.version>1.28.0</apache.compress.version>
<tika-core.version>3.2.2</tika-core.version>
<commons-logging.version>1.3.1</commons-logging.version>
<google-cloud.version>2.60.0</google-cloud.version>
<google-cloud-nio.version>0.128.7</google-cloud-nio.version>
<tika-core.version>3.2.3</tika-core.version>
<commons-logging.version>1.3.5</commons-logging.version>
<google-cloud.version>2.61.0</google-cloud.version>
<google-cloud-nio.version>0.128.9</google-cloud-nio.version>
</properties>
<modules>
<module>multiapps-controller-client</module>
Expand Down Expand Up @@ -186,7 +185,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.11.2</version>
<version>3.12.0</version>
</plugin>
<!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-release-plugin -->
<plugin>
Expand Down Expand Up @@ -326,7 +325,7 @@
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>${junit-platform.version}</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine -->
Expand Down Expand Up @@ -368,12 +367,6 @@
<artifactId>jaxb-core</artifactId>
<version>${jaxb-core.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.sun.xml.bind/jaxb-impl -->
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
<version>${jaxb-impl.version}</version>
</dependency>
<!-- Transitive dependency from multiapps-common and liquibase. Pin the version to make sure we're always using
the correct one. -->
<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
Expand Down Expand Up @@ -690,17 +683,17 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
<version>${jackson-annotations.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-core -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<!-- https://mvnrepository.com/artifact/tools.jackson.core/jackson-databind -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
Expand Down Expand Up @@ -886,17 +879,6 @@
</dependencies>
</dependencyManagement>

<distributionManagement>
<!--<snapshotRepository>
<id>central</id>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
</snapshotRepository>-->
<!--<repository>
<id>central</id>
<url>https://central.sonatype.com</url>
</repository>-->
</distributionManagement>

<repositories>
<repository>
<id>central-sonatype</id>
Expand Down
Loading