From af3b10d2af173996365b299e0b6ba2b2b597a7be Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <odrotbohm@pivotal.io>
Date: Fri, 1 Feb 2019 15:39:32 +0100
Subject: [PATCH] #46 - Upgrade dependencies.

Upgrade to Spring 5.1.4. Removed obsolete exclusions of Commons Logging. Introduced automatic module names. Set build encoding to UTF-8.

Upgrade to Slf4j 1.7.25, Logback 1.2.3, Maven Compiler Plugin 3.8, Maven Source 3.0.1, Maven JAR Plugin 3.1.1, Maven Javadoc Plugin 3.0.1.
---
 core/pom.xml     | 10 ++++------
 metadata/pom.xml |  4 ++++
 pom.xml          | 30 ++++++++++++++++++++----------
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 87af4e7..0f393b2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -13,18 +13,16 @@
 		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
+	<properties>
+		<java-module-name>spring.plugin.core</java-module-name>
+	</properties>
+
 	<dependencies>
 	
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
 			<version>${spring.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		
 		<dependency>
diff --git a/metadata/pom.xml b/metadata/pom.xml
index b8d821d..873e50c 100644
--- a/metadata/pom.xml
+++ b/metadata/pom.xml
@@ -12,6 +12,10 @@
 		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 
+	<properties>
+		<java-module-name>spring.plugin.metadata</java-module-name>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/pom.xml b/pom.xml
index 0453ce2..ec51de2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,10 @@
 	</modules>
 
 	<properties>
-		<spring.version>5.0.0.M3</spring.version>
-		<slf4j.version>1.7.22</slf4j.version>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<spring.version>5.1.4.RELEASE</spring.version>
+		<slf4j.version>1.7.25</slf4j.version>
+		<java-module-name>spring.plugin</java-module-name>
 	</properties>
 
 	<developers>
@@ -66,7 +68,7 @@
 		<profile>
 			<id>spring5-next</id>
 			<properties>
-				<spring.version>5.0.0.BUILD-SNAPSHOT</spring.version>
+				<spring.version>5.1.5.BUILD-SNAPSHOT</spring.version>
 			</properties>
 			<repositories>
 				<repository>
@@ -115,7 +117,7 @@
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.1.7</version>
+			<version>1.2.3</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -126,7 +128,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.5</version>
+				<version>3.8.0</version>
 				<configuration>
 					<source>1.8</source>
 					<target>1.8</target>
@@ -136,7 +138,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.4</version>
+				<version>3.0.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -150,16 +152,22 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.6</version>
+				<version>3.1.1</version>
 				<configuration>
-					<useDefaultManifestFile>true</useDefaultManifestFile>
+					<archive>
+						<manifestEntries>
+							<Implementation-Title>${project.name}</Implementation-Title>
+							<Implementation-Version>${project.version}</Implementation-Version>
+							<Automatic-Module-Name>${java-module-name}</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
 				</configuration>
 			</plugin>
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.3</version>
+				<version>3.0.1</version>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
@@ -169,7 +177,9 @@
 					</execution>
 				</executions>
 				<configuration>
-					<additionalparam>-Xdoclint:none</additionalparam>
+					<additionalJOptions>
+						<additionalJOption>-Xdoclint:none</additionalJOption>
+					</additionalJOptions>
 				</configuration>
 			</plugin>