Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Addition of commons-logging exclusions and adjustments to pom generation.

This commit is contained in:
Luke Taylor 2010-03-07 21:58:25 +00:00
parent b64a3fa725
commit f3264ba9ab
17 changed files with 99 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acl/acl.gradle
View File

@ -5,7 +5,6 @@ dependencies {
"net.sf.ehcache:ehcache:$ehcacheVersion",
"org.springframework:spring-aop:$springVersion",
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-core:$springVersion",
"org.springframework:spring-tx:$springVersion",
"org.springframework:spring-jdbc:$springVersion"

8
cas/cas.gradle
View File

@ -2,12 +2,12 @@
dependencies {
compile project(':spring-security-core'),
project(':spring-security-web'),
"javax.servlet:servlet-api:2.5",
"org.springframework:spring-core:$springVersion",
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-tx:$springVersion",
"org.springframework:spring-web:$springVersion",
"org.springframework:spring-web:$springVersion",
"org.jasig.cas:cas-client-core:3.1.9",
"net.sf.ehcache:ehcache:$ehcacheVersion"
provided 'javax.servlet:servlet-api:2.5'
}

6
config/config.gradle
View File

@ -5,15 +5,15 @@ compileTestJava.dependsOn(':spring-security-core:compileTestJava')
dependencies {
compile project(':spring-security-core'),
project(':spring-security-web'),
"javax.servlet:servlet-api:2.5",
"org.aspectj:aspectjweaver:$aspectjVersion",
"org.springframework:spring-aop:$springVersion",
"org.springframework:spring-core:$springVersion",
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-web:$springVersion",
"org.springframework:spring-web:$springVersion",
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-tx:$springVersion"
provided "javax.servlet:servlet-api:2.5"
testCompile project(':spring-security-ldap'),
project(':spring-security-openid'),
files(this.project(':spring-security-core').sourceSets.test.classesDir),

1
core/core.gradle
View File

@ -5,7 +5,6 @@ dependencies {
"net.sf.ehcache:ehcache:$ehcacheVersion",
"org.springframework:spring-aop:$springVersion",
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-core:$springVersion",
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-expression:$springVersion",
"org.springframework:spring-jdbc:$springVersion",

10
gradle/javaprojects.gradle
View File

@ -21,6 +21,10 @@ configurations {
dependencies {
compile 'commons-logging:commons-logging:1.1.1'
compile ("org.springframework:spring-core:$springVersion") {
exclude(group: 'commons-logging', module: 'commons-logging')
}
testCompile 'junit:junit:4.7',
'org.mockito:mockito-core:1.7',
'org.jmock:jmock:2.5.1',
@ -28,9 +32,9 @@ dependencies {
'org.hamcrest:hamcrest-core:1.1',
'org.hamcrest:hamcrest-library:1.1',
"org.springframework:spring-test:$springVersion"
bundlor 'com.springsource.bundlor:com.springsource.bundlor.ant:1.0.0.RC1',
'com.springsource.bundlor:com.springsource.bundlor:1.0.0.RC1',
'com.springsource.bundlor:com.springsource.bundlor.blint:1.0.0.RC1'
bundlor 'com.springsource.bundlor:com.springsource.bundlor.ant:1.0.0.RELEASE',
'com.springsource.bundlor:com.springsource.bundlor:1.0.0.RELEASE',
'com.springsource.bundlor:com.springsource.bundlor.blint:1.0.0.RELEASE'
}
test {

31
gradle/maven.gradle
View File

@ -26,15 +26,11 @@ gradle.taskGraph.whenReady {graph ->
}
}
def deployer = null
uploadArchives {
def mavenDeployer = repositories.mavenDeployer {
deployer = repositories.mavenDeployer {
configuration = configurations.deployerJars
pom.whenConfigured {pom ->
def optionalDeps = ['commons-logging', 'ehcache', 'log4j', 'apacheds-core', 'apacheds-server-jndi', 'jsp-api', 'slf4j-api', 'slf4j-log4j12', 'jsr250-api', 'ldapsdk']
def providedDeps = ['servlet-api']
pom.dependencies.findAll {dep -> optionalDeps.contains(dep.artifactId) }*.optional = true
pom.dependencies.findAll {dep -> providedDeps.contains(dep.artifactId) }*.scope = 'provided'
}
}
doFirst {
if (releaseBuild) {
@ -52,4 +48,23 @@ uploadArchives {
}
}
conf2ScopeMappings.addMapping(1, configurations.provided, "provided")
// Pom Customization
installer = install.repositories.mavenInstaller
def optionalDeps = ['commons-logging', 'ehcache', 'log4j', 'apacheds-core', 'jsp-api', 'jsr250-api', 'ldapsdk']
[installer, deployer]*.pom*.whenConfigured { pom ->
pom.scopeMappings.addMapping(10, configurations.provided, 'provided')
pom.dependencies.findAll { dep ->
optionalDeps.contains(dep.artifactId) ||
dep.groupId.startsWith('org.apache.directory') ||
dep.groupId.startsWith('org.slf4j')
}*.optional = true
if (pom.artifactId == 'spring-security-config') {
pom.dependencies.find { dep -> dep.artifactId == 'spring-security-web'}.optional = true
pom.dependencies.find { dep -> dep.artifactId == 'spring-web'}.optional = true
}
}

6
itest/web/itest-web.gradle
View File

@ -1,13 +1,13 @@
dependencies {
compile "org.springframework:spring-context:$springVersion",
"org.springframework:spring-web:$springVersion",
'javax.servlet:servlet-api:2.5'
"org.springframework:spring-web:$springVersion"
provided 'javax.servlet:servlet-api:2.5'
testCompile project(':spring-security-core'),
project(':spring-security-web'),
project(':spring-security-taglibs'),
"org.springframework:spring-core:$springVersion",
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-webmvc:$springVersion",
"org.mortbay.jetty:jetty:$jettyVersion",

10
ldap/ldap.gradle
View File

@ -4,18 +4,22 @@ test.exclude('**/OpenLDAPIntegrationTestSuite.class')
dependencies {
compile project(':spring-security-core'),
"org.springframework:spring-core:$springVersion",
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-tx:$springVersion",
"org.springframework.ldap:spring-ldap-core:$springLdapVersion",
"org.apache.directory.server:apacheds-core:$apacheDsVersion",
"org.apache.directory.server:apacheds-core-entry:$apacheDsVersion",
"org.apache.directory.server:apacheds-protocol-shared:$apacheDsVersion",
"org.apache.directory.server:apacheds-protocol-ldap:$apacheDsVersion",
"org.apache.directory.server:apacheds-server-jndi:$apacheDsVersion",
'org.apache.directory.shared:shared-ldap:0.9.15',
'org.apache.directory.shared:shared-ldap:0.9.15',
'ldapsdk:ldapsdk:4.1'
compile ("org.springframework.ldap:spring-ldap-core:$springLdapVersion") {
exclude(group: 'commons-logging', module: 'commons-logging')
exclude(group: 'org.springframework', module: 'spring-core')
exclude(group: 'org.springframework', module: 'spring-tx')
exclude(group: 'org.springframework', module: 'spring-beans')
}
runtime 'org.slf4j:slf4j-log4j12:1.4.3'
}

5
openid/openid.gradle
View File

@ -5,13 +5,12 @@ dependencies {
project(':spring-security-web'),
'org.openid4java:openid4java-nodeps:0.9.5',
"org.springframework:spring-aop:$springVersion",
"org.springframework:spring-core:$springVersion",
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-tx:$springVersion",
"org.springframework:spring-tx:$springVersion",
"org.springframework:spring-web:$springVersion"
provided "javax.servlet:servlet-api:2.5"
provided 'javax.servlet:servlet-api:2.5'
runtime 'commons-httpclient:commons-httpclient:3.1'
}

5
pom.xml
View File

@ -441,6 +441,11 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.4.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>

3
samples/cas/cas.gradle
View File

@ -2,11 +2,8 @@ apply id: 'war'
apply id: 'jetty'
dependencies {
// providedCompile 'javax.servlet:servlet-api:2.5@jar'
runtime project(':spring-security-core'),
project(':spring-security-web'),
project(':spring-security-config'),
// project(':taglibs'),
'log4j:log4j:1.2.15@jar'
}

2
samples/contacts/contacts.gradle
View File

@ -5,10 +5,10 @@ apply id: 'jetty'
dependencies {
providedCompile 'javax.servlet:servlet-api:2.5@jar'
compile project(':spring-security-core'),
project(':spring-security-acl'),
"org.springframework:spring-aop:$springVersion",
"org.springframework:spring-core:$springVersion",
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-jdbc:$springVersion",

2
samples/tutorial/tutorial.gradle
View File

@ -5,8 +5,8 @@ apply id: 'jetty'
dependencies {
providedCompile 'javax.servlet:servlet-api:2.5@jar'
compile project(':spring-security-core'),
"org.springframework:spring-core:$springVersion",
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-web:$springVersion",
"org.springframework:spring-webmvc:$springVersion",

42
sandbox/heavyduty/build.gradle
View File

@ -1,23 +1,17 @@
usePlugin('war')
usePlugin('jetty')
usePlugin('project-reports')
apply: 'war'
apply: 'jetty'
//apply: 'project-reports'
version = '3.0.0.CI-SNAPSHOT'
springVersion = '3.0.0.RELEASE'
targetCompatibility = '1.5'
version = '3.1.0.CI-SNAPSHOT'
springVersion = '3.0.1.RELEASE'
targetCompatibility = '1.5'
sourceCompatibility = '1.5'
repositories {
mavenRepo name:'localRepo', urls:'file:///Users/luke/.m2/repository'
}
configurations {
// runtime.excludeRules.add(org: 'org.apache.commons')
mavenRepo name:'Local', urls: "file://" + System.properties['user.home'] + "/.m2/repository"
}
dependencies {
//
// NB: Transient deps are all runtime deps (unlike maven)
compile 'aopalliance:aopalliance:1.0',
"org.springframework.security:spring-security-core:$version",
"org.springframework.security:spring-security-web:$version",
@ -27,27 +21,23 @@ dependencies {
"org.springframework:spring-tx:$springVersion",
"org.springframework:spring-web:$springVersion",
"org.springframework:spring-webmvc:$springVersion",
'commons-logging:commons-logging:1.1.1',
"org.aspectj:aspectjrt:1.6.5",
'org.hibernate:ejb3-persistence:1.0.2.GA'
'javax.persistence:persistence-api:1.0'
'org.aspectj:aspectjrt:1.6.8',
'org.hibernate:ejb3-persistence:1.0.2.GA',
'javax.persistence:persistence-api:1.0',
'org.slf4j:jcl-over-slf4j:1.5.11'
providedCompile "javax.servlet:servlet-api:2.5"
providedCompile 'javax.servlet:servlet-api:2.5'
runtime 'org.hibernate:hibernate-entitymanager:3.4.0.GA',
"org.springframework:spring-context-support:$springVersion",
"org.springframework.security:spring-security-ldap:$version",
"org.springframework:spring-context-support:$springVersion",
"org.springframework.security:spring-security-ldap:$version",
"org.springframework.security:spring-security-config:$version",
"org.springframework.security:spring-security-taglibs:$version",
"org.springframework.security:spring-security-taglibs:$version",
"org.springframework:spring-orm:$springVersion",
'org.apache.directory.server:apacheds-core:1.5.5',
'org.apache.directory.server:apacheds-server-jndi:1.5.5',
'org.freemarker:freemarker:2.3.16',
"hsqldb:hsqldb:1.8.0.10",
'org.slf4j:slf4j-log4j12:1.5.8',
'org.slf4j:slf4j-log4j12:1.5.11',
'log4j:log4j:1.2.14'
}
task ('pcomp') {
println configurations.compile
}

32
sandbox/heavyduty/pom.xml
View File

@ -26,12 +26,22 @@
<artifactId>spring-security-taglibs</artifactId>
<version>${spring.security.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
@ -117,6 +127,7 @@
<scope>runtime</scope>
<version>1.1.2</version>
</dependency>
<!--
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
@ -131,6 +142,7 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
-->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@ -140,20 +152,25 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.5.8</version>
<version>1.5.10</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.5.10</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.5.8</version>
<version>1.5.10</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>runtime</scope>
<version>1.2.14</version>
<version>1.2.15</version>
</dependency>
</dependencies>
@ -176,6 +193,11 @@
<wtpversion>2.0</wtpversion>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.1</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
@ -204,7 +226,7 @@
</plugins>
</build>
<properties>
<spring.version>3.0.0.RELEASE</spring.version>
<spring.version>3.0.1.RELEASE</spring.version>
<spring.security.version>3.1.0.CI-SNAPSHOT</spring.security.version>
</properties>

1
taglibs/taglibs.gradle
View File

@ -4,7 +4,6 @@ dependencies {
compile project(':spring-security-core'),
project(':spring-security-web'),
project(':spring-security-acl'),
"org.springframework:spring-core:$springVersion",
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-expression:$springVersion",

1
web/web.gradle
View File

@ -5,7 +5,6 @@ dependencies {
'aopalliance:aopalliance:1.0',
"org.aspectj:aspectjweaver:$aspectjVersion",
"org.springframework:spring-aop:$springVersion",
"org.springframework:spring-core:$springVersion",
"org.springframework:spring-beans:$springVersion",
"org.springframework:spring-context:$springVersion",
"org.springframework:spring-expression:$springVersion",