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 0022c316191f1cf2ab9a7ccb6ed5436604b55c48 Author: Andrus Adamchik <[email protected]> AuthorDate: Sat May 9 09:54:56 2026 -0400 Pom cleanup --- cayenne-gradle-plugin/pom.xml | 1 - cayenne-jcache/pom.xml | 31 ----------- cayenne-maven-plugin/pom.xml | 25 --------- cayenne/pom.xml | 1 - docs/asciidoc/cayenne-asciidoc-extension/pom.xml | 1 - docs/asciidoc/cayenne-guide/pom.xml | 2 +- docs/asciidoc/getting-started-db-first/pom.xml | 2 +- docs/asciidoc/getting-started-guide/pom.xml | 2 +- docs/asciidoc/pom.xml | 12 +++++ docs/asciidoc/upgrade-guide/pom.xml | 2 +- modeler/cayenne-modeler-mac-ext/pom.xml | 1 - pom.xml | 66 ++++++++++++++++++++++++ 12 files changed, 82 insertions(+), 64 deletions(-) diff --git a/cayenne-gradle-plugin/pom.xml b/cayenne-gradle-plugin/pom.xml index 816d8bf63..6a6aa9861 100644 --- a/cayenne-gradle-plugin/pom.xml +++ b/cayenne-gradle-plugin/pom.xml @@ -106,7 +106,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.12</version> <executions> <execution> <id>attach-artifacts</id> diff --git a/cayenne-jcache/pom.xml b/cayenne-jcache/pom.xml index b864a4834..549af26fb 100644 --- a/cayenne-jcache/pom.xml +++ b/cayenne-jcache/pom.xml @@ -30,37 +30,6 @@ <name>cayenne-jcache: Cayenne JCache Integration</name> <packaging>jar</packaging> - <properties> - <jcache-version>1.0.0</jcache-version> - <ehcache-version>3.8.1</ehcache-version> - <jaxb-api-version>2.3.1</jaxb-api-version> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.ehcache</groupId> - <artifactId>ehcache</artifactId> - <version>${ehcache-version}</version> - </dependency> - <dependency> - <groupId>javax.cache</groupId> - <artifactId>cache-api</artifactId> - <version>${jcache-version}</version> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>${jaxb-api-version}</version> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - <version>${jaxb-api-version}</version> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> <!-- Compile dependencies --> diff --git a/cayenne-maven-plugin/pom.xml b/cayenne-maven-plugin/pom.xml index 76439a64a..153aba122 100644 --- a/cayenne-maven-plugin/pom.xml +++ b/cayenne-maven-plugin/pom.xml @@ -24,31 +24,6 @@ <packaging>maven-plugin</packaging> <name>cayenne-maven-plugin: Cayenne Maven Plugin</name> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>3.9.8</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-compat</artifactId> - <version>3.9.8</version> - </dependency> - <dependency> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-annotations</artifactId> - <version>3.13.1</version> - </dependency> - <dependency> - <groupId>org.apache.maven.plugin-testing</groupId> - <artifactId>maven-plugin-testing-harness</artifactId> - <version>3.3.0</version> - </dependency> - </dependencies> - </dependencyManagement> - <build> <plugins> <!-- This ensures LICENSE and NOTICE inclusion in all jars --> diff --git a/cayenne/pom.xml b/cayenne/pom.xml index 8986177e5..2022f642d 100644 --- a/cayenne/pom.xml +++ b/cayenne/pom.xml @@ -168,7 +168,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>javacc-maven-plugin</artifactId> - <version>2.6</version> <executions> <execution> <id>jjtree-ejbql</id> diff --git a/docs/asciidoc/cayenne-asciidoc-extension/pom.xml b/docs/asciidoc/cayenne-asciidoc-extension/pom.xml index 00c37914d..b192b0081 100644 --- a/docs/asciidoc/cayenne-asciidoc-extension/pom.xml +++ b/docs/asciidoc/cayenne-asciidoc-extension/pom.xml @@ -34,7 +34,6 @@ <!-- jsoup HTML parser library @ https://jsoup.org/ --> <groupId>org.jsoup</groupId> <artifactId>jsoup</artifactId> - <version>1.15.3</version> </dependency> </dependencies> diff --git a/docs/asciidoc/cayenne-guide/pom.xml b/docs/asciidoc/cayenne-guide/pom.xml index 750f54b22..5fdb7089a 100644 --- a/docs/asciidoc/cayenne-guide/pom.xml +++ b/docs/asciidoc/cayenne-guide/pom.xml @@ -40,7 +40,7 @@ <dependency> <groupId>io.bootique.tools</groupId> <artifactId>hugo-asciidoctorj-extension</artifactId> - <version>1.0-M2</version> + <version>${hugo.asciidoctorj.extension.version}</version> </dependency> </dependencies> diff --git a/docs/asciidoc/getting-started-db-first/pom.xml b/docs/asciidoc/getting-started-db-first/pom.xml index a63fd1d7b..6749c7732 100644 --- a/docs/asciidoc/getting-started-db-first/pom.xml +++ b/docs/asciidoc/getting-started-db-first/pom.xml @@ -40,7 +40,7 @@ <dependency> <groupId>io.bootique.tools</groupId> <artifactId>hugo-asciidoctorj-extension</artifactId> - <version>1.0-M1</version> + <version>${hugo.asciidoctorj.extension.version}</version> </dependency> </dependencies> diff --git a/docs/asciidoc/getting-started-guide/pom.xml b/docs/asciidoc/getting-started-guide/pom.xml index dbdb97f95..e5534281f 100644 --- a/docs/asciidoc/getting-started-guide/pom.xml +++ b/docs/asciidoc/getting-started-guide/pom.xml @@ -40,7 +40,7 @@ <dependency> <groupId>io.bootique.tools</groupId> <artifactId>hugo-asciidoctorj-extension</artifactId> - <version>1.0-M1</version> + <version>${hugo.asciidoctorj.extension.version}</version> </dependency> </dependencies> diff --git a/docs/asciidoc/pom.xml b/docs/asciidoc/pom.xml index d45704fce..599779dca 100644 --- a/docs/asciidoc/pom.xml +++ b/docs/asciidoc/pom.xml @@ -46,8 +46,20 @@ <asciidoctorj.pdf.version>2.3.23</asciidoctorj.pdf.version> <cayenne.version>${project.version}</cayenne.version> <cayenne.major.version>5.0</cayenne.major.version> + <hugo.asciidoctorj.extension.version>1.0-M2</hugo.asciidoctorj.extension.version> + <jsoup.version>1.15.3</jsoup.version> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jsoup</groupId> + <artifactId>jsoup</artifactId> + <version>${jsoup.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>org.apache.cayenne</groupId> diff --git a/docs/asciidoc/upgrade-guide/pom.xml b/docs/asciidoc/upgrade-guide/pom.xml index 014eba8aa..5e3d9a8ba 100644 --- a/docs/asciidoc/upgrade-guide/pom.xml +++ b/docs/asciidoc/upgrade-guide/pom.xml @@ -38,7 +38,7 @@ <dependency> <groupId>io.bootique.tools</groupId> <artifactId>hugo-asciidoctorj-extension</artifactId> - <version>1.0-M1</version> + <version>${hugo.asciidoctorj.extension.version}</version> </dependency> </dependencies> diff --git a/modeler/cayenne-modeler-mac-ext/pom.xml b/modeler/cayenne-modeler-mac-ext/pom.xml index 31fb9759a..8a30c5eea 100644 --- a/modeler/cayenne-modeler-mac-ext/pom.xml +++ b/modeler/cayenne-modeler-mac-ext/pom.xml @@ -37,7 +37,6 @@ <dependency> <groupId>com.yuvimasory</groupId> <artifactId>orange-extensions</artifactId> - <version>1.3.0</version> <scope>provided</scope> </dependency> diff --git a/pom.xml b/pom.xml index 4b884e2e3..766baead3 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,17 @@ <testcontainers.version>1.21.4</testcontainers.version> <xmlunit.version>2.9.1</xmlunit.version> + <!-- Dependency versions (continued) --> + <build-helper-maven-plugin.version>1.12</build-helper-maven-plugin.version> + <ehcache.version>3.8.1</ehcache.version> + <javacc-maven-plugin.version>2.6</javacc-maven-plugin.version> + <jaxb-api.version>2.3.1</jaxb-api.version> + <jcache.version>1.0.0</jcache.version> + <maven-api.version>3.9.8</maven-api.version> + <maven-plugin-annotations.version>3.13.1</maven-plugin-annotations.version> + <maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version> + <orange-extensions.version>1.3.0</orange-extensions.version> + <!-- Maven plugin versions --> <apache-rat-plugin.version>0.18</apache-rat-plugin.version> <dependency-maven-plugin.version>1.0</dependency-maven-plugin.version> @@ -515,6 +526,51 @@ <artifactId>rsyntaxtextarea</artifactId> <version>3.2.0</version> </dependency> + <dependency> + <groupId>org.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>${ehcache.version}</version> + </dependency> + <dependency> + <groupId>javax.cache</groupId> + <artifactId>cache-api</artifactId> + <version>${jcache.version}</version> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb-api.version}</version> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>${jaxb-api.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>${maven-api.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>${maven-api.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${maven-plugin-annotations.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugin-testing</groupId> + <artifactId>maven-plugin-testing-harness</artifactId> + <version>${maven-plugin-testing-harness.version}</version> + </dependency> + <dependency> + <groupId>com.yuvimasory</groupId> + <artifactId>orange-extensions</artifactId> + <version>${orange-extensions.version}</version> + </dependency> </dependencies> </dependencyManagement> @@ -665,6 +721,16 @@ <artifactId>maven-gpg-plugin</artifactId> <version>${maven-gpg-plugin.version}</version> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>javacc-maven-plugin</artifactId> + <version>${javacc-maven-plugin.version}</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>${build-helper-maven-plugin.version}</version> + </plugin> </plugins> </pluginManagement>
