SEC-2097: Update integrationTestCompile to use optional and provided

Also update slf4j version and remove explicit commons-logging from pom generation

acl/pom.xml

@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

aspects/pom.xml

@@ -109,7 +109,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

cas/pom.xml

@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

config/config.gradle

@@ -16,14 +16,14 @@ dependencies {
             "org.springframework:spring-beans:$springVersion"
 
     optional project(':spring-security-web'),
+             project(':spring-security-ldap'),
+             project(':spring-security-openid'),
              "org.springframework:spring-web:$springVersion",
              "org.aspectj:aspectjweaver:$aspectjVersion"
 
     provided "org.apache.tomcat:tomcat-servlet-api:$servletApiVersion"
 
-    testCompile project(':spring-security-ldap'),
-                project(':spring-security-openid'),
-                project(':spring-security-cas'),
+    testCompile project(':spring-security-cas'),
                 project(':spring-security-core').sourceSets.test.output,
                 'javax.annotation:jsr250-api:1.0',
                 "org.springframework.ldap:spring-ldap-core:$springLdapVersion",

config/pom.xml

@@ -88,6 +88,20 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-ldap</artifactId>
+      <version>3.2.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.security</groupId>
+      <artifactId>spring-security-openid</artifactId>
+      <version>3.2.0.CI-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-web</artifactId>
@@ -261,7 +275,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -278,13 +292,7 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-ldap</artifactId>
-      <version>3.2.0.CI-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.security</groupId>
-      <artifactId>spring-security-openid</artifactId>
+      <artifactId>spring-security-cas</artifactId>
       <version>3.2.0.CI-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>

core/pom.xml

@@ -197,7 +197,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

crypto/pom.xml

@@ -78,7 +78,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

gradle/javaprojects.gradle

@@ -16,7 +16,7 @@ ext.apacheDsVersion = '1.5.5'
 ext.jstlVersion = '1.2'
 ext.jettyVersion = '6.1.26'
 ext.hsqlVersion = '1.8.0.10'
-ext.slf4jVersion = '1.6.1'
+ext.slf4jVersion = '1.7.5'
 ext.logbackVersion = '0.9.29'
 ext.cglibVersion = '2.2'
 ext.powerMockVersion = '1.4.12'
@@ -63,7 +63,7 @@ ext.bundlorProperties = [
 // Integration test setup
 configurations {
     integrationTestCompile {
-        extendsFrom testCompile
+        extendsFrom testCompile, optional, provided
     }
     integrationTestRuntime {
         extendsFrom integrationTestCompile, testRuntime

gradle/maven-deployment.gradle

@@ -62,14 +62,6 @@ def customizePom(pom, gradleProject) {
                 email = 'rwinch@vmware.com'
             }
         }
-        dependencies {
-            dependency {
-                artifactId = groupId = 'commons-logging'
-                scope = 'compile'
-                optional = 'true'
-                version = '1.1.1'
-            }
-        }
     }
 }
 

itest/context/pom.xml

@@ -132,7 +132,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

itest/web/pom.xml

@@ -126,7 +126,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

ldap/ldap.gradle

@@ -20,6 +20,9 @@ dependencies {
         exclude(group: 'org.springframework', module: 'spring-tx')
         exclude(group: 'org.springframework', module: 'spring-beans')
     }
+
+    testCompile "org.slf4j:slf4j-api:$slf4jVersion",
+                "org.slf4j:jcl-over-slf4j:$slf4jVersion"
 }
 
 integrationTest {

ldap/pom.xml

@@ -175,7 +175,13 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

openid/pom.xml

@@ -144,7 +144,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

remoting/pom.xml

@@ -108,7 +108,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

samples/aspectj/pom.xml

@@ -103,7 +103,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

samples/cas/sample/pom.xml

@@ -90,7 +90,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

samples/cas/server/pom.xml

@@ -78,7 +78,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

samples/contacts/pom.xml

@@ -139,7 +139,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

samples/dms/pom.xml

@@ -133,7 +133,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

samples/gae/pom.xml

@@ -53,7 +53,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -126,13 +126,13 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jdk14</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

samples/jaas/pom.xml

@@ -96,7 +96,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

samples/ldap/pom.xml

@@ -60,7 +60,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

samples/openid/pom.xml

@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

samples/preauth/pom.xml

@@ -60,7 +60,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

samples/servletapi/pom.xml

@@ -108,7 +108,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

samples/tutorial/pom.xml

@@ -35,7 +35,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

taglibs/pom.xml

@@ -144,7 +144,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>

web/pom.xml

@@ -186,7 +186,13 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.6.1</version>
+      <version>1.7.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spockframework</groupId>
+      <artifactId>spock-core</artifactId>
+      <version>0.6-groovy-1.8</version>
       <scope>test</scope>
     </dependency>
     <dependency>