remove animal sniffer we are now 1.6

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

diff --git a/pom.xml b/pom.xml
index 757999e43e2e034a89876f3c991c9e1822f30c2c..542cd599cf10f3433848ff84f62408e8d5ad3508 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -760,15 +760,6 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
-  <dependencies>
-    <dependency>
-      <!-- for JRE requirement check annotation -->
-      <groupId>org.jvnet</groupId>
-      <artifactId>animal-sniffer-annotation</artifactId>
-      <version>1.0</version>
-      <optional>true</optional><!-- no need to have this at runtime -->
-    </dependency>
-  </dependencies>
 
   <build>
     <pluginManagement>
@@ -846,28 +837,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <!-- make sure our code doesn't have 1.6 dependencies -->
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <version>1.8</version>
-        <configuration>
-          <signature>
-            <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java15</artifactId>
-            <version>1.0</version>
-          </signature>
-        </configuration>
-        <executions>
-          <execution>
-            <id>check-java-1.5-compat</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
 
     </plugins>
   </build>

diff --git a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
index 1d64074b4280da1e8d34064e8689675b321c565a..c80bc47b268a0118d857d1ca08f78fba47233f42 100644 (file)
--- a/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
+++ b/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
@@ -20,7 +20,6 @@ package org.apache.archiva.redback.common.ldap.connection;
  */
 
 import com.sun.jndi.ldap.LdapCtxFactory;
-import org.jvnet.animal_sniffer.IgnoreJRERequirement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,13 +59,11 @@ public class LdapConnection
 
     private List<Rdn> baseDnRdns;
 
-    @IgnoreJRERequirement
     private static void initCtxFactory()
     {
         ctxFactory = new LdapCtxFactory();
     }
 
-    @IgnoreJRERequirement
     public LdapConnection( LdapConnectionConfiguration config, Rdn subRdn )
         throws LdapException
     {
@@ -107,7 +104,6 @@ public class LdapConnection
      * @param password
      * @throws LdapException
      */
-    @IgnoreJRERequirement
     public LdapConnection( LdapConnectionConfiguration config, String bindDn, String password )
         throws LdapException
     {