Skip to content

Dependencies refactor #1727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theghost5800 merged 3 commits into from
Oct 31, 2025
Merged

Dependencies refactor #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e89e5e7
Remove usage of derby dependency for tests
theghost5800 Oct 27, 2025
a6c803f
Remove explicit set of mybatis dependency
theghost5800 Oct 27, 2025
8ff0461
Remove explicit set of json-smart dependency
theghost5800 Oct 27, 2025
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
15 changes: 0 additions & 15 deletions multiapps-controller-persistence/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,21 +85,6 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/org/cloudfoundry/multiapps/controller/persistence/model/PersistenceMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ private TableColumnNames() {
public static final String HISTORIC_OPERATION_EVENT_TIMESTAMP = "timestamp";

public static final String ACCESS_TOKEN_ID = "id";
public static final String ACCESS_TOKEN_VALUE = "value";
// Add escaping quotes due to reserved word in some DBMS(h2).
public static final String ACCESS_TOKEN_VALUE = "\"value\"";
public static final String ACCESS_TOKEN_USERNAME = "username";
public static final String ACCESS_TOKEN_EXPIRES_AT = "expires_at";
public static final String ACCESS_TOKEN_USER_GUID = "user_guid";
Expand Down
4 changes: 2 additions & 2 deletions multiapps-controller-persistence/src/test/resources/META-INF/persistence.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<class>org.cloudfoundry.multiapps.controller.persistence.dto.BackupDescriptorDto</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>
<properties>
<property name="jakarta.persistence.jdbc.driver" value="org.apache.derby.jdbc.EmbeddedDriver" />
<property name="jakarta.persistence.jdbc.driver" value="org.h2.Driver" />
<property name="jakarta.persistence.jdbc.url"
value="jdbc:derby:memory:configuration-subscriptions;create=true" />
value="jdbc:h2:mem:configuration-subscriptions:DB_CLOSE_DELAY=-1" />
<property name="jakarta.persistence.jdbc.user" value="root" />
<property name="jakarta.persistence.jdbc.password" value="root" />

Expand Down
18 changes: 0 additions & 18 deletions multiapps-controller-process/src/test/resources/META-INF/persistence.xml
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<junit.version>5.13.4</junit.version>
<junit-platform.version>1.13.2</junit-platform.version>
<mockito.version>5.18.0</mockito.version>
<derby.version>10.16.1.1</derby.version> <!-- Upper versions of Derby(10.17.1.0) are not compatible with Java 17 -->
<h2.version>2.2.224</h2.version>
<servlet-api.version>6.1.0</servlet-api.version>
<log4j.version>2.25.1</log4j.version>
Expand All @@ -30,10 +29,8 @@
<httpcore.version>5.3.4</httpcore.version>
<eclipselink.version>4.0.7</eclipselink.version>
<flowable.version>7.2.0</flowable.version>
<mybatis.version>3.5.19</mybatis.version>
<spring.version>6.2.11</spring.version>
<spring-security.version>6.5.4</spring-security.version>
<json-smart.version>2.5.2</json-smart.version>
<hikari.version>6.3.0</hikari.version>
<jackson.version>2.19.2</jackson.version>
<liquibase.version>4.33.0</liquibase.version>
Expand Down Expand Up @@ -384,27 +381,6 @@
<artifactId>swagger-annotations</artifactId>
<version>${swagger.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.derby/derby -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.derby/derbyclient -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.derby/derbynet -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
<version>${derby.version}</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
<dependency>
<groupId>com.h2database</groupId>
Expand Down Expand Up @@ -575,12 +551,6 @@
<artifactId>flowable-spring-common</artifactId>
<version>${flowable.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mybatis/mybatis -->
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>${mybatis.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework/spring-core -->
<dependency>
<groupId>org.springframework</groupId>
Expand Down Expand Up @@ -791,14 +761,6 @@
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>
<!-- Transitive dependency from spring-security-oauth2-client. They're using an old version with security vulnerabilities.
In order to avoid the vulnerabilities explicit versioning is required. -->
<!-- https://mvnrepository.com/artifact/net.minidev/json-smart -->
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>${json-smart.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.github.resilience4j/resilience4j-ratelimiter -->
<dependency>
<groupId>io.github.resilience4j</groupId>
Expand Down