From 23c2d48a29a41515e9fb0d0a27590fbdf80e2257 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer <github@pcvolkmer.de>
Date: Fri, 16 Nov 2018 12:39:18 +0100
Subject: [PATCH] Use Spring Boot 2.0.6 with maven plugin and dependency
management
Missing dependency versions from legacy spring io platform bom are added
as properties.
---
pom.xml | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8e159e7ce..7967e5754 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,10 @@
<packaging>war</packaging>
<properties>
- <io.spring.platform-version>Cairo-SR5</io.spring.platform-version>
+ <spring-boot-version>2.0.6.RELEASE</spring-boot-version>
+ <commons-lang-version>2.6</commons-lang-version>
+ <guava-version>20.0</guava-version>
+ <directory-server-version>1.5.5</directory-server-version>
<io.netty-version>4.1.30.Final</io.netty-version>
<org.aspectj-version>1.8.13</org.aspectj-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -74,6 +77,10 @@
<version>3.0.1</version>
<configuration></configuration>
</plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
</plugins>
</reporting>
@@ -122,9 +129,10 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>io.spring.platform</groupId>
- <artifactId>platform-bom</artifactId>
- <version>${io.spring.platform-version}</version>
+ <!-- Import dependency management from Spring Boot -->
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot-version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -142,6 +150,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
+ <version>${commons-lang-version}</version>
</dependency>
<!-- Spring -->
<dependency>
@@ -188,6 +197,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <version>${guava-version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -223,7 +233,6 @@
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
- <version>1.6.2</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -259,6 +268,7 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<scope>test</scope>
+ <version>1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -304,11 +314,13 @@
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-core</artifactId>
+ <version>${directory-server-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-server-jndi</artifactId>
+ <version>${directory-server-version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
--
GitLab