aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Prakash2014-03-26 00:40:38 -0400
committerWinston Prakash2014-03-26 00:40:57 -0400
commit4e0425752341ff43eefeb4c43c1d71d6cd216dd0 (patch)
tree7eb27e6a67f5f00e5f129a6c88a1f68d3b309c78 /hudson-core/pom.xml
parent6e55eca01ce21ce71b89753f79c7d8fa718f6edb (diff)
downloadorg.eclipse.hudson.core-4e0425752341ff43eefeb4c43c1d71d6cd216dd0.zip
org.eclipse.hudson.core-4e0425752341ff43eefeb4c43c1d71d6cd216dd0.tar.gz
org.eclipse.hudson.core-4e0425752341ff43eefeb4c43c1d71d6cd216dd0.tar.xz
Fix: 390382 - Upgrade spring Security to a newer version (3.1.2)
Diffstat (limited to 'hudson-core/pom.xml')
-rw-r--r--hudson-core/pom.xml115
1 files changed, 61 insertions, 54 deletions
diff --git a/hudson-core/pom.xml b/hudson-core/pom.xml
index c9e9480..3605028 100644
--- a/hudson-core/pom.xml
+++ b/hudson-core/pom.xml
@@ -94,16 +94,16 @@
</executions>
</plugin>
<plugin>
- <groupId>org.antlr</groupId>
- <artifactId>antlr3-maven-plugin</artifactId>
- <version>${antlr.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>antlr</goal>
- </goals>
- </execution>
- </executions>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr3-maven-plugin</artifactId>
+ <version>${antlr.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>antlr</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<!--TODO Use the maven-dependency-plugin -->
<plugin>
@@ -456,10 +456,10 @@
</exclusions>
</dependency>
<dependency>
- <!--
- The version included in the transitive dependency doesn't have the source zip,
- so explicitly using the newer version.
- -->
+ <!--
+ The version included in the transitive dependency doesn't have the source zip,
+ so explicitly using the newer version.
+ -->
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version>
@@ -470,46 +470,46 @@
<version>${javax-mail.version}</version>
</dependency>
- <!-- Switch to xercesImpl 2.8.1 - Eclipse approved -->
+ <!-- Switch to xercesImpl 2.8.1 - Eclipse approved -->
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xerces.version}</version>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
</dependency>
<dependency>
- <groupId>org.hudsonci.stapler</groupId>
- <artifactId>commons-jelly</artifactId>
- <version>${commons-jelly.version}</version>
+ <groupId>org.hudsonci.stapler</groupId>
+ <artifactId>commons-jelly</artifactId>
+ <version>${commons-jelly.version}</version>
<exclusions>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hudsonci.xpath</groupId>
- <artifactId>xpath-service</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hudsonci.xpath</groupId>
+ <artifactId>xpath-service</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>org.hudsonci.xpath</groupId>
- <artifactId>xpath-service</artifactId>
- <version>1.0.2</version>
+ <groupId>org.hudsonci.xpath</groupId>
+ <artifactId>xpath-service</artifactId>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
<artifactId>commons-jelly-tags-fmt</artifactId>
<version>${commons-jelly-tags-fmt.version}</version>
<exclusions>
- <exclusion>
- <groupId>commons-jelly</groupId>
- <artifactId>commons-jelly</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-jelly</groupId>
- <artifactId>commons-jelly-tags-junit</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-jelly</groupId>
+ <artifactId>commons-jelly-tags-junit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -572,10 +572,6 @@
<version>${commons-jexl.version}</version>
</dependency>
<dependency>
- <!--
- for Grails spring bean builder.
- Ideally we should be able to modify BeanBuilder so as not to depend on this.
- -->
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
@@ -610,14 +606,25 @@
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>${spring-security.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>${spring-security.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.security</groupId>
<artifactId>spring-security-acl</artifactId>
<version>${spring-security.version}</version>
</dependency>
+
<dependency>
- <groupId>org.springframework.ldap</groupId>
- <artifactId>spring-ldap</artifactId>
- <version>${spring-ldap.version}</version>
- <classifier>all</classifier>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-ldap</artifactId>
+ <version>${spring-security.version}</version>
</dependency>
<dependency>
@@ -739,10 +746,10 @@
<artifactId>antlr-runtime</artifactId>
<version>${antlr.version}</version>
<exclusions>
- <exclusion>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -755,8 +762,8 @@
<artifactId>commons-jelly</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jvnet.hudson</groupId>
- <artifactId>commons-jelly</artifactId>
+ <groupId>org.jvnet.hudson</groupId>
+ <artifactId>commons-jelly</artifactId>
</exclusion>
<exclusion>
<groupId>commons-jexl</groupId>