diff --git a/.gitignore b/.gitignore index 6d0cb1ce1..f339c61bb 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 2c41867b9..6a79335f3 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 01bca263f..8723fe082 100644 --- a/pom.xml +++ b/pom.xml @@ -311,10 +311,12 @@ + org.apache.maven.plugins maven-assembly-plugin + org.asciidoctor asciidoctor-maven-plugin @@ -339,6 +341,38 @@ + + + org.codehaus.mojo + flatten-maven-plugin + 1.1.0 + + + flatten + process-resources + + flatten + + + true + oss + + keep + keep + expand + remove + + + + + flatten-clean + clean + + clean + + + + @@ -359,7 +393,6 @@ -