From 4b0d0b08b91ec51ce67083c2a3795914b3d0544e Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Thu, 8 Dec 2016 13:45:53 +0100
Subject: [PATCH] #262 - Dependency upgrades.

Jackson 2.8.1 -> 2.8.5
JodaTime 2.9.4 -> 2.9.6
Lombok 1.6.10 -> 1.6.12
Querydsl 4.1.3 -> 4.1.4
RxJava 1.1.8 -> 1.2.3

Asciidoctor Plugin 1.5.3 -> 1.5.4.1
Assembly Plugin 2.6 -> 3.0.0
Compiler Plugin 3.3 -> 3.6.0
JAR Plugin 2.6 -> 3.0.2
JavaDoc Plugin 2.10.3 -> 2.10.4
Source Plugin 3.0.0 -> 3.0.1
---
 parent/pom.xml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index de27523f..0c590ae8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -93,16 +93,16 @@
 		<commons-io>2.5</commons-io>
 		<guava>19.0</guava>
 		<hamcrest>1.3</hamcrest>
-		<jackson>2.8.1</jackson>
+		<jackson>2.8.5</jackson>
 		<jacoco>0.7.7.201606060606</jacoco>
-		<jodatime>2.9.4</jodatime>
+		<jodatime>2.9.6</jodatime>
 		<jsonpath>2.2.0</jsonpath>
 		<junit>4.12</junit>
 		<logback>1.1.7</logback>
-		<lombok>1.16.10</lombok>
+		<lombok>1.16.12</lombok>
 		<mockito>1.10.19</mockito>
-		<querydsl>4.1.3</querydsl>
-		<rxjava>1.1.8</rxjava>
+		<querydsl>4.1.4</querydsl>
+		<rxjava>1.2.3</rxjava>
 		<slf4j>1.7.21</slf4j>
 		<spring>4.3.4.RELEASE</spring>
 		<spring-hateoas>0.22.0.BUILD-SNAPSHOT</spring-hateoas>
@@ -670,7 +670,7 @@
 				<plugin>
 					<groupId>org.asciidoctor</groupId>
 					<artifactId>asciidoctor-maven-plugin</artifactId>
-					<version>1.5.3</version>
+					<version>1.5.4.1</version>
 				</plugin>
 
 				<plugin>
@@ -682,13 +682,13 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.6</version>
+					<version>3.0.0</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.3</version>
+					<version>3.6.0</version>
 				</plugin>
 
 				<plugin>
@@ -706,19 +706,19 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>2.6</version>
+					<version>3.0.2</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
-					<version>2.10.3</version>
+					<version>2.10.4</version>
 				</plugin>
 
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-source-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>3.0.1</version>
 				</plugin>
 
 				<plugin>
@@ -768,7 +768,9 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
-					<useDefaultManifestFile>true</useDefaultManifestFile>
+					<archive>
+						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+					</archive>
 				</configuration>
 			</plugin>