From a64ba867efe0c30e19542cf63b2bb3252941f009 Mon Sep 17 00:00:00 2001
From: Tim Rizzi <trizzi@gitlab.com>
Date: Tue, 7 May 2019 18:23:52 +0000
Subject: [PATCH 1/2] Update lib/gitlab/ci/templates/Maven.gitlab-ci.yml

---
 lib/gitlab/ci/templates/Maven.gitlab-ci.yml | 56 ++++-----------------
 1 file changed, 11 insertions(+), 45 deletions(-)

diff --git a/lib/gitlab/ci/templates/Maven.gitlab-ci.yml b/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
index c9838c7a7ff8d1..3fa132802cd327 100644
--- a/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
@@ -1,18 +1,14 @@
----
+# 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.
-#
+
+# This template will build and test your projects
 # * 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.
 
 variables:
   # This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.
@@ -42,59 +38,29 @@ cache:
 .verify: &verify
   stage: test
   script:
-    - 'mvn $MAVEN_CLI_OPTS verify site site:stage'
+    - 'mvn $MAVEN_CLI_OPTS verify'
   except:
     - master
 
-# Validate merge requests using JDK7
-validate:jdk7:
-  <<: *validate
-  image: maven:3.3.9-jdk-7
-
 # Validate merge requests using JDK8
 validate:jdk8:
   <<: *validate
   image: maven:3.3.9-jdk-8
 
-# Verify merge requests using JDK7
-verify:jdk7:
-  <<: *verify
-  image: maven:3.3.9-jdk-7
-
 # Verify merge requests using JDK8
 verify:jdk8:
   <<: *verify
   image: maven:3.3.9-jdk-8
 
 # For `master` branch run `mvn deploy` automatically.
-# Here you need to decide whether you want to use JDK7 or 8.
-# To get this working you need to define a volume while configuring your gitlab-ci-multi-runner.
-# Mount your `settings.xml` as `/root/.m2/settings.xml` which holds your secrets.
-# See https://maven.apache.org/settings.html
 deploy:jdk8:
-  # Use stage test here, so the pages job may later pickup the created site.
-  stage: test
-  script:
-    - 'mvn $MAVEN_CLI_OPTS deploy site site:stage'
-  only:
-    - master
-  # Archive up the built documentation site.
-  artifacts:
-    paths:
-    - target/staging
-  image: maven:3.3.9-jdk-8
-
-pages:
-  image: busybox:latest
   stage: deploy
   script:
-    # Because Maven appends the artifactId automatically to the staging path if you did define a parent pom,
-    # you might need to use `mv target/staging/YOUR_ARTIFACT_ID public` instead.
-    - mv target/staging public
-  dependencies:
-    - deploy:jdk8
-  artifacts:
-    paths:
-    - public
+    - if [ ! -f ci_settings.xml ];
+        then echo CI settings missing, please see https://gitlab.com/help/user/project/packages/maven_repository.md#creating-maven-packages-with-gitlab-cicd for instructions.;
+      fi
+    - 'cp ci_settings.xml /root/.m2/settings.xml'
+    - 'mvn $MAVEN_CLI_OPTS deploy'
   only:
     - master
+  image: maven:3.3.9-jdk-8
-- 
GitLab


From fd5f83549a02e49a63edc5dc47ae984a8301af5a Mon Sep 17 00:00:00 2001
From: Tim Rizzi <trizzi@gitlab.com>
Date: Thu, 9 May 2019 23:14:00 +0000
Subject: [PATCH 2/2] Remove extra validate step and fix commit message

---
 lib/gitlab/ci/templates/Maven.gitlab-ci.yml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/lib/gitlab/ci/templates/Maven.gitlab-ci.yml b/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
index 3fa132802cd327..8ed836f099c683 100644
--- a/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
@@ -25,14 +25,6 @@ cache:
   paths:
     - .m2/repository
 
-# 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
-  stage: build
-  script:
-    - 'mvn $MAVEN_CLI_OPTS test-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
@@ -42,11 +34,6 @@ cache:
   except:
     - master
 
-# Validate merge requests using JDK8
-validate:jdk8:
-  <<: *validate
-  image: maven:3.3.9-jdk-8
-
 # Verify merge requests using JDK8
 verify:jdk8:
   <<: *verify
-- 
GitLab