[java-parent-project COMMIT] /trunk/pom.xml

[noreply at shibboleth.net]

Author: lajoie
Date: Sun Dec  4 15:29:23 2011
New Revision: 33

URL: http://svn.shibboleth.net/view/java-parent-project?rev=33&view=rev
Log:
Hoist some deps from opensaml into managed deps in here
Minor formatting cleanup

Modified:
    trunk/pom.xml

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-parent-project/trunk/pom.xml?rev=33&r1=32&r2=33&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Sun Dec  4 15:29:23 2011
@@ -26,12 +26,12 @@
         <slf4j.version>1.6.2</slf4j.version>
         <spring.groupId>org.springframework</spring.groupId>
         <spring.version>3.0.5.RELEASE</spring.version>
+        <xalan.groupId>xalan</xalan.groupId>
+        <xalan.version>2.7.1</xalan.version>
         <xerces.groupId>org.apache.xerces</xerces.groupId>
         <xerces.version>2.10.0</xerces.version>
         <xmlresolver.groupId>xml-resolver</xmlresolver.groupId>
         <xmlresolver.version>1.2</xmlresolver.version>
-        <xalan.groupId>xalan</xalan.groupId>
-        <xalan.version>2.7.1</xalan.version>
     </properties>
 
     <repositories>
@@ -56,12 +56,12 @@
         <!-- Compile dependencies -->
         <dependency>
             <groupId>${slf4j.groupId}</groupId>
-            <artifactId>slf4j-api</artifactId>
+            <artifactId>jcl-over-slf4j</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
         <dependency>
             <groupId>${slf4j.groupId}</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
+            <artifactId>jul-to-slf4j</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
         <dependency>
@@ -71,7 +71,7 @@
         </dependency>
         <dependency>
             <groupId>${slf4j.groupId}</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
+            <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
 
@@ -99,6 +99,15 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <!-- This isn't really needed by every single project but it is used by the vast majority and having it on the 
+                test classpath, even if it's not used, doesn't hurt anything. -->
+            <groupId>xmlunit</groupId>
+            <artifactId>xmlunit</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <!-- Dependencies with fixed versions and excludes that may be used by projects. -->
@@ -106,9 +115,52 @@
         <dependencies>
             <!-- Compile dependencies -->
             <dependency>
-                <groupId>${spring.groupId}</groupId>
-                <artifactId>spring-context-support</artifactId>
-                <version>${spring.version}</version>
+                <groupId>org.owasp.esapi</groupId>
+                <artifactId>esapi</artifactId>
+                <version>2.0.1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>commons-configuration</groupId>
+                        <artifactId>commons-configuration</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-beanutils</groupId>
+                        <artifactId>commons-beanutils-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-fileupload</groupId>
+                        <artifactId>commons-fileupload</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-io</groupId>
+                        <artifactId>commons-io</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xom</groupId>
+                        <artifactId>xom</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.beanshell</groupId>
+                        <artifactId>bsh-core</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.owasp.antisamy</groupId>
+                        <artifactId>antisamy</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>4.1.1</version>
                 <exclusions>
                     <exclusion>

[... 225 lines stripped ...]