Merge pull request #863 from zanata/parent-24-snapshot

Update to latest parent; fix warnings
zanata · Jun 12, 2015 · 2e746cd · 2e746cd
2 parents d9c20f2 + a58b138
commit 2e746cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git 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
@@ -200,25 +200,27 @@
       <!--</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>
               <groupId>com.google.gwt</groupId>
               <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>
+            <!-- jboss-metadata-common and zanata-adapter-xliff -->
+            <ignoredResourcePattern>schema/xml.xsd</ignoredResourcePattern>
+          </ignoredResourcePatterns>
         </configuration>
       </plugin>