From: Brett Porter <brett@apache.org>
Date: Mon, 23 Jan 2012 04:44:34 +0000 (+0000)
Subject: restore animal sniffer to the build
X-Git-Tag: archiva-1.4-M3~1516
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b78c1c6878a13906a526e9675e0429b7a7061743;p=archiva.git

restore animal sniffer to the build

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1234680 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/metadata/test-repository/pom.xml b/archiva-modules/metadata/test-repository/pom.xml
index 08b9a9604..64bb6e17e 100644
--- a/archiva-modules/metadata/test-repository/pom.xml
+++ b/archiva-modules/metadata/test-repository/pom.xml
@@ -38,6 +38,13 @@
             </excludes>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>animal-sniffer-maven-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
diff --git a/pom.xml b/pom.xml
index fe362408b..c6f54ee21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1458,15 +1458,10 @@
         <artifactId>tomcat7-maven-plugin</artifactId>
        </plugin>
       <!-- make sure our code doesn't have 1.6 dependencies -->
-      <!--
-      TODO check as it currently failed with ".. error in opening zip file ""
-      in module archiva-modules/metadata/test-repository/
-      see https://gist.github.com/1659445
-
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <version>1.8-SNAPSHOT</version>
+        <version>1.7</version>
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
@@ -1484,7 +1479,6 @@
           </execution>
         </executions>
       </plugin>
-      -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>