From 444bf606168cb0cbbac1f99e8fbde5c446b8e02d Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <github@pcvolkmer.de>
Date: Fri, 20 Nov 2015 14:28:01 +0100
Subject: [PATCH] Use Spring IO platform for dependency management
See http://platform.spring.io/platform/ for more information about it.
This patch makes Spring.IO usable with ARSnova Backend and also updates
some dependiencies not beeing upgraded in ARSnova Backend POM
so I removed explicit version declaration.
Problems with json-path-assert dit not occure, so i removed version
declaration and use managed version 2.0.0.
Remove obsolete version properties
Closes GH-17. This is a squshed version of PCV's PR. (DG)
---
pom.xml | 49 ++++++++++++++++++-------------------------------
1 file changed, 18 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9d6856e37..ae036c845 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,10 +7,7 @@
<packaging>war</packaging>
<properties>
- <org.springframework-version>4.2.0.RELEASE</org.springframework-version>
- <org.springframework.security-version>4.0.2.RELEASE</org.springframework.security-version>
- <org.springframework.integration-mail-version>4.1.6.RELEASE</org.springframework.integration-mail-version>
- <com.fasterxml.jackson-version>2.6.0</com.fasterxml.jackson-version>
+ <io.spring.platform-version>2.0.0.RELEASE</io.spring.platform-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sonar.language>java</sonar.language>
<mobile.production.path>../arsnova-mobile/src/main/webapp/build/production/ARSnova</mobile.production.path>
@@ -111,17 +108,27 @@
</repository>
</repositories>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>io.spring.platform</groupId>
+ <artifactId>platform-bom</artifactId>
+ <version>${io.spring.platform-version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6</version>
</dependency>
<!-- Spring -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${org.springframework-version}</version>
<exclusions>
<!-- Exclude Commons Logging in favor of SLF4j -->
<exclusion>
@@ -133,33 +140,27 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mail</artifactId>
- <version>${org.springframework.integration-mail-version}</version>
</dependency>
<!-- Security -->
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
- <version>${org.springframework.security-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
- <version>${org.springframework.security-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
- <version>${org.springframework.security-version}</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-cas</artifactId>
- <version>${org.springframework.security-version}</version>
<exclusions>
<!-- Exclude log4j-over-slf4j to prevent delegation loop -->
<exclusion>
@@ -171,7 +172,6 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-ldap</artifactId>
- <version>${org.springframework.security-version}</version>
</dependency>
<dependency>
<groupId>cglib</groupId>
@@ -181,17 +181,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.12</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
</dependency>
<dependency>
<groupId>de.thm.couchdb4j</groupId>
@@ -201,7 +198,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -212,13 +208,11 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${org.springframework-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -236,38 +230,35 @@
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
- <version>1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${com.fasterxml.jackson-version}</version>
+ <artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>${com.fasterxml.jackson-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
- <version>1.8.6</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.8.6</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
- <version>${org.springframework-version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -281,22 +272,18 @@
<version>0.73.0</version>
</dependency>
<dependency>
- <!-- Tests are currently not compatible with json-path-assert >= 1.0.0 -->
<groupId>com.jayway.jsonpath</groupId>
<artifactId>json-path-assert</artifactId>
- <version>0.9.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
- <version>1.5.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-jndi</artifactId>
- <version>1.5.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
--
GitLab