You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2019/06/20 11:26:37 UTC
[cxf-fediz] 02/02: Update Spring & Spring Security, maven-war-plugin
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
commit be69e783a7055ab967e3e1eaf474b8aa7cc6eee5
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Thu Jun 20 14:26:09 2019 +0300
Update Spring & Spring Security, maven-war-plugin
---
pom.xml | 20 +++++++++++++++-----
services/idp-core/pom.xml | 23 -----------------------
services/oidc/pom.xml | 1 -
services/sts/pom.xml | 1 -
systests/cxf/pom.xml | 2 --
systests/federation/oidcIdpWebapp/pom.xml | 1 -
systests/federation/samlIdpWebapp/pom.xml | 3 +--
systests/federation/samlWebapp/pom.xml | 3 +--
systests/webapps/cxfWebapp/pom.xml | 3 +--
9 files changed, 18 insertions(+), 39 deletions(-)
diff --git a/pom.xml b/pom.xml
index f002da3..f69ae50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,9 +64,9 @@
<openjpa.version>2.4.3</openjpa.version>
<servlet.version>2.5</servlet.version>
<slf4j.version>1.7.26</slf4j.version>
- <spring.version>4.3.22.RELEASE</spring.version>
+ <spring.version>4.3.24.RELEASE</spring.version>
<spring-ldap-core.version>2.3.2.RELEASE</spring-ldap-core.version>
- <spring.security.version>4.2.11.RELEASE</spring.security.version>
+ <spring.security.version>4.2.13.RELEASE</spring.security.version>
<spring-webflow.version>2.5.1.RELEASE</spring-webflow.version>
<tomcat.version>9.0.20</tomcat.version>
<wss4j.version>2.2.2</wss4j.version>
@@ -264,6 +264,18 @@
<module>apache-fediz</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-framework-bom</artifactId>
+ <version>${spring.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<defaultGoal>install</defaultGoal>
@@ -643,7 +655,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>3.2.1</version>
+ <version>3.2.3</version>
</plugin>
</plugins>
</pluginManagement>
@@ -826,6 +838,4 @@
</profile>
</profiles>
-
-
</project>
diff --git a/services/idp-core/pom.xml b/services/idp-core/pom.xml
index ebc9e93..d04eaca 100644
--- a/services/idp-core/pom.xml
+++ b/services/idp-core/pom.xml
@@ -33,25 +33,6 @@
<spring.security.version>3.2.10.RELEASE</spring.security.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -73,7 +54,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -82,17 +62,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/services/oidc/pom.xml b/services/oidc/pom.xml
index c121887..8830299 100644
--- a/services/oidc/pom.xml
+++ b/services/oidc/pom.xml
@@ -82,7 +82,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/services/sts/pom.xml b/services/sts/pom.xml
index 21201c1..21501bd 100644
--- a/services/sts/pom.xml
+++ b/services/sts/pom.xml
@@ -37,7 +37,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git a/systests/cxf/pom.xml b/systests/cxf/pom.xml
index 45d520d..d454d76 100644
--- a/systests/cxf/pom.xml
+++ b/systests/cxf/pom.xml
@@ -73,12 +73,10 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.fediz.systests</groupId>
diff --git a/systests/federation/oidcIdpWebapp/pom.xml b/systests/federation/oidcIdpWebapp/pom.xml
index 2b84b40..7baf187 100644
--- a/systests/federation/oidcIdpWebapp/pom.xml
+++ b/systests/federation/oidcIdpWebapp/pom.xml
@@ -67,7 +67,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/systests/federation/samlIdpWebapp/pom.xml b/systests/federation/samlIdpWebapp/pom.xml
index 1f03118..bbfc369 100644
--- a/systests/federation/samlIdpWebapp/pom.xml
+++ b/systests/federation/samlIdpWebapp/pom.xml
@@ -43,7 +43,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -57,7 +57,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/systests/federation/samlWebapp/pom.xml b/systests/federation/samlWebapp/pom.xml
index 2b8866b..7cb4145 100644
--- a/systests/federation/samlWebapp/pom.xml
+++ b/systests/federation/samlWebapp/pom.xml
@@ -43,7 +43,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -57,7 +57,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/systests/webapps/cxfWebapp/pom.xml b/systests/webapps/cxfWebapp/pom.xml
index f94cedd..355629c 100644
--- a/systests/webapps/cxfWebapp/pom.xml
+++ b/systests/webapps/cxfWebapp/pom.xml
@@ -48,7 +48,7 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons.lang.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -57,7 +57,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>