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/13 17:01:17 UTC

tomee git commit: TOMEE-1808 TOMEE-1807 jaxrs tomee embedded shade and excluding jaxb and junit

Repository: tomee
Updated Branches:
  refs/heads/master 262b237d0 -> 22cae6ba7


TOMEE-1808 TOMEE-1807 jaxrs tomee embedded shade and excluding jaxb and junit


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/22cae6ba
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/22cae6ba
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/22cae6ba

Branch: refs/heads/master
Commit: 22cae6ba79f87dbddc6cf17d4952b713256f22ed
Parents: 262b237
Author: Romain manni-Bucau <rm...@gmail.com>
Authored: Fri May 13 19:01:02 2016 +0200
Committer: Romain manni-Bucau <rm...@gmail.com>
Committed: Fri May 13 19:01:02 2016 +0200

----------------------------------------------------------------------
 tomee/tomee-embedded/pom.xml | 95 ++++++++++++++++++++++++++-------------
 1 file changed, 63 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/22cae6ba/tomee/tomee-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml
index 2d11d4d..5f43b5d 100644
--- a/tomee/tomee-embedded/pom.xml
+++ b/tomee/tomee-embedded/pom.xml
@@ -56,47 +56,78 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
         <executions>
-          <execution>
+          <execution> <!-- real tomee-embedded (typically webprofile + AMQ) -->
+            <id>uber-shade</id>
             <phase>package</phase>
             <goals>
               <goal>shade</goal>
             </goals>
             <configuration>
-              <useBaseVersion>true</useBaseVersion>
-              <createDependencyReducedPom>false</createDependencyReducedPom>
-              <shadedArtifactAttached>true</shadedArtifactAttached>
               <shadedClassifierName>uber</shadedClassifierName>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                  <mainClass>org.apache.tomee.embedded.Main</mainClass>
-                </transformer>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                  <resource>META-INF/cxf/bus-extensions.txt</resource>
-                </transformer>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
-                  <resource>META-INF/openwebbeans/openwebbeans.properties</resource>
-                </transformer>
-              </transformers>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/ejb-jar.xml</exclude>
-                    <exclude>META-INF/openejb-jar.xml</exclude>
-                    <exclude>META-INF/web-fragment.xml</exclude>
-                    <!--
-                    NOTE:
-                    we shouldn't exclude faces-config.xml while we didn't impl the feature in another manner
-                    but it breaks all apps not using JSF.
-                    Solution would be to handle it more deeply in our myfaces integration
-                    -->
-                    <exclude>META-INF/faces-config.xml</exclude>
-                  </excludes>
-                </filter>
-              </filters>
+              <artifactSet>
+                <excludes>
+                  <exclude>junit:junit</exclude>
+                  <exclude>*:jaxb-api</exclude>
+                  <exclude>*:jaxb-impl</exclude>
+                </excludes>
+              </artifactSet>
+            </configuration>
+          </execution>
+          <execution> <!-- kind of webprofile minus JSF -->
+            <id>jaxrs-shade</id>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <shadedClassifierName>jaxrs</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>
+                </excludes>
+              </artifactSet>
             </configuration>
           </execution>
         </executions>
+        <configuration>
+          <useBaseVersion>true</useBaseVersion>
+          <createDependencyReducedPom>false</createDependencyReducedPom>
+          <shadedArtifactAttached>true</shadedArtifactAttached>
+          <transformers>
+            <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+              <mainClass>org.apache.tomee.embedded.Main</mainClass>
+            </transformer>
+            <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+              <resource>META-INF/cxf/bus-extensions.txt</resource>
+            </transformer>
+            <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+              <resource>META-INF/openwebbeans/openwebbeans.properties</resource>
+            </transformer>
+          </transformers>
+          <filters>
+            <filter>
+              <artifact>*:*</artifact>
+              <excludes>
+                <exclude>META-INF/ejb-jar.xml</exclude>
+                <exclude>META-INF/openejb-jar.xml</exclude>
+                <exclude>META-INF/web-fragment.xml</exclude>
+                <!--
+                NOTE:
+                we shouldn't exclude faces-config.xml while we didn't impl the feature in another manner
+                but it breaks all apps not using JSF.
+                Solution would be to handle it more deeply in our myfaces integration
+                -->
+                <exclude>META-INF/faces-config.xml</exclude>
+              </excludes>
+            </filter>
+          </filters>
+        </configuration>
       </plugin>
     </plugins>
   </build>