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 5c1e2c3639002fd4b663d62dee604831bb6431cf Author: Andrus Adamchik <[email protected]> AuthorDate: Wed May 13 15:02:09 2026 -0400 Unify POM scope setting --- CLAUDE.md | 3 +++ cayenne-ant/pom.xml | 1 + pom.xml | 31 ------------------------------- 3 files changed, 4 insertions(+), 31 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 49f34d515..2b73babcd 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -68,6 +68,9 @@ Do not add `@since` tags to test classes — version tags are only meaningful on All POM plugins from submodules must be delcared in the parent module `<pluginManagement>`. All plugin versions should be declared as properties in the root pom.xml +Do not set `<scope>` inside `<dependencyManagement>` (except `<scope>import</scope>` for BOMs). `<dependencyManagement>` +pins versions only — each consuming `<dependency>` declares its own scope explicitly. + ## CI Matrix diff --git a/cayenne-ant/pom.xml b/cayenne-ant/pom.xml index 10754b560..906b91c52 100644 --- a/cayenne-ant/pom.xml +++ b/cayenne-ant/pom.xml @@ -39,6 +39,7 @@ <dependency> <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.cayenne</groupId> diff --git a/pom.xml b/pom.xml index 08c393e05..a6bab26cf 100644 --- a/pom.xml +++ b/pom.xml @@ -352,7 +352,6 @@ <groupId>org.apache.ant</groupId> <artifactId>ant</artifactId> <version>${ant.version}</version> - <scope>provided</scope> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -368,7 +367,6 @@ <groupId>org.apache.ant</groupId> <artifactId>ant-testutil</artifactId> <version>${ant.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>com.jgoodies</groupId> @@ -384,13 +382,11 @@ <groupId>com.mockrunner</groupId> <artifactId>mockrunner-jdbc</artifactId> <version>2.0.7</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>5.3.39</version> - <scope>test</scope> <exclusions> <exclusion> <groupId>xerces</groupId> @@ -406,7 +402,6 @@ <groupId>org.springframework</groupId> <artifactId>spring-mock</artifactId> <version>2.0.8</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.velocity</groupId> @@ -446,103 +441,86 @@ <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <version>${mockito.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>${hsqldb.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <version>${derby.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>com.mysql</groupId> <artifactId>mysql-connector-j</artifactId> <version>${mysql.connector.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>${h2.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.mariadb.jdbc</groupId> <artifactId>mariadb-java-client</artifactId> <version>${mariadb.connector.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <version>${postgres.jdbc.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>com.microsoft.sqlserver</groupId> <artifactId>mssql-jdbc</artifactId> <version>${mssql.jdbc.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>com.oracle.database.jdbc</groupId> <artifactId>ojdbc11</artifactId> <version>${ojdbc.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>com.ibm.db2</groupId> <artifactId>jcc</artifactId> <version>${ibm.db2.jcc.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.firebirdsql.jdbc</groupId> <artifactId>jaybird-jdk18</artifactId> <version>${jaybird.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.xerial</groupId> <artifactId>sqlite-jdbc</artifactId> <version>${sqlite.jdbc.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>com.frontbase</groupId> <artifactId>frontbase-driver</artifactId> <version>${frontbase.driver.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>com.ingres</groupId> <artifactId>ingres-driver</artifactId> <version>${ingres.driver.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>com.sybase</groupId> <artifactId>sybase-driver</artifactId> <version>${sybase.driver.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.xmlunit</groupId> <artifactId>xmlunit-matchers</artifactId> <version>${xmlunit.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.xmlunit</groupId> <artifactId>xmlunit-jakarta-jaxb-impl</artifactId> <version>${xmlunit.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -553,7 +531,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <version>${slf4j.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>ch.qos.logback</groupId> @@ -571,49 +548,41 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-compress</artifactId> <version>1.28.0</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> <version>${testcontainers.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers-mysql</artifactId> <version>${testcontainers.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers-mariadb</artifactId> <version>${testcontainers.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers-postgresql</artifactId> <version>${testcontainers.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers-oracle-xe</artifactId> <version>${testcontainers.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers-mssqlserver</artifactId> <version>${testcontainers.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers-db2</artifactId> <version>${testcontainers.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>com.fifesoft</groupId>
