Improved m2 poms

adapters/cas/pom.xml

@@ -1,9 +1,12 @@
-<model>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>net.sf.acegisecurity</groupId>
+    <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-adapters</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-cas</artifactId>
   <name>Acegi Security System for Spring - CAS adapter</name>
@@ -14,4 +17,4 @@
       <version>2.0.12</version>
     </dependency>
   </dependencies>
-</model>
+</project>

adapters/catalina/pom.xml

@@ -1,9 +1,12 @@
-<model>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>net.sf.acegisecurity</groupId>
+    <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-adapters</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-catalina</artifactId>
   <name>Acegi Security System for Spring - Catalina adapter</name>
@@ -14,4 +17,4 @@
       <version>4.1.9</version>
     </dependency>
   </dependencies>
-</model>
+</project>

adapters/jboss/pom.xml

@@ -1,9 +1,12 @@
-<model>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>net.sf.acegisecurity</groupId>
+    <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-adapters</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-jboss</artifactId>
   <name>Acegi Security System for Spring - JBoss adapter</name>
@@ -13,5 +16,11 @@
       <artifactId>jbosssx</artifactId>
       <version>3.2.3</version>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
-</model>
+</project>

adapters/jetty/pom.xml

@@ -1,9 +1,12 @@
-<model>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>net.sf.acegisecurity</groupId>
+    <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-adapters</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-jetty</artifactId>
   <name>Acegi Security System for Spring - Jetty adapter</name>
@@ -14,4 +17,4 @@
       <version>4.2.22</version>
     </dependency>
   </dependencies>
-</model>
+</project>

adapters/pom.xml

@@ -1,22 +1,26 @@
-<model>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-parent</artifactId>
-    <version>1.0.0-RC1</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-adapters</artifactId>
   <name>Acegi Security System for Spring - Adapters</name>
+  <packaging>pom</packaging>
   <dependencies>
     <dependency>
       <groupId>org.acegisecurity</groupId>
       <artifactId>acegi-security</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>springframework</groupId>
+      <groupId>org.springframework</groupId>
       <artifactId>spring-mock</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -27,4 +31,4 @@
     <module>jetty</module>
     <module>resin</module>
   </modules>
-</model>
+</project>

adapters/resin/pom.xml

@@ -1,9 +1,12 @@
-<model>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>net.sf.acegisecurity</groupId>
+    <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-adapters</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-resin</artifactId>
   <name>Acegi Security System for Spring - Resin adapter</name>
@@ -13,5 +16,11 @@
       <artifactId>resin</artifactId>
       <version>3.0.9</version>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
-</model>
+</project>

core-tiger/pom.xml

@@ -1,9 +1,12 @@
-<model>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-parent</artifactId>
-    <version>1.0.0-RC1</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-tiger</artifactId>
   <name>Acegi Security System for Spring - Java 5 (Tiger)</name>
@@ -11,7 +14,12 @@
     <dependency>
       <groupId>org.acegisecurity</groupId>
       <artifactId>acegi-security</artifactId>
-      <version>1.0.0-RC1</version>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-aop</artifactId>
+      <version>1.2.5</version>
     </dependency>
   </dependencies>
   <build>
@@ -26,4 +34,4 @@
       </plugin>
     </plugins>
   </build>
-</model>
+</project>

core/pom.xml

@@ -1,44 +1,66 @@
-<model>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.acegisecurity</groupId>
     <artifactId>acegi-security-parent</artifactId>
-    <version>1.0.0-RC1</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security</artifactId>
   <name>Acegi Security System for Spring</name>
   <dependencies>
     <dependency>
-      <groupId>springframework</groupId>
-      <artifactId>spring-jdbc</artifactId>
-      <version>1.2.3</version>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-remoting</artifactId>
+      <version>1.2.6</version>
     </dependency>
+    <!-- required due to problem in maven transitive deps -->
     <dependency>
-      <groupId>springframework</groupId>
-      <artifactId>spring-remoting</artifactId>
-      <version>1.2.3</version>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <version>1.2.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>1.2.6</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jdbc</artifactId>
+      <version>1.2.6</version>
     </dependency>
+    <!-- end required -->
     <dependency>
-      <groupId>springframework</groupId>
+      <groupId>org.springframework</groupId>
       <artifactId>spring-support</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.6</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>springframework</groupId>
+      <groupId>org.springframework</groupId>
       <artifactId>spring-mock</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>ehcache</groupId>
       <artifactId>ehcache</artifactId>
       <version>1.1</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>cas</groupId>
       <artifactId>casclient</artifactId>
       <version>2.0.11</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.0.4</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
@@ -49,12 +71,19 @@
       <groupId>aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
       <version>1.2</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jsp-api</artifactId>
+      <version>2.0</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <version>1.7.3.0</version>
-      <scope>runtime</scope>
+      <scope>test</scope>
     </dependency>
   </dependencies>
-</model>
+</project>