Improved m2 poms

doc/pom.xml

@@ -1,11 +1,14 @@
-<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-doc</artifactId>
   <dependencies>
   </dependencies>
-</model>
+</project>

domain/pom.xml

@@ -1,17 +1,20 @@
-<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-parent</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-domain</artifactId>
   <name>Acegi Security System for Spring - Domain Object Support</name>
   <dependencies>
     <dependency>
-      <groupId>net.sf.acegisecurity</groupId>
+      <groupId>org.acegisecurity</groupId>
       <artifactId>acegi-security</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
@@ -19,9 +22,14 @@
       <version>3.0.3</version>
     </dependency>
     <dependency>
-      <groupId>springframework</groupId>
+      <groupId>org.springframework</groupId>
       <artifactId>spring-hibernate</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.6</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.6.1</version>
     </dependency>
   </dependencies>
   <build>
@@ -36,4 +44,4 @@
       </plugin>
     </plugins>
   </build>
-</model>
+</project>

pom.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
+<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>
   <groupId>org.acegisecurity</groupId>
   <artifactId>acegi-security-parent</artifactId>
   <version>1.0.0-SNAPSHOT</version>
+  <name>Acegi Security System for Spring - Parent</name>
   <packaging>pom</packaging>
 
   <modules>

samples/annotations/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-samples</artifactId>
-    <version>1.0.0-RC1</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-sample-annotations</artifactId>
   <name>Acegi Security System for Spring - Annotations sample</name>
@@ -21,4 +24,4 @@
       </plugin>
     </plugins>
   </build>
-</model>
+</project>

samples/attributes/pom.xml

@@ -1,12 +1,15 @@
-<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-samples</artifactId>
-    <version>1.0.0-RC1</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-sample-attributes</artifactId>
   <name>Acegi Security System for Spring - Attributes sample</name>
   <dependencies>
   </dependencies>
-</model>
+</project>

samples/contacts-tiger/pom.xml

@@ -0,0 +1,21 @@
+<?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-samples</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>acegi-security-sample-contacts-tiger</artifactId>
+  <name>Acegi Security System for Spring - Contacts sample</name>
+  <packaging>war</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.acegisecurity</groupId>
+      <artifactId>acegi-security-tiger</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>

samples/contacts/pom.xml

@@ -1,13 +1,16 @@
-<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-samples</artifactId>
-    <version>1.0.0-RC1</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-sample-contacts</artifactId>
   <name>Acegi Security System for Spring - Contacts sample</name>
   <packaging>war</packaging>
   <dependencies>
   </dependencies>
-</model>
+</project>

samples/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-samples</artifactId>
   <name>Acegi Security System for Spring - Samples</name>
@@ -12,17 +15,15 @@
     <dependency>
       <groupId>org.acegisecurity</groupId>
       <artifactId>acegi-security-tiger</artifactId>
-      <version>1.0.0-RC1</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
   <modules>
     <module>annotations</module>
     <module>attributes</module>
-<!--
     <module>contacts</module>
     <module>contacts-tiger</module>
--->
   </modules>
 
-</model>
+</project>

sandbox/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>0.9.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>acegi-security-sandbox</artifactId>
   <name>Acegi Security System for Spring - Sandbox</name>
@@ -11,7 +14,7 @@
     <dependency>
       <groupId>org.acegisecurity</groupId>
       <artifactId>acegi-security</artifactId>
-      <version>1.0.0-RC1</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>directory</groupId>
@@ -32,4 +35,4 @@
       </plugin>
     </plugins>
   </build>
-</model>
+</project>