From 7d5d59483a05ac7d2e0028f666b583732cd7b290 Mon Sep 17 00:00:00 2001
From: chenson42 <chenson42@gmail.com>
Date: Sat, 9 Mar 2013 17:49:54 +0000
Subject: [PATCH] 0001046: There are 2 log4j-1.2.160001046: There are 2
 log4j-1.2.16.jar files in the symmetricds deployment.jar files in the
 symmetricds deployment

---
 .../src/assembly/assembly-server.xml               | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/symmetric-assemble/src/assembly/assembly-server.xml b/symmetric-assemble/src/assembly/assembly-server.xml
index 8187530f96..7b1568c794 100644
--- a/symmetric-assemble/src/assembly/assembly-server.xml
+++ b/symmetric-assemble/src/assembly/assembly-server.xml
@@ -22,7 +22,7 @@
                 <exclude>bin/symadmin</exclude>
                 <exclude>bin/dbexport</exclude>
                 <exclude>bin/dbimport</exclude>
-                <exclude>bin/dbfill</exclude>                
+                <exclude>bin/dbfill</exclude>
                 <exclude>bin/sym_service</exclude>
                 <exclude>bin/sym_service.initd</exclude>
             </excludes>
@@ -52,12 +52,12 @@
             <source>../symmetric-server/src/main/deploy/bin/dbimport</source>
             <outputDirectory>/bin</outputDirectory>
             <fileMode>755</fileMode>
-        </file>   
+        </file>
         <file>
             <source>../symmetric-server/src/main/deploy/bin/dbfill</source>
             <outputDirectory>/bin</outputDirectory>
             <fileMode>755</fileMode>
-        </file>                              
+        </file>
         <file>
             <source>../symmetric-server/src/main/deploy/bin/sym_service.initd</source>
             <outputDirectory>/bin</outputDirectory>
@@ -91,12 +91,20 @@
                         <outputDirectory>/web/WEB-INF/lib</outputDirectory>
                         <unpack>false</unpack>
                         <scope>runtime</scope>
+                        <useTransitiveFiltering>true</useTransitiveFiltering>
+                        <excludes>
+                            <exclude>log4j:log4j</exclude>
+                        </excludes>                        
                     </dependencySet>
                     <dependencySet>
                         <outputDirectory>/lib</outputDirectory>
                         <unpack>false</unpack>
                         <scope>provided</scope>
                         <useProjectArtifact>false</useProjectArtifact>
+                        <useTransitiveFiltering>true</useTransitiveFiltering>
+                        <excludes>
+                            <exclude>junit:junit</exclude>
+                        </excludes>                        
                     </dependencySet>
                 </dependencySets>
             </binaries>