diff --git a/core-tiger/pom.xml b/core-tiger/pom.xml
index 5ec269057b..e7397aad19 100644
--- a/core-tiger/pom.xml
+++ b/core-tiger/pom.xml
@@ -16,7 +16,7 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>aspectj</groupId>
+            <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
             <optional>true</optional>
         </dependency>
diff --git a/core/pom.xml b/core/pom.xml
index a415069e48..7e7b28e910 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -48,7 +48,7 @@
             <optional>true</optional>
         </dependency>
 	    <dependency>
-	        <groupId>aspectj</groupId>
+	        <groupId>org.aspectj</groupId>
 		<artifactId>aspectjrt</artifactId>
 		<optional>true</optional>
 	    </dependency>
diff --git a/pom.xml b/pom.xml
index f133433495..4694b39058 100644
--- a/pom.xml
+++ b/pom.xml
@@ -627,7 +627,7 @@
 		<version>1.5.4</version>
 	    </dependency>	    
 	    <dependency>
-	        <groupId>aspectj</groupId>
+	        <groupId>org.aspectj</groupId>
 	    	<artifactId>aspectjrt</artifactId>
 		    <version>1.5.4</version>
 	    </dependency>
diff --git a/samples/cas/client/pom.xml b/samples/cas/client/pom.xml
index fc3e717ee2..9f722bd974 100644
--- a/samples/cas/client/pom.xml
+++ b/samples/cas/client/pom.xml
@@ -2,8 +2,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.security</groupId>
-        <artifactId>spring-security-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <artifactId>spring-security-samples-cas</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-cas-client</artifactId>
diff --git a/samples/cas/server/pom.xml b/samples/cas/server/pom.xml
index 53900ecf35..4928f43da2 100644
--- a/samples/cas/server/pom.xml
+++ b/samples/cas/server/pom.xml
@@ -2,8 +2,8 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.springframework.security</groupId>
-        <artifactId>spring-security-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <artifactId>spring-security-samples-cas</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-cas-server</artifactId>
@@ -34,4 +34,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/samples/pom.xml b/samples/pom.xml
index ad6742d273..0c9cbfad5f 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -16,7 +16,8 @@
         <module>preauth</module>
         <module>openid</module>
         <module>ldap</module>
-        <module>portlet</module>        
+        <module>portlet</module>
+        <module>cas</module>        
     </modules>
     <dependencies>
         <dependency>
@@ -24,7 +25,7 @@
             <artifactId>servlet-api</artifactId>
         </dependency>        
 	<dependency>
-	    <groupId>aspectj</groupId>
+	    <groupId>org.aspectj</groupId>
 	    <artifactId>aspectjrt</artifactId>
 	</dependency>
         <dependency>
diff --git a/sandbox/other/pom.xml b/sandbox/other/pom.xml
index 3adfa8ab5a..dd92aaf62c 100644
--- a/sandbox/other/pom.xml
+++ b/sandbox/other/pom.xml
@@ -51,7 +51,7 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-        <groupId>aspectj</groupId>
+        <groupId>org.aspectj</groupId>
 	    <artifactId>aspectjrt</artifactId>
 	    <version>1.5.4</version>	    
 	    <optional>true</optional>