Author: olamy
Date: Fri Jun 15 14:32:35 2012
New Revision: 1350638
URL: http://svn.apache.org/viewvc?rev=1350638&view=rev
Log:
remove animal sniffer we are now 1.6
Modified:
archiva/redback/redback-core/trunk/pom.xml
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
Modified: archiva/redback/redback-core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/pom.xml?rev=1350638&r1=1350637&r2=1350638&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/pom.xml (original)
+++ archiva/redback/redback-core/trunk/pom.xml Fri Jun 15 14:32:35 2012
@@ -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>
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java?rev=1350638&r1=1350637&r2=1350638&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/src/main/java/org/apache/archiva/redback/common/ldap/connection/LdapConnection.java
Fri Jun 15 14:32:35 2012
@@ -20,7 +20,6 @@ package org.apache.archiva.redback.commo
*/
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
{
