You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2024/03/31 08:19:13 UTC
(tomee) 01/02: AMQ6 Fileupload 2 Drop related shades
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch amq6
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a67b57bcc5a6296adc9bede25e62357bf118c2e1
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Sun Mar 31 10:10:58 2024 +0200
AMQ6
Fileupload 2
Drop related shades
---
arquillian/arquillian-tomee-tests/pom.xml | 8 +-
boms/tomee-plume/pom.xml | 98 ++++++---------
boms/tomee-plus/pom.xml | 101 +---------------
container/openejb-core/pom.xml | 8 +-
deps/activemq-broker-shade/pom.xml | 125 -------------------
deps/activemq-kahadb-store-shade/pom.xml | 131 --------------------
deps/activemq-ra-shade/pom.xml | 134 ---------------------
deps/commons-fileupload-shade/pom.xml | 109 -----------------
deps/pom.xml | 4 -
examples/client-resource-lookup-preview/pom.xml | 6 +-
itests/openejb-itests-client/pom.xml | 4 +-
pom.xml | 58 +++------
server/openejb-activemq/pom.xml | 4 +-
server/openejb-http/pom.xml | 10 +-
.../server/httpd/part/CommonsFileUploadPart.java | 12 +-
.../httpd/part/CommonsFileUploadPartFactory.java | 25 ++--
tck/cdi-embedded/pom.xml | 8 +-
.../src/main/assembly/war.xml | 4 -
tomee/tomee-plume-webapp/pom.xml | 8 +-
tomee/tomee-plume-webapp/src/main/assembly/war.xml | 4 -
tomee/tomee-plus-webapp/pom.xml | 8 +-
tomee/tomee-plus-webapp/src/main/assembly/war.xml | 4 -
tomee/tomee-webapp/src/main/assembly/war.xml | 4 -
23 files changed, 111 insertions(+), 766 deletions(-)
diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml
index 56139bdcf7..fc7d983341 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -122,12 +122,12 @@
<!-- ActiveMQ is optional in openejb-core -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-broker-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
diff --git a/boms/tomee-plume/pom.xml b/boms/tomee-plume/pom.xml
index 72ee26a1a5..651f82de18 100644
--- a/boms/tomee-plume/pom.xml
+++ b/boms/tomee-plume/pom.xml
@@ -188,17 +188,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>3.8.0</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>io.churchkey</groupId>
<artifactId>churchkey</artifactId>
@@ -486,9 +475,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
+ <groupId>net.shibboleth.utilities</groupId>
+ <artifactId>java-support</artifactId>
+ <version>8.4.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -497,9 +486,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.1</version>
+ <groupId>org.apache.activemq.protobuf</groupId>
+ <artifactId>activemq-protobuf</artifactId>
+ <version>1.1</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -508,9 +497,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <version>8.4.0</version>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <version>6.1.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -519,9 +508,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <version>1.1</version>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-client</artifactId>
+ <version>6.1.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -531,8 +520,8 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client-jakarta</artifactId>
- <version>5.18.3</version>
+ <artifactId>activemq-jdbc-store</artifactId>
+ <version>6.1.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -542,8 +531,30 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jdbc-store</artifactId>
- <version>5.18.3</version>
+ <artifactId>activemq-kahadb-store</artifactId>
+ <version>6.1.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-openwire-legacy</artifactId>
+ <version>6.1.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>*</artifactId>
+ <groupId>*</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <version>6.1.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1300,39 +1311,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-broker-shade</artifactId>
- <version>10.0.0-M1-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-kahadb-store-shade</artifactId>
- <version>10.0.0-M1-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-ra-shade</artifactId>
- <version>10.0.0-M1-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>commons-dbcp2-shade</artifactId>
diff --git a/boms/tomee-plus/pom.xml b/boms/tomee-plus/pom.xml
index cf1c493345..fdb9897392 100644
--- a/boms/tomee-plus/pom.xml
+++ b/boms/tomee-plus/pom.xml
@@ -188,17 +188,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>3.8.0</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>io.churchkey</groupId>
<artifactId>churchkey</artifactId>
@@ -485,28 +474,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>javax.activation-api</artifactId>
- <version>1.2.0</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.1</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>net.shibboleth.utilities</groupId>
<artifactId>java-support</artifactId>
@@ -518,32 +485,10 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client-jakarta</artifactId>
- <version>5.18.3</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-jdbc-store</artifactId>
- <version>5.18.3</version>
+ <version>6.1.0</version>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -1322,39 +1267,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-broker-shade</artifactId>
- <version>10.0.0-M1-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-kahadb-store-shade</artifactId>
- <version>10.0.0-M1-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-ra-shade</artifactId>
- <version>10.0.0-M1-SNAPSHOT</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>commons-dbcp2-shade</artifactId>
@@ -2125,17 +2037,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.fusesource.hawtbuf</groupId>
- <artifactId>hawtbuf</artifactId>
- <version>1.11</version>
- <exclusions>
- <exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 614ac4cc04..6e04f81a36 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -512,13 +512,13 @@
<!-- ActiveMQ -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
<optional>true</optional>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-broker-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
<optional>true</optional>
</dependency>
<dependency>
diff --git a/deps/activemq-broker-shade/pom.xml b/deps/activemq-broker-shade/pom.xml
deleted file mode 100644
index 6658239cbd..0000000000
--- a/deps/activemq-broker-shade/pom.xml
+++ /dev/null
@@ -1,125 +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.
--->
-<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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>10.0.0-M1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>activemq-broker-shade</artifactId>
- <name>TomEE :: Deps :: Apache ActiveMQ Broker shade</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- <version>${version.activemq}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client-jakarta</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes>
- <include>org.apache.activemq:activemq-broker</include> <!-- only this dep to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.annotation</pattern>
- <shadedPattern>jakarta.annotation</shadedPattern>
- <excludes>
- <exclude>javax.annotation.processing.**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Purpose of build-helper-maven-plugin is to ensure that IntelliJ sees shaded classes.
- When navigating over to java classes in importing modules, the shaded imported classes will
- show as resolved instead of unknown.
- The artifact specified below is created when this module is built but is also used to resolve classes in IntelliJ.
- "phase" is set to "none" - with this setting, the artifact jar will not be uploaded to repo
- when running standalone "mvn install" command.
-
- build-helper-maven-plugin can be removed completely with no effect on the "mvn clean" and "mvn install",
- which is handled by maven-shade-plugin.
- -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.4.0</version>
- <executions>
- <execution>
- <id>workaround-makeItVisibleOnIntellij</id>
- <phase>none</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/activemq-broker-shade-10.0.0-M1-SNAPSHOT.jar</file>
- <type>jar</type>
- <classifier>optional</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/deps/activemq-kahadb-store-shade/pom.xml b/deps/activemq-kahadb-store-shade/pom.xml
deleted file mode 100644
index 4f5f3896fc..0000000000
--- a/deps/activemq-kahadb-store-shade/pom.xml
+++ /dev/null
@@ -1,131 +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.
--->
-<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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>10.0.0-M1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>activemq-kahadb-store-shade</artifactId>
- <name>TomEE :: Deps :: Apache ActiveMQ KahaDB Store shade</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kahadb-store</artifactId>
- <version>${version.activemq}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-broker-shade</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq.protobuf</groupId>
- <artifactId>activemq-protobuf</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes>
- <include>org.apache.activemq:activemq-kahadb-store</include> <!-- only this dep to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Purpose of build-helper-maven-plugin is to ensure that IntelliJ sees shaded classes.
- When navigating over to java classes in importing modules, the shaded imported classes will
- show as resolved instead of unknown.
- The artifact specified below is created when this module is built but is also used to resolve classes in IntelliJ.
- "phase" is set to "none" - with this setting, the artifact jar will not be uploaded to repo
- when running standalone "mvn install" command.
-
- build-helper-maven-plugin can be removed completely with no effect on the "mvn clean" and "mvn install",
- which is handled by maven-shade-plugin.
- -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.4.0</version>
- <executions>
- <execution>
- <id>workaround-makeItVisibleOnIntellij</id>
- <phase>none</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/activemq-kahadb-store-shade-10.0.0-M1-SNAPSHOT.jar</file>
- <type>jar</type>
- <classifier>optional</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/deps/activemq-ra-shade/pom.xml b/deps/activemq-ra-shade/pom.xml
deleted file mode 100644
index 3df5169d07..0000000000
--- a/deps/activemq-ra-shade/pom.xml
+++ /dev/null
@@ -1,134 +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.
--->
-<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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>10.0.0-M1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>activemq-ra-shade</artifactId>
- <name>TomEE :: Deps :: Apache ActiveMQ RA shade</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- <version>${version.activemq}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kahadb-store</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-broker-shade</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-kahadb-store-shade</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes>
- <include>org.apache.activemq:activemq-ra</include> <!-- only this dep to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.jms</pattern>
- <shadedPattern>jakarta.jms</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax.resource</pattern>
- <shadedPattern>jakarta.resource</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <!--
- Purpose of build-helper-maven-plugin is to ensure that IntelliJ sees shaded classes.
- When navigating over to java classes in importing modules, the shaded imported classes will
- show as resolved instead of unknown.
- The artifact specified below is created when this module is built but is also used to resolve classes in IntelliJ.
- "phase" is set to "none" - with this setting, the artifact jar will not be uploaded to repo
- when running standalone "mvn install" command.
-
- build-helper-maven-plugin can be removed completely with no effect on the "mvn clean" and "mvn install",
- which is handled by maven-shade-plugin.
- -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.4.0</version>
- <executions>
- <execution>
- <id>workaround-makeItVisibleOnIntellij</id>
- <phase>none</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/activemq-ra-shade-10.0.0-M1-SNAPSHOT.jar</file>
- <type>jar</type>
- <classifier>optional</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/deps/commons-fileupload-shade/pom.xml b/deps/commons-fileupload-shade/pom.xml
deleted file mode 100644
index 768ebc9dbc..0000000000
--- a/deps/commons-fileupload-shade/pom.xml
+++ /dev/null
@@ -1,109 +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.
--->
-<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/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>deps</artifactId>
- <groupId>org.apache.tomee</groupId>
- <version>10.0.0-M1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>commons-fileupload-shade</artifactId>
- <name>TomEE :: Deps :: Apache Commons FileUpload shade</name>
-
- <dependencies>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>${version.commons-fileupload}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>3.2.4</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <createSourcesJar>true</createSourcesJar>
- <useBaseVersion>true</useBaseVersion>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <includes>
- <include>commons-fileupload:commons-fileupload</include> <!-- only this dep to make sure we don't add other things -->
- </includes>
- </artifactSet>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- </transformers>
- <relocations>
- <relocation>
- <pattern>javax.servlet</pattern>
- <shadedPattern>jakarta.servlet</shadedPattern>
- </relocation>
- </relocations>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <!--
- Purpose of build-helper-maven-plugin is to ensure that IntelliJ sees shaded classes.
- When navigating over to java classes in importing modules, the shaded imported classes will
- show as resolved instead of unknown.
- The artifact specified below is created when this module is built but is also used to resolve classes in IntelliJ.
- "phase" is set to "none" - with this setting, the artifact jar will not be uploaded to repo
- when running standalone "mvn install" command.
-
- build-helper-maven-plugin can be removed completely with no effect on the "mvn clean" and "mvn install",
- which is handled by maven-shade-plugin.
- -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>3.4.0</version>
- <executions>
- <execution>
- <id>workaround-makeItVisibleOnIntellij</id>
- <phase>none</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/commons-fileupload-shade-10.0.0-M1-SNAPSHOT.jar</file>
- <type>jar</type>
- <classifier>optional</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/deps/pom.xml b/deps/pom.xml
index 1e5a3b56df..8cd1acd172 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -30,11 +30,7 @@
<modules>
<module>taglibs-shade</module>
<module>sxc-shade</module>
- <module>activemq-broker-shade</module>
- <module>activemq-kahadb-store-shade</module>
- <module>activemq-ra-shade</module>
<module>commons-dbcp2-shade</module>
- <module>commons-fileupload-shade</module>
<module>servicemix-bcel-shade</module>
</modules>
<build>
diff --git a/examples/client-resource-lookup-preview/pom.xml b/examples/client-resource-lookup-preview/pom.xml
index 7d478f7e50..7f87d3a408 100644
--- a/examples/client-resource-lookup-preview/pom.xml
+++ b/examples/client-resource-lookup-preview/pom.xml
@@ -67,9 +67,9 @@
<version>10.0.0-M1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
- <artifactId>activemq-broker-shade</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <version>6.1.0</version>
<scope>runtime</scope>
</dependency>
<!-- test deps -->
diff --git a/itests/openejb-itests-client/pom.xml b/itests/openejb-itests-client/pom.xml
index acffb02920..c56f5d00b5 100644
--- a/itests/openejb-itests-client/pom.xml
+++ b/itests/openejb-itests-client/pom.xml
@@ -99,8 +99,8 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index 7163c56a2c..dfdf45b3e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,12 +162,14 @@
<version.commons-collections>3.2.2</version.commons-collections>
<version.commons-dbcp2>2.11.0</version.commons-dbcp2>
<version.commons-discovery>0.5</version.commons-discovery>
- <version.commons-fileupload>1.5</version.commons-fileupload>
<version.commons-io>2.15.0</version.commons-io>
<version.commons-jcs-cache>2.1</version.commons-jcs-cache>
<version.commons-lang3>3.13.0</version.commons-lang3>
<version.commons-net>3.8.0</version.commons-net>
<version.commons-pool>2.12.0</version.commons-pool>
+ <version.commons-fileupload>2.0.0-M2</version.commons-fileupload>
+ <version.commons-fileupload-servlet>2.0.0-M1</version.commons-fileupload-servlet>
+
<!-- Java SE version -->
<maven.compiler.source>11</maven.compiler.source>
@@ -208,7 +210,7 @@
<!-- com.sun -->
<version.impl.saaj>2.0.1</version.impl.saaj>
<!-- org.apache -->
- <version.activemq>5.18.3</version.activemq>
+ <version.activemq>6.1.0</version.activemq>
<!-- downgrade to avoid a henn egg issue with batchee -->
<version.batchee>1.0.4</version.batchee>
<version.bval>3.0.0</version.bval>
@@ -1410,15 +1412,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ <version>${version.activemq}</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
@@ -1427,34 +1423,13 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
- <artifactId>activemq-client-jakarta</artifactId>
+ <artifactId>activemq-client</artifactId>
<version>${version.activemq}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-kahadb-store-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-kahadb-store</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-broker-shade</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.jms</groupId>
- <artifactId>jakarta.jms-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ <version>${version.activemq}</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -1781,9 +1756,14 @@
<version>${version.commons-codec}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>commons-fileupload-shade</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta</artifactId>
+ <version>${version.commons-fileupload-servlet}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-core</artifactId>
+ <version>${version.commons-fileupload}</version>
</dependency>
<dependency>
<groupId>regexp</groupId>
diff --git a/server/openejb-activemq/pom.xml b/server/openejb-activemq/pom.xml
index 1bb51eec08..0c785600d7 100644
--- a/server/openejb-activemq/pom.xml
+++ b/server/openejb-activemq/pom.xml
@@ -38,8 +38,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/server/openejb-http/pom.xml b/server/openejb-http/pom.xml
index 22827f2807..1fefa4294d 100644
--- a/server/openejb-http/pom.xml
+++ b/server/openejb-http/pom.xml
@@ -164,9 +164,13 @@
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>commons-fileupload-shade</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-core</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/part/CommonsFileUploadPart.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/part/CommonsFileUploadPart.java
index 93ea7367c6..55336ca5d7 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/part/CommonsFileUploadPart.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/part/CommonsFileUploadPart.java
@@ -16,14 +16,16 @@
*/
package org.apache.openejb.server.httpd.part;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.disk.DiskFileItem;
import jakarta.servlet.http.Part;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.core.DiskFileItem;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
@@ -100,14 +102,14 @@ public class CommonsFileUploadPart implements Part {
file = new File(location, fileName);
}
try {
- fileItem.write(file);
+ fileItem.write(file.toPath());
} catch (Exception e) {
throw new IOException(e);
}
}
- public String getString(final String encoding) throws UnsupportedEncodingException {
- return fileItem.getString(encoding);
+ public String getString(final String encoding) throws IOException {
+ return fileItem.getString(Charset.forName(encoding));
}
@Override
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/part/CommonsFileUploadPartFactory.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/part/CommonsFileUploadPartFactory.java
index 6585f1518a..35abad6ed2 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/part/CommonsFileUploadPartFactory.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/part/CommonsFileUploadPartFactory.java
@@ -16,18 +16,18 @@
*/
package org.apache.openejb.server.httpd.part;
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.fileupload.servlet.ServletRequestContext;
+import org.apache.commons.fileupload2.core.FileItem;
+import org.apache.commons.fileupload2.core.FileUploadException;
+import org.apache.commons.fileupload2.core.DiskFileItemFactory;
+import org.apache.commons.fileupload2.jakarta.JakartaServletFileUpload;
+import org.apache.commons.fileupload2.jakarta.JakartaServletRequestContext;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.server.httpd.HttpRequestImpl;
import jakarta.servlet.http.Part;
import java.io.File;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -62,15 +62,14 @@ public final class CommonsFileUploadPartFactory {
public static Collection<Part> read(final HttpRequestImpl request) { // mainly for testing
// Create a new file upload handler
- final DiskFileItemFactory factory = new DiskFileItemFactory();
- factory.setRepository(REPO);
+ final DiskFileItemFactory factory = DiskFileItemFactory.builder().setPath(REPO.toPath()).get();
- final ServletFileUpload upload = new ServletFileUpload();
+ final JakartaServletFileUpload upload = new JakartaServletFileUpload();
upload.setFileItemFactory(factory);
final List<Part> parts = new ArrayList<>();
try {
- final List<FileItem> items = upload.parseRequest(new ServletRequestContext(request));
+ final List<FileItem> items = upload.parseRequest(new JakartaServletRequestContext(request));
final String enc = request.getCharacterEncoding();
for (final FileItem item : items) {
final CommonsFileUploadPart part = new CommonsFileUploadPart(item, null);
@@ -88,10 +87,10 @@ public final class CommonsFileUploadPartFactory {
}
}
value = part.getString(encoding);
- } catch (final UnsupportedEncodingException uee) {
+ } catch (final IOException uee) {
try {
- value = part.getString("UTF-8");
- } catch (final UnsupportedEncodingException e) {
+ value = part.getString(String.valueOf(StandardCharsets.UTF_8));
+ } catch (final IOException e) {
// not possible
}
}
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index 94e33d59bf..b30717c7aa 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -230,13 +230,13 @@
</dependency>
<!-- ActiveMQ is optional in openejb-core (embedded needs openejb-core + all deps)-->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-broker-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/war.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/war.xml
index 8a8feef5b1..981df2726e 100644
--- a/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/src/main/assembly/war.xml
@@ -87,11 +87,7 @@
it picks up transitive dependencies from shaded libraries
-->
<!-- exclude shaded artifacts because they are under our own groupId -->
- <exclude>org.apache.activemq:activemq-broker</exclude>
- <exclude>org.apache.activemq:activemq-kahadb-store</exclude>
- <exclude>org.apache.activemq:activemq-ra</exclude>
<exclude>org.apache.commons.dbcp2:*</exclude>
- <exclude>commons-fileupload:*</exclude>
<exclude>org.metatype.sxc:*</exclude>
<exclude>org.apache.taglibs:*</exclude>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index a29d37b667..be2f412305 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -327,8 +327,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-broker-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -341,8 +341,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
</dependency>
<dependency>
<groupId>org.apache.batchee</groupId>
diff --git a/tomee/tomee-plume-webapp/src/main/assembly/war.xml b/tomee/tomee-plume-webapp/src/main/assembly/war.xml
index 9106bd3084..b67de69338 100644
--- a/tomee/tomee-plume-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-plume-webapp/src/main/assembly/war.xml
@@ -106,11 +106,7 @@
it picks up transitive dependencies from shaded libraries
-->
<!-- exclude shaded artifacts because they are under our own groupId -->
- <exclude>org.apache.activemq:activemq-broker</exclude>
- <exclude>org.apache.activemq:activemq-kahadb-store</exclude>
- <exclude>org.apache.activemq:activemq-ra</exclude>
<exclude>org.apache.commons.dbcp2:*</exclude>
- <exclude>commons-fileupload:*</exclude>
<exclude>org.metatype.sxc:*</exclude>
<exclude>org.apache.taglibs:*</exclude>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 40521678d9..9c7edaf722 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -327,8 +327,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-broker-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -341,8 +341,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>activemq-ra-shade</artifactId>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
</dependency>
<dependency>
<groupId>org.apache.batchee</groupId>
diff --git a/tomee/tomee-plus-webapp/src/main/assembly/war.xml b/tomee/tomee-plus-webapp/src/main/assembly/war.xml
index 40ae4fe9cb..86dbfbd4ec 100644
--- a/tomee/tomee-plus-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-plus-webapp/src/main/assembly/war.xml
@@ -100,11 +100,7 @@
it picks up transitive dependencies from shaded libraries
-->
<!-- exclude shaded artifacts because they are under our own groupId -->
- <exclude>org.apache.activemq:activemq-broker</exclude>
- <exclude>org.apache.activemq:activemq-kahadb-store</exclude>
- <exclude>org.apache.activemq:activemq-ra</exclude>
<exclude>org.apache.commons.dbcp2:*</exclude>
- <exclude>commons-fileupload:*</exclude>
<exclude>org.metatype.sxc:*</exclude>
<exclude>org.apache.taglibs:*</exclude>
diff --git a/tomee/tomee-webapp/src/main/assembly/war.xml b/tomee/tomee-webapp/src/main/assembly/war.xml
index 2ddf1e4df9..c4e8936e17 100644
--- a/tomee/tomee-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-webapp/src/main/assembly/war.xml
@@ -110,11 +110,7 @@
it picks up transitive dependencies from shaded libraries
-->
<!-- exclude shaded artifacts because they are under our own groupId -->
- <exclude>org.apache.activemq:activemq-broker</exclude>
- <exclude>org.apache.activemq:activemq-kahadb-store</exclude>
- <exclude>org.apache.activemq:activemq-ra</exclude>
<exclude>org.apache.commons.dbcp2:*</exclude>
- <exclude>commons-fileupload:*</exclude>
<exclude>org.metatype.sxc:*</exclude>
<exclude>org.apache.taglibs:*</exclude>