From 62e79f150c7b7bcfe7433005a5dfba0a1b9414a3 Mon Sep 17 00:00:00 2001
From: Petr Siroky <psiroky@redhat.com>
Date: Thu, 26 Nov 2015 00:33:35 +0100
Subject: [PATCH] [BZ-1020902] exclude source files from WARs

---
 kie-drools-wb/kie-drools-wb-webapp/pom.xml | 13 ++++++++-----
 kie-wb/kie-wb-webapp/pom.xml               | 13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/kie-drools-wb/kie-drools-wb-webapp/pom.xml b/kie-drools-wb/kie-drools-wb-webapp/pom.xml
index 660026c259..d4f845ae6a 100644
--- a/kie-drools-wb/kie-drools-wb-webapp/pom.xml
+++ b/kie-drools-wb/kie-drools-wb-webapp/pom.xml
@@ -1480,7 +1480,8 @@
           <execution>
             <id>gwt-compile</id>
             <goals>
-              <goal>resources</goal>
+              <!-- Do not use 'resources' goal as it does not play well with resource filtering and is adding Java
+                   source files into the build output directory (and they then end up in the WAR). -->
               <goal>compile</goal>
             </goals>
           </execution>
@@ -1490,10 +1491,12 @@
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
           <packagingExcludes>
-            **/javax/**/*.*,
-            **/client/**/*.class,
-            **/*.symbolMap,
-            WEB-INF/classes/logback.xml
+            WEB-INF/classes/javax/**/*.*,
+            WEB-INF/classes/**/client/**/*.class,
+            WEB-INF/classes/**/public/**,
+            WEB-INF/classes/logback.xml,
+            **/*.gwt.xml,
+            **/*.symbolMap
           </packagingExcludes>
           <archive>
             <addMavenDescriptor>false</addMavenDescriptor>
diff --git a/kie-wb/kie-wb-webapp/pom.xml b/kie-wb/kie-wb-webapp/pom.xml
index 5235f9bfc0..8ffeeac0b3 100644
--- a/kie-wb/kie-wb-webapp/pom.xml
+++ b/kie-wb/kie-wb-webapp/pom.xml
@@ -1727,7 +1727,8 @@
           <execution>
             <id>gwt-compile</id>
             <goals>
-              <goal>resources</goal>
+              <!-- Do not use 'resources' goal as it does not play well with resource filtering and is adding Java
+                   source files into the build output directory (and they then end up in the WAR). -->
               <goal>compile</goal>
             </goals>
           </execution>
@@ -1737,10 +1738,12 @@
         <artifactId>maven-war-plugin</artifactId>
         <configuration>
           <packagingExcludes>
-            **/javax/**/*.*,
-            **/client/**/*.class,
-            **/*.symbolMap,
-            WEB-INF/classes/logback.xml
+            WEB-INF/classes/javax/**/*.*,
+            WEB-INF/classes/**/client/**/*.class,
+            WEB-INF/classes/**/public/**,
+            WEB-INF/classes/logback.xml,
+            **/*.gwt.xml,
+            **/*.symbolMap
           </packagingExcludes>
           <archive>
             <addMavenDescriptor>false</addMavenDescriptor>