From 5ef8285288af4078d9b74a57c767006d5b98e9f7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Fri, 13 Sep 2019 11:02:53 +0200
Subject: [PATCH] #181 - Remove repositories declaration from published pom.

We now use the Maven flatten plugin to remove repositories from the POM.

Also remove Java 8 from TravisCI as Java 8 can no longer be installed on Travis.
---
 .gitignore  |  1 +
 .travis.yml | 10 ++++++----
 pom.xml     | 35 ++++++++++++++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6d0cb1ce..f339c61b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ target/
 .idea/
 .settings/
 *.iml
+.flattened-pom.xml
 .project
 .classpath
 .springBeans
diff --git a/.travis.yml b/.travis.yml
index 2c41867b..6a79335f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,6 @@ language: java
 
 matrix:
   include:
-    - jdk: oraclejdk8
-      env: JDK='Oracle JDK 8'
     - jdk: oraclejdk9
       env: JDK='Oracle JDK 9'
     - env:
@@ -14,6 +12,10 @@ matrix:
       - JDK='Oracle JDK 11'
       - NO_JACOCO='true'
       before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -F 11
+    - env:
+      - JDK='Oracle JDK 12'
+      - NO_JACOCO='true'
+      before_install: wget https://github.com/sormuras/bach/raw/master/install-jdk.sh && . ./install-jdk.sh -F 12
 
 cache:
   directories:
@@ -28,5 +30,5 @@ services:
 install: true
 
 script:
-  - "mvn -version"
-  - "mvn clean dependency:list test -Pall-dbs${NO_JACOCO:+',no-jacoco'} -Dsort -U"
+  - "./mvnw -version"
+  - "./mvnw clean dependency:list test -Pall-dbs${NO_JACOCO:+',no-jacoco'} -Dsort -U"
diff --git a/pom.xml b/pom.xml
index 01bca263..8723fe08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -311,10 +311,12 @@
 					</execution>
 				</executions>
 			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
 			</plugin>
+
 			<plugin>
 				<groupId>org.asciidoctor</groupId>
 				<artifactId>asciidoctor-maven-plugin</artifactId>
@@ -339,6 +341,38 @@
 					</attributes>
 				</configuration>
 			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<executions>
+					<execution>
+						<id>flatten</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>flatten</goal>
+						</goals>
+						<configuration>
+							<updatePomFile>true</updatePomFile>
+							<flattenMode>oss</flattenMode>
+							<pomElements>
+								<pluginManagement>keep</pluginManagement>
+								<properties>keep</properties>
+								<parent>expand</parent>
+								<repositories>remove</repositories>
+							</pomElements>
+						</configuration>
+					</execution>
+					<execution>
+						<id>flatten-clean</id>
+						<phase>clean</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
@@ -359,7 +393,6 @@
 					</plugin>
 				</plugins>
 			</build>
-
 		</profile>
 	</profiles>