You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2016/05/16 13:15:50 UTC
tomee git commit: TOMEE-1754 TOMEE-1809 tomcat 8.5.2 and tomee
embedded jaxws shade
Repository: tomee
Updated Branches:
refs/heads/master 22cae6ba7 -> b6cf7dee4
TOMEE-1754 TOMEE-1809 tomcat 8.5.2 and tomee embedded jaxws shade
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b6cf7dee
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b6cf7dee
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b6cf7dee
Branch: refs/heads/master
Commit: b6cf7dee46b808869908ee512e9f865f3f015453
Parents: 22cae6b
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Mon May 16 15:15:02 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Mon May 16 15:15:02 2016 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
.../tomee/catalina/TomEEWebappClassLoader.java | 2 +-
tomee/tomee-embedded/pom.xml | 76 ++++++++++++++++++++
3 files changed, 78 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/b6cf7dee/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 85b57db..c55351b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
<version.shrinkwrap.descriptor>2.0.0-alpha-7</version.shrinkwrap.descriptor>
<version.shrinkwrap.shrinkwrap>1.2.2</version.shrinkwrap.shrinkwrap>
- <tomcat.version>8.5.0</tomcat.version>
+ <tomcat.version>8.5.2</tomcat.version>
<cxf.version>3.1.6</cxf.version>
<ehcache.version>2.9.0</ehcache.version>
http://git-wip-us.apache.org/repos/asf/tomee/blob/b6cf7dee/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
index 3c184a4..aee4bf7 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomEEWebappClassLoader.java
@@ -415,7 +415,7 @@ public class TomEEWebappClassLoader extends ParallelWebappClassLoader {
try {
return super.getResourceAsStream(name);
} catch (final NullPointerException npe) {
- // workaround cause of a bug in tomcat 8.5.0
+ // workaround cause of a bug in tomcat 8.5.0, keeping it even if we upgraded until we don't support 8.5.0 anymore
final URL url = super.getResource(name);
if (url != null) {
try {
http://git-wip-us.apache.org/repos/asf/tomee/blob/b6cf7dee/tomee/tomee-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml
index 5f43b5d..1575930 100644
--- a/tomee/tomee-embedded/pom.xml
+++ b/tomee/tomee-embedded/pom.xml
@@ -90,6 +90,72 @@
<exclude>org.apache.activemq.protobuf:*</exclude>
<exclude>org.fusesource.hawtbuf:hawtbuf</exclude>
<exclude>org.apache.myfaces.core:*</exclude>
+ <!-- jaxws -->
+ <exclude>joda-time:joda-time</exclude>
+ <exclude> commons-codec:commons-codec</exclude>
+ <exclude>${project.groupId}:tomee-webservices</exclude>
+ <exclude>${project.groupId}:openejb-webservices</exclude>
+ <exclude>${project.groupId}:openejb-cxf</exclude>
+ <exclude>org.apache.wss4j:*</exclude>
+ <exclude>org.apache.santuario:xmlsec</exclude>
+ <exclude>org.opensaml:*</exclude>
+ <exclude>org.jasypt:*</exclude>
+ <exclude>net.shibboleth.utilities:java-support</exclude>
+ <exclude>org.cryptacular:cryptacular</exclude>
+ <exclude>org.bouncycastle:bcprov-jdk15on</exclude>
+ <exclude>org.apache.neethi:neethi</exclude>
+ <exclude>org.apache.cxf:cxf-rt-frontend-jaxws</exclude>
+ <exclude>org.apache.cxf:cxf-rt-bindings-soap</exclude>
+ <exclude>org.apache.cxf:cxf-rt-bindings-xml</exclude>
+ <exclude>org.apache.cxf:cxf-rt-frontend-simple</exclude>
+ <exclude>org.apache.cxf:cxf-rt-wsdl</exclude>
+ <exclude>org.apache.cxf:cxf-rt-databinding-jaxb</exclude>
+ <exclude>org.apache.cxf:cxf-rt-ws-addr</exclude>
+ <exclude>org.apache.cxf:cxf-rt-ws-security</exclude>
+ <exclude>org.apache.cxf:cxf-rt-ws-policy</exclude>
+ <exclude>org.apache.cxf:cxf-rt-security-saml</exclude>
+ <exclude>org.apache.ws.xmlschema:xmlschema-core</exclude>
+ <exclude>xml-resolver:xml-resolver</exclude>
+ <exclude>com.sun.xml.messaging.saaj:saaj-impl</exclude>
+ <exclude>org.jvnet.mimepull:mimepull</exclude>
+ <exclude>wsdl4j:wsdl4j</exclude>
+ </excludes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ <execution> <!-- kind of webprofile plus JAX-WS minus JSF -->
+ <id>jaxws-shade</id>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <shadedClassifierName>jaxws</shadedClassifierName>
+ <artifactSet>
+ <excludes>
+ <exclude>junit:junit</exclude>
+ <exclude>*:jaxb-api</exclude>
+ <exclude>*:jaxb-impl</exclude>
+ <exclude>org.apache.activemq:*</exclude>
+ <exclude>org.apache.activemq.protobuf:*</exclude>
+ <exclude>org.fusesource.hawtbuf:hawtbuf</exclude>
+ <exclude>org.apache.myfaces.core:*</exclude>
+ <!-- jaxrs -->
+ <exclude>${project.groupId}:tomee-jaxrs</exclude>
+ <exclude>${project.groupId}:openejb-rest</exclude>
+ <exclude>${project.groupId}:openejb-cxf-rs</exclude>
+ <exclude>org.apache.cxf:cxf-rt-rs-service-description</exclude>
+ <exclude>org.apache.cxf:cxf-rt-rs-client</exclude>
+ <exclude>org.apache.cxf:cxf-rt-frontend-jaxrs</exclude>
+ <exclude>org.apache.cxf:cxf-rt-rs-extension-search</exclude>
+ <exclude>org.apache.cxf:cxf-rt-rs-json-basic</exclude>
+ <exclude>org.apache.cxf:cxf-rt-rs-security-cors</exclude>
+ <exclude>org.apache.cxf:cxf-rt-rs-security-oauth2</exclude>
+ <exclude>org.apache.cxf:cxf-rt-rs-security-jose-jaxrs</exclude>
+ <exclude>org.apache.cxf:cxf-rt-rs-security-jose</exclude>
+ <exclude>org.apache.cxf:cxf-rt-rs-extension-providers</exclude>
+ <exclude>org.apache.johnzon:johnzon-jaxrs</exclude>
+ <exclude>org.apache.johnzon:johnzon-mapper</exclude>
</excludes>
</artifactSet>
</configuration>
@@ -124,6 +190,11 @@
Solution would be to handle it more deeply in our myfaces integration
-->
<exclude>META-INF/faces-config.xml</exclude>
+
+ <!-- to avoid to not be able to run the shade -->
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
@@ -327,6 +398,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>tomee-webservices</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-websocket</artifactId>
<version>${tomcat.version}</version>