Yank jaxb-runtime module, set tomee-patch-plugin to 0.5
diff --git a/boms/jaxb-runtime/pom.xml b/boms/jaxb-runtime/pom.xml
deleted file mode 100644
index 180bfd6..0000000
--- a/boms/jaxb-runtime/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>boms</artifactId>
- <version>9.0.0-M7-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jaxb-runtime</artifactId>
- <packaging>pom</packaging>
- <name>TomEE :: BOMs :: JAXB Runtime</name>
-
- <!-- For easy copy paste
- <dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${project.version}</version>
- </dependency>
- -->
-
- <dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.2</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>2.3.2</version>
- <exclusions>
- <exclusion> <!-- Is already included in java-ee-api -->
- <artifactId>jakarta.activation</artifactId>
- <groupId>jakarta.activation-api</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>1.2.1</version>
- </dependency>
- </dependencies>
-
-</project>
-
diff --git a/boms/pom.xml b/boms/pom.xml
deleted file mode 100644
index cfecf77..0000000
--- a/boms/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <artifactId>tomee-project</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>9.0.0-M7-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>boms</artifactId>
- <packaging>pom</packaging>
- <name>TomEE :: BOMs</name>
-
- <modules>
- <module>jaxb-runtime</module>
- </modules>
-
-</project>
-
diff --git a/pom.xml b/pom.xml
index 8b0131d..ab97516 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,6 @@
<modules>
<module>jakartaee-api</module>
- <module>boms</module>
<module>tomee</module>
<module>transform</module>
</modules>
@@ -138,11 +137,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.tomee.bom</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <version>${tomee.version}</version>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
<version>${version.javaee-api}</version>
@@ -1333,6 +1327,10 @@
<pluginRepositories>
<pluginRepository>
+ <id>staging-tomee-patch-plugin</id>
+ <url>https://repository.apache.org/content/repositories/orgapachetomee-1183</url>
+ </pluginRepository>
+ <pluginRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<layout>default</layout>
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index b7a73bc..8735377 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -311,10 +311,25 @@
<version>${version.javaee-api}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee.bom</groupId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
- <version>${tomee.version}</version>
- <type>pom</type>
+ <version>2.3.2</version>
+ <exclusions>
+ <exclusion> <!-- Is already included in java-ee-api -->
+ <artifactId>jakarta.activation</artifactId>
+ <groupId>jakarta.activation-api</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -547,7 +562,7 @@
<plugin>
<groupId>org.apache.tomee.patch</groupId>
<artifactId>tomee-patch-plugin</artifactId>
- <version>0.4</version>
+ <version>0.5</version>
<configuration>
<select>apache-tomee-(plus|plume|webprofile|microprofile).*\.zip</select>
<skipTransform>true</skipTransform>
@@ -720,7 +735,7 @@
<plugin>
<groupId>org.apache.tomee.patch</groupId>
<artifactId>tomee-patch-plugin</artifactId>
- <version>0.4</version>
+ <version>0.5</version>
<configuration>
<select>apache-tomee-(plus|plume|webprofile|microprofile).*\.zip</select>
<skipTransform>true</skipTransform>
diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml
index 6a4eb32..dd501dd 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -38,7 +38,27 @@
</properties>
<dependencies>
-
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.2</version>
+ <exclusions>
+ <exclusion> <!-- Is already included in java-ee-api -->
+ <artifactId>jakarta.activation</artifactId>
+ <groupId>jakarta.activation-api</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>1.2.1</version>
+ </dependency>
<dependency><!-- needed by myfaces -->
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
@@ -464,7 +484,7 @@
<plugin>
<groupId>org.apache.tomee.patch</groupId>
<artifactId>tomee-patch-plugin</artifactId>
- <version>0.4</version>
+ <version>0.5</version>
<configuration>
<select>tomee-microprofile-webapp-transformed-.*\.war</select>
<patchSources>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 3238b1d..3545f9e 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -37,7 +37,27 @@
<tomee.build.name>${project.groupId}.tomee.plume.webapp</tomee.build.name>
</properties>
<dependencies>
-
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.2</version>
+ <exclusions>
+ <exclusion> <!-- Is already included in java-ee-api -->
+ <artifactId>jakarta.activation</artifactId>
+ <groupId>jakarta.activation-api</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>1.2.1</version>
+ </dependency>
<dependency>
<groupId>org.apache.bval</groupId>
<artifactId>bval-jsr</artifactId>
@@ -520,7 +540,7 @@
<plugin>
<groupId>org.apache.tomee.patch</groupId>
<artifactId>tomee-patch-plugin</artifactId>
- <version>0.4</version>
+ <version>0.5</version>
<configuration>
<select>tomee-plume-webapp-transformed-.*\.war</select>
<patchSources>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 0f7cb85..b884867 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -35,7 +35,27 @@
<tomee.build.name>${project.groupId}.tomee.plus.webapp</tomee.build.name>
</properties>
<dependencies>
-
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.2</version>
+ <exclusions>
+ <exclusion> <!-- Is already included in java-ee-api -->
+ <artifactId>jakarta.activation</artifactId>
+ <groupId>jakarta.activation-api</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>1.2.1</version>
+ </dependency>
<dependency><!-- needed by myfaces -->
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
@@ -494,7 +514,7 @@
<plugin>
<groupId>org.apache.tomee.patch</groupId>
<artifactId>tomee-patch-plugin</artifactId>
- <version>0.4</version>
+ <version>0.5</version>
<configuration>
<select>tomee-plus-webapp-transformed-.*\.war</select>
<patchSources>
diff --git a/tomee/tomee-webprofile-webapp/pom.xml b/tomee/tomee-webprofile-webapp/pom.xml
index 781df71..ea3212b 100644
--- a/tomee/tomee-webprofile-webapp/pom.xml
+++ b/tomee/tomee-webprofile-webapp/pom.xml
@@ -171,7 +171,7 @@
<plugin>
<groupId>org.apache.tomee.patch</groupId>
<artifactId>tomee-patch-plugin</artifactId>
- <version>0.4</version>
+ <version>0.5</version>
<configuration>
<select>tomee-webprofile-webapp-transformed-.*\.war</select>
<patchSources>
@@ -216,6 +216,27 @@
</build>
<dependencies>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>2.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.3.2</version>
+ <exclusions>
+ <exclusion> <!-- Is already included in java-ee-api -->
+ <artifactId>jakarta.activation</artifactId>
+ <groupId>jakarta.activation-api</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>3.2</version>
