This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 457490be3f82d05204755e858c8a593819afb44c Author: Andrus Adamchik <[email protected]> AuthorDate: Wed May 13 15:04:42 2026 -0400 sharing testcontainers dependencies with all tests, just like the drivers --- cayenne-dbsync/pom.xml | 41 ---------------------------------------- cayenne-jcache/pom.xml | 40 --------------------------------------- cayenne/pom.xml | 40 --------------------------------------- pom.xml | 51 +++++++++++++++++++++++++++++++++++++++----------- 4 files changed, 40 insertions(+), 132 deletions(-) diff --git a/cayenne-dbsync/pom.xml b/cayenne-dbsync/pom.xml index 199505c52..a40b9e60a 100644 --- a/cayenne-dbsync/pom.xml +++ b/cayenne-dbsync/pom.xml @@ -74,47 +74,6 @@ <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-mysql</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-mariadb</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-postgresql</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-oracle-xe</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-mssqlserver</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-db2</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.cayenne.build-tools</groupId> <artifactId>cayenne-test-utilities</artifactId> diff --git a/cayenne-jcache/pom.xml b/cayenne-jcache/pom.xml index 0f49da4b9..1bbe6030b 100644 --- a/cayenne-jcache/pom.xml +++ b/cayenne-jcache/pom.xml @@ -83,46 +83,6 @@ <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-mysql</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-mariadb</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-postgresql</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-oracle-xe</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-mssqlserver</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-db2</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/cayenne/pom.xml b/cayenne/pom.xml index c00f6b51b..eecf911c5 100644 --- a/cayenne/pom.xml +++ b/cayenne/pom.xml @@ -101,46 +101,6 @@ <artifactId>slf4j-simple</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-mysql</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-mariadb</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-postgresql</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-oracle-xe</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-mssqlserver</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers-db2</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <resources> diff --git a/pom.xml b/pom.xml index a6bab26cf..dd3b1ea84 100644 --- a/pom.xml +++ b/pom.xml @@ -30,8 +30,8 @@ <description> Apache Cayenne is a powerful, full-featured, and open source - Java framework, plus developer tools, that provides Object - Relational Mapping (ORM) and remoting services for persistence. + framework with developer tools, that provides Object + Relational Mapping (ORM) services for Java persistence. The software is licensed under the Apache License. </description> @@ -542,13 +542,6 @@ <artifactId>mcp</artifactId> <version>${mcp-sdk.version}</version> </dependency> - <!-- This dependency update the one provided by the testcontainers, - should be removed once testcontainers uses a version without active CVEs --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-compress</artifactId> - <version>1.28.0</version> - </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> @@ -639,8 +632,7 @@ <dependencies> <!-- JDBC drivers from Maven Central; available on every module's test classpath. - Tests pick a backend via -DcayenneTestConnection=<value>. Non-MC drivers - (frontbase, ingres, sybase) live in profiles below. --> + Non-Maven Central drivers frontbase, ingres, sybase) live in profiles below. --> <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> @@ -696,6 +688,43 @@ <artifactId>sqlite-jdbc</artifactId> <scope>test</scope> </dependency> + + <!-- Testcontainers, available on every module's test classpath --> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers-mysql</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers-mariadb</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers-postgresql</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers-oracle-xe</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers-mssqlserver</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testcontainers</groupId> + <artifactId>testcontainers-db2</artifactId> + <scope>test</scope> + </dependency> </dependencies> <repositories>
