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/09/29 19:41:08 UTC
[1/2] tomee git commit: few more library exclude for shades +
allowing to exclude only some classes too
Repository: tomee
Updated Branches:
refs/heads/master 0abf01b66 -> 4d3b3fb71
few more library exclude for shades + allowing to exclude only some classes too
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8b40e93e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8b40e93e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8b40e93e
Branch: refs/heads/master
Commit: 8b40e93ecd5d4bae2a773927064a837e846ee4c4
Parents: 0abf01b
Author: rmannibucau <rm...@apache.org>
Authored: Thu Sep 29 21:40:15 2016 +0200
Committer: rmannibucau <rm...@apache.org>
Committed: Thu Sep 29 21:40:15 2016 +0200
----------------------------------------------------------------------
.../org/apache/openejb/config/ContainerClassesFilterTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/8b40e93e/container/openejb-core/src/test/java/org/apache/openejb/config/ContainerClassesFilterTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/config/ContainerClassesFilterTest.java b/container/openejb-core/src/test/java/org/apache/openejb/config/ContainerClassesFilterTest.java
index 9adad42..a5a0b89 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/config/ContainerClassesFilterTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/config/ContainerClassesFilterTest.java
@@ -34,6 +34,7 @@ public class ContainerClassesFilterTest {
assertFalse(filter.accept("org.apache.openejb.Bar"));
assertFalse(filter.accept("org.apache.openejb.foo.Bar"));
assertFalse(filter.accept("org.jasypt.dfzg.Bar"));
- assertFalse(filter.accept("org.apache.commons.dbcp2.AbandonedTrace"));
+ assertFalse(filter.accept("org.codehaus.swizzle.Grep"));
+ assertTrue(filter.accept("org.codehaus.swizzle.Gre"));
}
}
[2/2] tomee git commit: few more library exclude for shades +
allowing to exclude only some classes too
Posted by rm...@apache.org.
few more library exclude for shades + allowing to exclude only some classes too
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4d3b3fb7
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4d3b3fb7
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4d3b3fb7
Branch: refs/heads/master
Commit: 4d3b3fb7169be42b145252e9aed96dc6d7ca59e9
Parents: 8b40e93
Author: rmannibucau <rm...@apache.org>
Authored: Thu Sep 29 21:40:42 2016 +0200
Committer: rmannibucau <rm...@apache.org>
Committed: Thu Sep 29 21:40:42 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/openejb/util/ContainerClassesFilter.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4d3b3fb7/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java b/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
index eb3e811..1baff7e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/ContainerClassesFilter.java
@@ -58,6 +58,7 @@ public class ContainerClassesFilter implements Filter {
excluded.add("com.sun.xml.bind");
excluded.add("com.sun.xml.messaging.saaj");
excluded.add("com.sun.xml.txw2");
+ excluded.add("io.jsonwebtoken");
excluded.add("io.netty");
excluded.add("io.swagger.annotations");
excluded.add("io.swagger.config");
@@ -73,6 +74,7 @@ public class ContainerClassesFilter implements Filter {
excluded.add("junit");
excluded.add("net.sf.ehcache");
excluded.add("net.shibboleth.utilities.java.support");
+ excluded.add("org.aeonbits.owner");
excluded.add("org.apache.activemq");
excluded.add("org.apache.bval");
excluded.add("org.apache.camel");
@@ -121,6 +123,7 @@ public class ContainerClassesFilter implements Filter {
excluded.add("org.jasypt");
excluded.add("org.jboss.marshalling");
excluded.add("org.joda.time");
+ excluded.add("org.jose4j");
excluded.add("org.junit");
excluded.add("org.jvnet.mimepull");
excluded.add("org.metatype.sxc");
@@ -134,6 +137,7 @@ public class ContainerClassesFilter implements Filter {
excluded.add("org.terracotta.entity");
excluded.add("org.terracotta.modules.ehcache");
excluded.add("org.terracotta.statistics");
+ excluded.add("org.yaml.snakeyaml");
excluded.add("serp");
final Set<String> included = new HashSet<>();
@@ -186,7 +190,7 @@ public class ContainerClassesFilter implements Filter {
}
dot = name.indexOf('.', dot + 1);
}
- return false;
+ return included.contains(name);
}
}
}