From 900e0043392e2c527cff45c75698e02f81d06317 Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Thu, 11 Jun 2015 16:38:07 +1000
Subject: [PATCH 1/2] Update to latest parent; fix warnings

---
 pom.xml            |  2 +-
 zanata-war/pom.xml | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5225774ba6..30dc1f2e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>zanata-parent</artifactId>
-    <version>21</version>
+    <version>24-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
index 7e3b61affc..78d28f3297 100644
--- a/zanata-war/pom.xml
+++ b/zanata-war/pom.xml
@@ -200,8 +200,8 @@
       <!--</plugin>-->
 
       <plugin>
-        <groupId>com.ning.maven.plugins</groupId>
-        <artifactId>maven-duplicate-finder-plugin</artifactId>
+        <groupId>org.basepom.maven</groupId>
+        <artifactId>duplicate-finder-maven-plugin</artifactId>
         <configuration>
           <ignoredDependencies>
             <dependency>
@@ -209,16 +209,16 @@
               <artifactId>gwt-user</artifactId>
             </dependency>
           </ignoredDependencies>
-          <ignoredResources>
+          <ignoredResourcePatterns>
             <!-- many, many jars -->
-            <ignoredResource>META-INF/.*</ignoredResource>
+            <ignoredResourcePattern>META-INF/.*</ignoredResourcePattern>
             <!-- iText and JavaMelody -->
-            <ignoredResource>com/lowagie/text/pdf/fonts/cmap_info.txt</ignoredResource>
+            <ignoredResourcePattern>com/lowagie/text/pdf/fonts/cmap_info.txt</ignoredResourcePattern>
             <!-- drools and quartz -->
-            <ignoredResource>build.properties</ignoredResource>
+            <ignoredResourcePattern>build.properties</ignoredResourcePattern>
             <!-- Seam -->
-            <ignoredResource>seam.properties</ignoredResource>
-          </ignoredResources>
+            <ignoredResourcePattern>seam.properties</ignoredResourcePattern>
+          </ignoredResourcePatterns>
         </configuration>
       </plugin>
 

From a58b13807440156a0ef3715777a3e170d500eb61 Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Thu, 11 Jun 2015 22:16:28 +1000
Subject: [PATCH 2/2] Ignore duplicate xml.xsd

---
 zanata-war/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
index 78d28f3297..72a86d4aa3 100644
--- a/zanata-war/pom.xml
+++ b/zanata-war/pom.xml
@@ -218,6 +218,8 @@
             <ignoredResourcePattern>build.properties</ignoredResourcePattern>
             <!-- Seam -->
             <ignoredResourcePattern>seam.properties</ignoredResourcePattern>
+            <!-- jboss-metadata-common and zanata-adapter-xliff -->
+            <ignoredResourcePattern>schema/xml.xsd</ignoredResourcePattern>
           </ignoredResourcePatterns>
         </configuration>
       </plugin>