[jboss-cvs] JBossAS SVN: r110629 - in projects/security/security-negotiation/trunk: jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/cipher and 5 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Feb 11 09:14:03 EST 2011


Author: darran.lofthouse at jboss.com
Date: 2011-02-11 09:14:02 -0500 (Fri, 11 Feb 2011)
New Revision: 110629

Modified:
   projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml
   projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/cipher/AesCtsHmacSha1Decoder.java
   projects/security/security-negotiation/trunk/jboss-negotiation-extras/pom.xml
   projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/pom.xml
   projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml
   projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml
   projects/security/security-negotiation/trunk/parent/pom.xml
Log:
[SECURITY-576] Bring all dependencies in-line with AS6.

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml	2011-02-11 13:13:38 UTC (rev 110628)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/pom.xml	2011-02-11 14:14:02 UTC (rev 110629)
@@ -1,4 +1,5 @@
-<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">
+<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">
   <parent>
     <groupId>org.jboss.security</groupId>
     <artifactId>jboss-negotiation-project</artifactId>
@@ -10,20 +11,20 @@
   <packaging>jar</packaging>
   <name>JBoss Negotiation Common</name>
   <url>http://www.jboss.org</url>
-  <description>JBoss Negotiation Library</description> 
+  <description>JBoss Negotiation Library</description>
   <build>
     <plugins>
       <plugin>
-         <artifactId>maven-surefire-plugin</artifactId>
-         <configuration>
-           <printSummary>true</printSummary>
-           <disableXmlReport>false</disableXmlReport>
-           <testFailureIgnore>true</testFailureIgnore>
-           <includes>
-             <include>**/**TestCase.java</include>
-           </includes>
-           <forkMode>pertest</forkMode>
-          </configuration>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <printSummary>true</printSummary>
+          <disableXmlReport>false</disableXmlReport>
+          <testFailureIgnore>true</testFailureIgnore>
+          <includes>
+            <include>**/**TestCase.java</include>
+          </includes>
+          <forkMode>pertest</forkMode>
+        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -31,20 +32,24 @@
   <!-- Do not add version information here, use ../parent/pom.xml instead -->
   <dependencies>
     <!-- Local Dependencies -->
-    
-    <!-- Global dependencies -->    
+
+    <!-- Global dependencies -->
     <dependency>
-      <groupId>apache-log4j</groupId>
+      <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
     <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jboss-common</artifactId>
-    </dependency>  
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core</artifactId>
+    </dependency>
     <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.security</groupId>
-      <artifactId>jbosssx-client</artifactId>
-    </dependency>         
+      <artifactId>jbosssx</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.jboss.spec.javax.servlet</groupId>
       <artifactId>jboss-servlet-api_3.0_spec</artifactId>
@@ -53,7 +58,7 @@
       <groupId>org.jboss.web</groupId>
       <artifactId>jbossweb</artifactId>
     </dependency>
-    
+
   </dependencies>
 
 </project>

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/cipher/AesCtsHmacSha1Decoder.java
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/cipher/AesCtsHmacSha1Decoder.java	2011-02-11 13:13:38 UTC (rev 110628)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-common/src/main/java/org/jboss/security/negotiation/cipher/AesCtsHmacSha1Decoder.java	2011-02-11 14:14:02 UTC (rev 110629)
@@ -30,7 +30,7 @@
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.jboss.logging.Logger;
+import org.apache.log4j.Logger;
 import org.jboss.security.negotiation.NegotiationException;
 
 /**

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-extras/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-extras/pom.xml	2011-02-11 13:13:38 UTC (rev 110628)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-extras/pom.xml	2011-02-11 14:14:02 UTC (rev 110629)
@@ -1,4 +1,5 @@
-<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">
+<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">
   <parent>
     <groupId>org.jboss.security</groupId>
     <artifactId>jboss-negotiation-project</artifactId>
@@ -10,20 +11,20 @@
   <packaging>jar</packaging>
   <name>JBoss Negotiation Extras</name>
   <url>http://www.jboss.org</url>
-  <description>JBoss Negotiation Library</description> 
-  <build>    
-    <plugins>          
+  <description>JBoss Negotiation Library</description>
+  <build>
+    <plugins>
       <plugin>
-         <artifactId>maven-surefire-plugin</artifactId>
-         <configuration>
-           <printSummary>true</printSummary>
-           <disableXmlReport>false</disableXmlReport>
-           <testFailureIgnore>true</testFailureIgnore>
-           <includes>
-             <include>**/**TestCase.java</include>
-           </includes>
-           <forkMode>pertest</forkMode>
-          </configuration>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <printSummary>true</printSummary>
+          <disableXmlReport>false</disableXmlReport>
+          <testFailureIgnore>true</testFailureIgnore>
+          <includes>
+            <include>**/**TestCase.java</include>
+          </includes>
+          <forkMode>pertest</forkMode>
+        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -33,36 +34,30 @@
     <!-- Local Dependencies -->
     <dependency>
       <groupId>org.jboss.security</groupId>
-      <artifactId>jboss-negotiation-common</artifactId>     
-    </dependency>       
-    <dependency>
-      <groupId>org.jboss.security</groupId>
-      <artifactId>jboss-negotiation-ntlm</artifactId>     
-    </dependency>      
-   <dependency>
-      <groupId>org.jboss.security</groupId>
-      <artifactId>jboss-negotiation-spnego</artifactId>     
-   </dependency>
-      
+      <artifactId>jboss-negotiation-common</artifactId>
+    </dependency>
+
     <!-- Global dependencies -->
     <dependency>
-      <groupId>apache-log4j</groupId>
-      <artifactId>log4j</artifactId>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jboss-common</artifactId>
+      <groupId>org.jboss.jbossas</groupId>
+      <artifactId>jboss-as-security</artifactId>
     </dependency>
     <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jboss-jmx</artifactId>
-    </dependency>       
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+    </dependency>
     <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jboss-system</artifactId>
-    </dependency>    
-    
-
+      <groupId>org.jboss.mx</groupId>
+      <artifactId>jboss-j2se</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.security</groupId>
+      <artifactId>jbosssx</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/pom.xml	2011-02-11 13:13:38 UTC (rev 110628)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-ntlm/pom.xml	2011-02-11 14:14:02 UTC (rev 110629)
@@ -1,4 +1,5 @@
-<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">
+<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">
   <parent>
     <groupId>org.jboss.security</groupId>
     <artifactId>jboss-negotiation-project</artifactId>
@@ -10,20 +11,20 @@
   <packaging>jar</packaging>
   <name>JBoss Negotiation NTLM</name>
   <url>http://www.jboss.org</url>
-  <description>JBoss Negotiation Library</description> 
+  <description>JBoss Negotiation Library</description>
   <build>
     <plugins>
       <plugin>
-         <artifactId>maven-surefire-plugin</artifactId>
-         <configuration>
-           <printSummary>true</printSummary>
-           <disableXmlReport>false</disableXmlReport>
-           <testFailureIgnore>true</testFailureIgnore>
-           <includes>
-             <include>**/**TestCase.java</include>
-           </includes>
-           <forkMode>pertest</forkMode>
-          </configuration>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <printSummary>true</printSummary>
+          <disableXmlReport>false</disableXmlReport>
+          <testFailureIgnore>true</testFailureIgnore>
+          <includes>
+            <include>**/**TestCase.java</include>
+          </includes>
+          <forkMode>pertest</forkMode>
+        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -35,16 +36,17 @@
       <groupId>org.jboss.security</groupId>
       <artifactId>jboss-negotiation-common</artifactId>
     </dependency>
-    
+
     <!-- Global dependencies -->
     <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jboss-common</artifactId>
-    </dependency>  
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core</artifactId>
+    </dependency>
+
   </dependencies>
 
 </project>

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml	2011-02-11 13:13:38 UTC (rev 110628)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-spnego/pom.xml	2011-02-11 14:14:02 UTC (rev 110629)
@@ -1,4 +1,5 @@
-<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">
+<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">
   <parent>
     <groupId>org.jboss.security</groupId>
     <artifactId>jboss-negotiation-project</artifactId>
@@ -10,47 +11,69 @@
   <packaging>jar</packaging>
   <name>JBoss Negotiation SPNEGO</name>
   <url>http://www.jboss.org</url>
-  <description>JBoss Negotiation Library</description> 
+  <description>JBoss Negotiation Library</description>
   <build>
     <plugins>
       <plugin>
-         <artifactId>maven-surefire-plugin</artifactId>
-         <configuration>
-           <printSummary>true</printSummary>
-           <disableXmlReport>false</disableXmlReport>
-           <testFailureIgnore>true</testFailureIgnore>
-           <includes>
-             <include>**/**TestCase.java</include>
-           </includes>
-           <forkMode>pertest</forkMode>
-          </configuration>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <printSummary>true</printSummary>
+          <disableXmlReport>false</disableXmlReport>
+          <testFailureIgnore>true</testFailureIgnore>
+          <includes>
+            <include>**/**TestCase.java</include>
+          </includes>
+          <forkMode>pertest</forkMode>
+        </configuration>
       </plugin>
     </plugins>
   </build>
 
   <!-- Do not add version information here, use ../parent/pom.xml instead -->
   <dependencies>
-    <!-- Local Dependencies -->    
+    <!-- Local Dependencies -->
     <dependency>
       <groupId>org.jboss.security</groupId>
       <artifactId>jboss-negotiation-common</artifactId>
     </dependency>
-          
+
     <!-- Global dependencies -->
     <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-security</artifactId>
-      <version>5.1.0.GA</version>
-    </dependency>    
+    </dependency>
     <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.mx</groupId>
+      <artifactId>jboss-j2se</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.security</groupId>
-      <artifactId>jboss-security-spi</artifactId>    
-    </dependency>    
+      <artifactId>jboss-security-spi</artifactId>
+    </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>    
-
+      <groupId>org.jboss.security</groupId>
+      <artifactId>jbosssx</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.web</groupId>
+      <artifactId>jbossweb</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

Modified: projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml	2011-02-11 13:13:38 UTC (rev 110628)
+++ projects/security/security-negotiation/trunk/jboss-negotiation-toolkit/pom.xml	2011-02-11 14:14:02 UTC (rev 110629)
@@ -1,4 +1,5 @@
-<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">
+<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">
   <parent>
     <groupId>org.jboss.security</groupId>
     <artifactId>jboss-negotiation-project</artifactId>
@@ -10,20 +11,20 @@
   <packaging>war</packaging>
   <name>JBoss Negotiation Toolkit</name>
   <url>http://www.jboss.org</url>
-  <description>JBoss Negotiation Toolkit</description> 
+  <description>JBoss Negotiation Toolkit</description>
   <build>
     <plugins>
       <plugin>
-         <artifactId>maven-surefire-plugin</artifactId>
-         <configuration>
-           <printSummary>true</printSummary>
-           <disableXmlReport>false</disableXmlReport>
-           <testFailureIgnore>true</testFailureIgnore>
-           <includes>
-             <include>**/**TestCase.java</include>
-           </includes>
-           <forkMode>pertest</forkMode>
-          </configuration>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <printSummary>true</printSummary>
+          <disableXmlReport>false</disableXmlReport>
+          <testFailureIgnore>true</testFailureIgnore>
+          <includes>
+            <include>**/**TestCase.java</include>
+          </includes>
+          <forkMode>pertest</forkMode>
+        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -35,12 +36,12 @@
       <groupId>org.jboss.security</groupId>
       <artifactId>jboss-negotiation-extras</artifactId>
       <scope>provided</scope>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.jboss.security</groupId>
       <artifactId>jboss-negotiation-common</artifactId>
       <scope>provided</scope>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.jboss.security</groupId>
       <artifactId>jboss-negotiation-spnego</artifactId>
@@ -50,23 +51,29 @@
       <groupId>org.jboss.security</groupId>
       <artifactId>jboss-negotiation-ntlm</artifactId>
       <scope>provided</scope>
-    </dependency>    
-    
+    </dependency>
+
     <!-- Global dependencies -->
     <dependency>
-      <groupId>apache-log4j</groupId>
+      <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
       <scope>provided</scope>
-    </dependency>    
+    </dependency>
     <dependency>
-      <groupId>jboss</groupId>
-      <artifactId>jboss-common</artifactId>
+      <groupId>org.jboss</groupId>
+      <artifactId>jboss-common-core</artifactId>
       <scope>provided</scope>
-    </dependency>   
+    </dependency>
     <dependency>
+      <groupId>org.jboss.security</groupId>
+      <artifactId>jbosssx</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.spec.javax.servlet</groupId>
       <artifactId>jboss-servlet-api_3.0_spec</artifactId>
       <scope>provided</scope>
-    </dependency>    
-  </dependencies>    
+    </dependency>
+
+  </dependencies>
 </project>

Modified: projects/security/security-negotiation/trunk/parent/pom.xml
===================================================================
--- projects/security/security-negotiation/trunk/parent/pom.xml	2011-02-11 13:13:38 UTC (rev 110628)
+++ projects/security/security-negotiation/trunk/parent/pom.xml	2011-02-11 14:14:02 UTC (rev 110629)
@@ -1,4 +1,5 @@
-<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">
+<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">
   <parent>
     <groupId>jboss</groupId>
     <artifactId>jboss-parent</artifactId>
@@ -14,20 +15,22 @@
   <description>
     The JBoss Negotiation Project
   </description>
-   <scm>
-      <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk</connection>
-      <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk</developerConnection>
-   </scm>
+  <scm>
+    <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk</connection>
+    <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/security/security-negotiation/trunk</developerConnection>
+  </scm>
   <properties>
-    <version.apache-log4j.log4j>1.2.14</version.apache-log4j.log4j>
-    <version.jboss.jboss-common>4.2.3.GA</version.jboss.jboss-common>
-    <version.jboss.jmx>4.2.3.GA</version.jboss.jmx>
-    <version.jboss.system>4.2.3.GA</version.jboss.system>
-    <version.jboss-web>3.0.0-beta-7</version.jboss-web>
-    <version.junit>3.8.1</version.junit>
-    <version.org.jboss.security.jbosssx-client>2.0.4.SP2</version.org.jboss.security.jbosssx-client>
-    <version.org.jboss.security.spi>2.0.2.SP1</version.org.jboss.security.spi>    
-    <version.servlet.api>1.0.0.Final</version.servlet.api>    
+    <version.commoncore>2.2.17.GA</version.commoncore>
+    <version.jbossas>6.0.0.Final</version.jbossas>
+    <version.jbosslogging>3.0.0.Beta4</version.jbosslogging>
+    <version.jbosssx>2.0.3.SP1</version.jbosssx>
+    <version.jbossweb>3.0.0-CR1</version.jbossweb>
+    <version.junit>4.5</version.junit>
+    <version.log4j>1.2.14</version.log4j>
+    <version.mxj2se>6.0.0.GA</version.mxj2se>
+    <version.securityspi>2.0.2.SP1</version.securityspi>
+    <version.servletapi>1.0.0.Final</version.servletapi>
+
   </properties>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
@@ -71,13 +74,13 @@
             </goals>
             <phase>deploy</phase>
           </execution>
-       </executions>
-       <configuration>
-         <groupId>jboss</groupId>
-         <license>lgpl</license>
-         <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
-         <removeArtifactVersion>true</removeArtifactVersion>
-       </configuration>
+        </executions>
+        <configuration>
+          <groupId>jboss</groupId>
+          <license>lgpl</license>
+          <jbossDeployRoot>${jboss.repository.root}</jbossDeployRoot>
+          <removeArtifactVersion>true</removeArtifactVersion>
+        </configuration>
       </plugin>
     </plugins>
   </build>
@@ -95,7 +98,7 @@
 
   <dependencyManagement>
     <!-- The parent pom manages the inter-dependencies of the modules. -->
-    
+
     <dependencies>
       <!-- Local Dependencies -->
       <dependency>
@@ -107,64 +110,97 @@
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-negotiation-common</artifactId>
         <version>${project.version}</version>
-      </dependency>       
+      </dependency>
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-negotiation-ntlm</artifactId>
         <version>${project.version}</version>
-      </dependency>      
-     <dependency>
+      </dependency>
+      <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-negotiation-spnego</artifactId>
         <version>${project.version}</version>
-     </dependency>         
-    
+      </dependency>
+
       <!-- External Dependencies -->
       <dependency>
-        <groupId>apache-log4j</groupId>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${version.junit}</version>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>${version.apache-log4j.log4j}</version>
+        <version>${version.log4j}</version>
       </dependency>
       <dependency>
-        <groupId>jboss</groupId>
-        <artifactId>jboss-common</artifactId>
-        <version>${version.jboss.jboss-common}</version>
+        <groupId>org.jboss</groupId>
+        <artifactId>jboss-common-core</artifactId>
+        <version>${version.commoncore}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging-spi</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
-        <groupId>jboss</groupId>
-        <artifactId>jboss-jmx</artifactId>
-        <version>${version.jboss.jmx}</version>
-      </dependency>      
+        <groupId>org.jboss.jbossas</groupId>
+        <artifactId>jboss-as-security</artifactId>
+        <version>${version.jbossas}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging-spi</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.jboss.security</groupId>
+            <artifactId>jbosssx-client</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
-        <groupId>jboss</groupId>
-        <artifactId>jboss-system</artifactId>
-        <version>${version.jboss.system}</version>
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>jboss-logging</artifactId>
+        <version>${version.jbosslogging}</version>
       </dependency>
       <dependency>
+        <groupId>org.jboss.mx</groupId>
+        <artifactId>jboss-j2se</artifactId>
+        <version>${version.mxj2se}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging-spi</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
         <groupId>org.jboss.security</groupId>
-        <artifactId>jbosssx-client</artifactId>
-        <version>${version.org.jboss.security.jbosssx-client}</version>
-      </dependency>      
+        <artifactId>jbosssx</artifactId>
+        <version>${version.jbosssx}</version>
+      </dependency>
       <dependency>
         <groupId>org.jboss.security</groupId>
         <artifactId>jboss-security-spi</artifactId>
-        <version>${version.org.jboss.security.spi}</version>
-      </dependency>      
+        <version>${version.securityspi}</version>
+      </dependency>
       <dependency>
         <groupId>org.jboss.spec.javax.servlet</groupId>
         <artifactId>jboss-servlet-api_3.0_spec</artifactId>
-        <version>${version.servlet.api}</version>
-      </dependency>       
+        <version>${version.servletapi}</version>
+      </dependency>
       <dependency>
         <groupId>org.jboss.web</groupId>
         <artifactId>jbossweb</artifactId>
-        <version>${version.jboss-web}</version>
+        <version>${version.jbossweb}</version>
       </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${version.junit}</version>
-      </dependency>
+
+
     </dependencies>
   </dependencyManagement>
 



More information about the jboss-cvs-commits mailing list