diff --git a/docs/manual/src/docbook/appendix-dependencies.xml b/docs/manual/src/docbook/appendix-dependencies.xml index 63b53cf008..d61f74c979 100644 --- a/docs/manual/src/docbook/appendix-dependencies.xml +++ b/docs/manual/src/docbook/appendix-dependencies.xml @@ -11,10 +11,13 @@ dependenices that are only used when building or testing Spring Security itself. Nor do we include transitive dependencies which are required by external dependencies. - The version of Spring required is listed on the project website, so the specific versions are omitted - for Spring dependencies below. Note that some of the dependencies listed as optional - below may still be required for other non-security functionality in a Spring application. - + The version of Spring required is listed on the project website, so the specific versions + are omitted for Spring dependencies below. Note that some of the dependencies listed as + optional below may still be required for other non-security functionality in + a Spring application. Also dependencies listed as optional may not actually be marked + as such in the project's Maven pom files if they are used in most applications. They are + optional only in the sense that you don't need them unless you are using the + specified functionality. Where a module depends on another Spring Security module, the non-optional dependencies of the module it depends on are also assumed to be required and are not listed separately. @@ -58,7 +61,7 @@ spring-expression - Required for expression-based method security + Required for expression-based method security (optional) spring-jdbc @@ -70,11 +73,6 @@ Required if using a database to store user data (optional). - - spring-web - - Required for clients which use HTTP remoting support (optional). - aspectjrt 1.6.10 @@ -114,6 +112,11 @@ + + spring-web + + Required for clients which use HTTP remoting support. + @@ -450,4 +453,4 @@ - \ No newline at end of file + diff --git a/gradle/maven-deployment.gradle b/gradle/maven-deployment.gradle index 629703e143..6e2e764e07 100644 --- a/gradle/maven-deployment.gradle +++ b/gradle/maven-deployment.gradle @@ -60,7 +60,7 @@ install { } def customizePom(pom) { - def optionalDeps = ['ehcache', 'log4j', 'apacheds-core', 'jsp-api', 'jsr250-api', 'ldapsdk'] + def optionalDeps = ['ehcache', 'log4j', 'apacheds-core', 'jsp-api', 'jsr250-api', 'ldapsdk', 'aspectjrt', 'aspectjweaver'] pom.scopeMappings.addMapping(10, configurations.provided, 'provided') pom.whenConfigured { p -> @@ -79,6 +79,11 @@ def customizePom(pom) { p.dependencies.find { dep -> dep.artifactId == 'spring-security-web'}.optional = true p.dependencies.find { dep -> dep.artifactId == 'spring-web'}.optional = true } + + if (p.artifactId == 'spring-security-core') { + p.dependencies.find { dep -> dep.artifactId == 'spring-jdbc'}.optional = true + p.dependencies.find { dep -> dep.artifactId == 'spring-tx'}.optional = true + } } pom.project {