Author: fmeschbe
Date: Mon Feb 8 15:19:35 2010
New Revision: 907686
URL: http://svn.apache.org/viewvc?rev=907686&view=rev
Log:
SLING-1116 cleanup dependencies
Modified:
sling/trunk/bundles/extensions/formauth/pom.xml
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormLoginModulePlugin.java
Modified: sling/trunk/bundles/extensions/formauth/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/pom.xml?rev=907686&r1=907685&r2=907686&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/formauth/pom.xml (original)
+++ sling/trunk/bundles/extensions/formauth/pom.xml Mon Feb 8 15:19:35 2010
@@ -102,29 +102,40 @@
<dependencies>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.api</artifactId>
- <version>2.0.8</version>
+ <artifactId>org.apache.sling.commons.auth</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <artifactId>org.apache.sling.jcr.jackrabbit.server</artifactId>
<version>2.0.4-incubator</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.engine</artifactId>
- <version>2.0.6</version>
- <scope>provided</scope>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <!-- Embedded Dependencies -->
+ <dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.auth</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <artifactId>org.apache.sling.commons.osgi</artifactId>
+ <version>2.0.2-incubator</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -138,29 +149,7 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.jackrabbit.server</artifactId>
- <version>2.0.5-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
+ <!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified:
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormLoginModulePlugin.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormLoginModulePlugin.java?rev=907686&r1=907685&r2=907686&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormLoginModulePlugin.java
(original)
+++
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/FormLoginModulePlugin.java
Mon Feb 8 15:19:35 2010
@@ -77,7 +77,7 @@
* This implementation does nothing.
*/
@SuppressWarnings("unchecked")
- public void addPrincipals(Set principals) {
+ public void addPrincipals(@SuppressWarnings("unused") Set principals) {
}
/**
