You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2019/12/12 12:50:00 UTC
[tomee] branch master updated (de82d71 -> 13e2656)
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from de82d71 Merge pull request #621 from tandraschko/master
new e445dc6 Fix packaging issue with drop-in .wars
new f5cc960 Use Tomcat 9.0.30
new 13e2656 Merge remote-tracking branch 'apache/master'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
.../tomee-microprofile-webapp/pom.xml | 99 ++++++++++++++++++++--
.../src/main/assembly/war.xml | 7 ++
tomee/tomee-plume-webapp/pom.xml | 17 ++++
tomee/tomee-plume-webapp/src/main/assembly/war.xml | 7 ++
tomee/tomee-plus-webapp/pom.xml | 17 ++++
tomee/tomee-plus-webapp/src/main/assembly/war.xml | 7 ++
7 files changed, 148 insertions(+), 8 deletions(-)
[tomee] 01/03: Fix packaging issue with drop-in .wars
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit e445dc66a0e6cc4248e04c8b582f73abedf83a42
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Mon Dec 9 19:34:47 2019 +0000
Fix packaging issue with drop-in .wars
---
.../tomee-microprofile-webapp/pom.xml | 99 ++++++++++++++++++++--
.../src/main/assembly/war.xml | 7 ++
tomee/tomee-plume-webapp/pom.xml | 17 ++++
tomee/tomee-plume-webapp/src/main/assembly/war.xml | 7 ++
tomee/tomee-plus-webapp/pom.xml | 17 ++++
tomee/tomee-plus-webapp/src/main/assembly/war.xml | 7 ++
6 files changed, 147 insertions(+), 7 deletions(-)
diff --git a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
index 63979ad..2099523 100644
--- a/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile/tomee-microprofile-webapp/pom.xml
@@ -38,18 +38,110 @@
</properties>
<dependencies>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>tomee-webapp</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-cxf-rs</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-cxf-transport</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-cxf</artifactId>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-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>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>openejb-webservices</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-webservices</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>javaee-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </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>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
<build>
@@ -76,11 +168,4 @@
</plugins>
</build>
- <repositories>
- <repository>
- <id>Geronimo OpenAPI Staging</id>
- <url>https://repository.apache.org/service/local/repositories/orgapachegeronimo-1067/content/</url>
- </repository>
- </repositories>
-
</project>
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 9c2b63f..3b5ca21 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
@@ -89,6 +89,13 @@
<include>org.codehaus.swizzle:swizzle-stream</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <scope>compile</scope>
+ <includes>
+ <include>org.apache.tomee:tomee-common</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index b2cd028..574ee81 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -170,6 +170,23 @@
<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>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
<build>
diff --git a/tomee/tomee-plume-webapp/src/main/assembly/war.xml b/tomee/tomee-plume-webapp/src/main/assembly/war.xml
index ca97890..5682da0 100644
--- a/tomee/tomee-plume-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-plume-webapp/src/main/assembly/war.xml
@@ -101,6 +101,13 @@
<include>org.codehaus.swizzle:swizzle-stream</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <scope>compile</scope>
+ <includes>
+ <include>org.apache.tomee:tomee-common</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index cdf5f3e..99219fe 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -169,6 +169,23 @@
<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>
+ <exclusion>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
<build>
diff --git a/tomee/tomee-plus-webapp/src/main/assembly/war.xml b/tomee/tomee-plus-webapp/src/main/assembly/war.xml
index a229ffb..de8cf18 100644
--- a/tomee/tomee-plus-webapp/src/main/assembly/war.xml
+++ b/tomee/tomee-plus-webapp/src/main/assembly/war.xml
@@ -96,6 +96,13 @@
<include>org.codehaus.swizzle:swizzle-stream</include>
</includes>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>WEB-INF/lib</outputDirectory>
+ <scope>compile</scope>
+ <includes>
+ <include>org.apache.tomee:tomee-common</include>
+ </includes>
+ </dependencySet>
</dependencySets>
</assembly>
[tomee] 02/03: Use Tomcat 9.0.30
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit f5cc960c72e0b4a9fa08842b704a9fe231bed8da
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Wed Dec 11 10:34:03 2019 +0000
Use Tomcat 9.0.30
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 571b04d..3cd9577 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
<version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>
- <tomcat.version>9.0.29</tomcat.version>
+ <tomcat.version>9.0.30</tomcat.version>
<cxf.version>3.3.4</cxf.version>
<ehcache.version>2.10.3</ehcache.version>
[tomee] 03/03: Merge remote-tracking branch 'apache/master'
Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 13e2656177b5819914df203ea859298fdb670cb5
Merge: f5cc960 de82d71
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Thu Dec 12 12:49:50 2019 +0000
Merge remote-tracking branch 'apache/master'
.../src/main/java/org/apache/catalina/startup/OpenEJBContextConfig.java | 2 +-
.../java/org/apache/tomee/myfaces/TomEEFacesConfigurationProvider.java | 1 +
.../apache/tomee/myfaces/TomEEFacesConfigurationProviderFactory.java | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)