SEC-1689: Move crypto module code to core for simplicity.

core/core.gradle

@@ -1,9 +1,5 @@
 // Core build file
 
-// We don't define a module dependency on crypto to avoid creating a transitive dependency
-def cryptoProject = project(':spring-security-crypto')
-def cryptoClasses = cryptoProject.sourceSets.main.classes
-
 dependencies {
     compile 'aopalliance:aopalliance:1.0',
             "net.sf.ehcache:ehcache:$ehcacheVersion",
@@ -24,17 +20,13 @@ dependencies {
     testRuntime "hsqldb:hsqldb:$hsqlVersion"
 }
 
-compileJava.dependsOn cryptoProject.compileJava
+// jdkVersion = System.properties['java.version']
-classes.dependsOn cryptoProject.classes
+// isJdk6 = jdkVersion >= '1.6'
+int maxAESKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength('AES')
 
-classes.doLast {
+test {
-    copy {
+    if (maxAESKeySize < 256) {
-        from cryptoClasses
+        logger.warn("AES keysize limited to $maxAESKeySize, skipping EncryptorsTests")
-        into sourceSets.main.classesDir
+        exclude '**/EncryptorsTests.class'
     }
 }
-
-sourceSets.main.compileClasspath += cryptoClasses
-sourceSets.test.compileClasspath += cryptoClasses
-
-sourceJar.from cryptoProject.sourceSets.main.java

crypto/crypto.gradle

@@ -1,12 +0,0 @@
-// crypto module build file
-
-// jdkVersion = System.properties['java.version']
-// isJdk6 = jdkVersion >= '1.6'
-int maxAESKeySize = javax.crypto.Cipher.getMaxAllowedKeyLength('AES')
-
-test {
-    if (maxAESKeySize < 256) {
-        println "AES keysize limited to $maxAESKeySize, skipping EncryptorsTests"
-        exclude '**/EncryptorsTests.class'
-    }
-}

crypto/src/main/java/org/springframework/security/crypto/encrypt/package-info.java

@@ -1,5 +0,0 @@
-/**
- * Symmetric-key data encryption.
- */
-package org.springframework.security.crypto.encrypt;
-

crypto/src/main/java/org/springframework/security/crypto/keygen/package-info.java

@@ -1,6 +0,0 @@
-/**
- * Secure random key generators.
- */
-package org.springframework.security.crypto.keygen;
-
-

crypto/src/main/java/org/springframework/security/crypto/password/package-info.java

@@ -1,5 +0,0 @@
-/**
- * Password encoders.
- */
-package org.springframework.security.crypto.password;
-

crypto/src/main/java/org/springframework/security/crypto/util/package-info.java

@@ -1,5 +0,0 @@
-/**
- * Shared crypto utilities for internal module use.
- * These are liable to change or be refactored and should not be used by external code.
- */
-package org.springframework.security.crypto.util;

crypto/template.mf

@@ -1,12 +0,0 @@
-Implementation-Title: org.springframework.security.crypto
-Implementation-Version: ${version}
-Bundle-SymbolicName: org.springframework.security.crypto
-Bundle-Name: Spring Security Crypto
-Bundle-Vendor: SpringSource
-Bundle-Version: ${version}
-Bundle-ManifestVersion: 2
-Excluded-Imports:
- javax.crypto.*
-Ignored-Existing-Headers:
- Import-Package,
- Export-Package

settings.gradle

@@ -7,8 +7,7 @@ def String[] modules = [
     'cas',
     'openid',
     'taglibs',
-    'aspects',
+    'aspects'
-    'crypto'
 ]
 
 def String[] samples = [