diff --git a/.travis.yml b/.travis.yml index 35f6909..7b61e12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ env: - BOOST_SHA256: '8211e639fd443cbffed7891af9c54012848d04df340ee993bedb3ef0346347c3' - DOCKERHUB_USER: 'abrarov' - MAVEN_WRAPPER: '0' + - DOCKER_MAVEN_PLUGIN_VERSION: '0.34-dev' matrix: include: diff --git a/app/pom.xml b/app/pom.xml index 4179f7a..152d6c4 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -12,7 +12,7 @@ pom - ${project.build.directory}/app.tar.gz + ${project.build.directory}/${builder.output.fileName} @@ -26,35 +26,30 @@ - - org.apache.maven.plugins - maven-antrun-plugin + io.fabric8 + docker-maven-plugin copy-from-image generate-resources - run + copy - - - - - - - - + + + ${builder.image.repository}:${project.version} + + + + ${builder.output.file} + ${project.build.directory} + + + + + + true diff --git a/pom.xml b/pom.xml index 08a9a9e..b18ae00 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,6 @@ 3.0.0-M3 4.0.2 3.2.0 - 3.0.0 3.1.2 3.1.0 1.6.0 @@ -47,7 +46,8 @@ abrarov ${docker.image.registry}/maven-docker-builder-builder - /out.tar.gz + out.tar.gz + /${builder.output.fileName} @@ -99,11 +99,6 @@ build-helper-maven-plugin ${build-helper-maven-plugin.version} - - org.apache.maven.plugins - maven-antrun-plugin - ${maven-antrun-plugin.version} - org.apache.maven.plugins maven-dependency-plugin diff --git a/travis/settings.xml b/travis/settings.xml new file mode 100644 index 0000000..17846e6 --- /dev/null +++ b/travis/settings.xml @@ -0,0 +1,32 @@ + + + + + + + + false + + bintray-mabrarov-maven + bintray + https://dl.bintray.com/mabrarov/maven + + + + + + false + + bintray-mabrarov-maven + bintray-plugins + https://dl.bintray.com/mabrarov/maven + + + bintray + + + + bintray + +