You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2021/04/18 02:09:41 UTC
[tomee] 03/05: Sorted dependencies Regenerated BOMs to check
nothing was added or removed from the actual server zips
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 79c7b1284b1d1bef3bfcf102c75e1da4e0812058
Author: David Blevins <da...@gmail.com>
AuthorDate: Sat Apr 17 17:21:16 2021 -0700
Sorted dependencies
Regenerated BOMs to check nothing was added or removed from the actual server zips
---
.../tomee-microprofile-webapp/pom.xml | 41 ++++----
tomee/tomee-plume-webapp/pom.xml | 104 +++++++++------------
tomee/tomee-plus-webapp/pom.xml | 94 ++++++++-----------
3 files changed, 105 insertions(+), 134 deletions(-)
diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
index c3b076b..efe11d1 100644
--- a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
@@ -41,9 +41,8 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-webapp</artifactId>
+ <artifactId>mp-common</artifactId>
<version>${project.version}</version>
- <type>war</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -76,15 +75,13 @@
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <scope>runtime</scope>
- <!-- transitive from xerces but in test scope in parent so needed here -->
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-rest</artifactId>
<scope>runtime</scope>
@@ -108,42 +105,44 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-webservices</artifactId>
+ <artifactId>tomee-common</artifactId>
<version>${project.version}</version>
- <scope>runtime</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </exclusion>
</exclusions>
</dependency>
-
- <!-- MicroProfile -->
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>mp-common</artifactId>
+ <artifactId>tomee-webapp</artifactId>
<version>${project.version}</version>
+ <type>war</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-common</artifactId>
+ <artifactId>tomee-webservices</artifactId>
<version>${project.version}</version>
- <scope>compile</scope>
+ <scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- </exclusion>
</exclusions>
+ </dependency><!-- MicroProfile -->
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <scope>runtime</scope><!-- transitive from xerces but in test scope in parent so needed here -->
</dependency>
-
</dependencies>
-
<build>
<plugins>
<plugin>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index b261505..0bb1f60 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -40,31 +40,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-core-eclipselink</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>jakarta.faces</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tomee-webapp</artifactId>
+ <artifactId>mp-common</artifactId>
<version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jdbc-store</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-core-eclipselink</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -97,15 +79,13 @@
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <scope>runtime</scope>
- <!-- transitive from xerces but in test scope in parent so needed here -->
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-rest</artifactId>
<scope>runtime</scope>
@@ -129,61 +109,57 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-webservices</artifactId>
+ <artifactId>tomee-common</artifactId>
<version>${project.version}</version>
- <scope>runtime</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <exclusions>
<exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
</exclusion>
</exclusions>
</dependency>
-
- <!-- if i'm not mistaken we decided to remove it from our default deliveries
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-provisionning</artifactId>
+ <artifactId>tomee-webapp</artifactId>
<version>${project.version}</version>
- <scope>runtime</scope>
+ <type>war</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-ssh</artifactId>
+ <artifactId>tomee-webservices</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
- </dependency>
- -->
-
- <!-- MicroProfile -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mp-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tomee-common</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jdbc-store</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <exclusions>
<exclusion>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -197,6 +173,16 @@
<artifactId>tomcat-jasper</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>jakarta.faces</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index c89cb65..cf08fa8 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -35,23 +35,11 @@
<tomee.build.name>${project.groupId}.tomee.plus.webapp</tomee.build.name>
</properties>
<dependencies>
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-webapp</artifactId>
+ <artifactId>mp-common</artifactId>
<version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-jdbc-store</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-ra</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -87,6 +75,10 @@
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -115,27 +107,51 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>tomee-webservices</artifactId>
+ <artifactId>tomee-common</artifactId>
<version>${project.version}</version>
- <scope>runtime</scope>
+ <scope>compile</scope>
<exclusions>
<exclusion>
<groupId>${project.groupId}</groupId>
<artifactId>javaee-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-webapp</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-webservices</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
<exclusions>
<exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-broker</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jdbc-store</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-ra</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.batchee</groupId>
<artifactId>batchee-jbatch</artifactId>
<version>${batchee.version}</version>
@@ -147,47 +163,17 @@
<version>${jcs.version}</version>
<scope>runtime</scope>
</dependency>
-
- <!-- if i'm not mistaken we decided to remove it from our default deliveries
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>openejb-provisionning</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>openejb-ssh</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- -->
-
- <!-- MicroProfile -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>mp-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>tomee-common</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
<exclusions>
<exclusion>
- <groupId>${project.groupId}</groupId>
- <artifactId>javaee-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
-
</dependencies>
-
<build>
<plugins>
<plugin>