AXIOM-506: Use BOMs to manage Jakarta dependencies
diff --git a/axiom-jakarta-activation/pom.xml b/axiom-jakarta-activation/pom.xml
index f8ce328..a1e51e4 100644
--- a/axiom-jakarta-activation/pom.xml
+++ b/axiom-jakarta-activation/pom.xml
@@ -31,6 +31,17 @@
<url>http://ws.apache.org/axiom/</url>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>jakarta-bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -40,7 +51,6 @@
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>${jakarta.activation.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/axiom-javax-activation/pom.xml b/axiom-javax-activation/pom.xml
index 0f996ff..3dd04cc 100644
--- a/axiom-javax-activation/pom.xml
+++ b/axiom-javax-activation/pom.xml
@@ -31,6 +31,17 @@
<url>http://ws.apache.org/axiom/</url>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javax-bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -46,7 +57,6 @@
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>${javax.activation.version}</version>
</dependency>
</dependencies>
diff --git a/axiom-legacy-attachments/pom.xml b/axiom-legacy-attachments/pom.xml
index 908172a..50dd9f4 100644
--- a/axiom-legacy-attachments/pom.xml
+++ b/axiom-legacy-attachments/pom.xml
@@ -31,6 +31,17 @@
<url>http://ws.apache.org/axiom/</url>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javax-bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -45,7 +56,6 @@
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>${javax.activation.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/jakarta-bom/pom.xml b/jakarta-bom/pom.xml
new file mode 100644
index 0000000..7422c9a
--- /dev/null
+++ b/jakarta-bom/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>jakarta-bom</artifactId>
+ <packaging>pom</packaging>
+
+ <url>http://ws.apache.org/axiom/</url>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>2.1.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
diff --git a/javax-bom/pom.xml b/javax-bom/pom.xml
new file mode 100644
index 0000000..dc794f4
--- /dev/null
+++ b/javax-bom/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>javax-bom</artifactId>
+ <packaging>pom</packaging>
+
+ <url>http://ws.apache.org/axiom/</url>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
diff --git a/pom.xml b/pom.xml
index e6357f6..0791999 100644
--- a/pom.xml
+++ b/pom.xml
@@ -233,6 +233,8 @@
<module>axiom-jakarta-activation</module>
<module>axiom-javax-activation</module>
<module>axiom-legacy-attachments</module>
+ <module>javax-bom</module>
+ <module>jakarta-bom</module>
</modules>
<scm>
@@ -269,8 +271,6 @@
<asm.version>9.5</asm.version>
<errorprone.version>2.16</errorprone.version>
<junit5.version>5.9.1</junit5.version>
- <javax.activation.version>1.2.2</javax.activation.version>
- <jakarta.activation.version>2.1.2</jakarta.activation.version>
<skipDeploy>false</skipDeploy>
diff --git a/testing/xml-testsuite/pom.xml b/testing/xml-testsuite/pom.xml
index e59424a..d371eba 100644
--- a/testing/xml-testsuite/pom.xml
+++ b/testing/xml-testsuite/pom.xml
@@ -34,6 +34,17 @@
</description>
<url>http://ws.apache.org/axiom/</url>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javax-bom</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
@@ -57,7 +68,6 @@
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
- <version>${javax.activation.version}</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
