diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83d630d41e6..67681e6abed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,58 +1,27 @@ -# This file is a template, and might need editing before it works on your project. ---- -# Build JAVA applications using Apache Maven (http://maven.apache.org) -# For docker image tags see https://hub.docker.com/_/maven/ -# -# For general lifecycle information see https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html -# -# This template will build and test your projects as well as create the documentation. -# -# * Caches downloaded dependencies and plugins between invocation. -# * Verify but don't deploy merge requests. -# * Deploy built artifacts from master branch only. -# * Shows how to use multiple jobs in test stage for verifying functionality -# with multiple JDKs. -# * Uses site:stage to collect the documentation for multi-module projects. -# * Publishes the documentation for `master` branch. +image: maven:latest variables: - # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. - # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. - MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" - # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used - # when running from the command line. - # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. - MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true" + MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode" + MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository" -# Cache downloaded dependencies and plugins between builds. -# To keep cache across branches add 'key: "$CI_JOB_NAME"' cache: paths: - - .m2/repository + - .m2/repository/ + - target/ -# This will only validate and compile stuff and run e.g. maven-enforcer-plugin. -# Because some enforcer rules might check dependency convergence and class duplications -# we use `test-compile` here instead of `validate`, so the correct classpath is picked up. -.validate: &validate +build: stage: build script: - - 'mvn $MAVEN_CLI_OPTS test-compile' + - mvn $MAVEN_CLI_OPTS compile -# For merge requests do not `deploy` but only run `verify`. -# See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html -.verify: &verify +test: stage: test script: - - 'mvn $MAVEN_CLI_OPTS verify site site:stage' - except: - - master + - mvn $MAVEN_CLI_OPTS test -# Validate merge requests using JDK8 -validate:jdk8: - <<: *validate - image: maven:3.3.9-jdk-8 - -# Verify merge requests using JDK8 -verify:jdk8: - <<: *verify - image: maven:3.3.9-jdk-8 +deploy: + stage: deploy + script: + - mvn $MAVEN_CLI_OPTS deploy + only: + - master \ No newline at end of file diff --git a/.m2/settings.xml b/.m2/settings.xml new file mode 100644 index 00000000000..2887370c47f --- /dev/null +++ b/.m2/settings.xml @@ -0,0 +1,12 @@ + + + + maven-snapshots + ${env.MAVEN_REPO_USER} + ${env.MAVEN_REPO_PASS} + + + diff --git a/pom.xml b/pom.xml index d7c50f7fae7..9e24f2a2e1e 100644 --- a/pom.xml +++ b/pom.xml @@ -2083,4 +2083,11 @@ + + + maven-snapshots + http://104.215.188.88/repository/maven-snapshots/ + + +