From 2b396718020d65a81f242035df0b994a98bcd043 Mon Sep 17 00:00:00 2001
From: bikebilly <fabio@gitlab.com>
Date: Wed, 18 Apr 2018 09:25:13 +0200
Subject: [PATCH] Add Auto DevOps changes

---
 .gitlab-ci.yml | 35 -----------------------------------
 README.md      | 13 +++++++++++--
 2 files changed, 11 insertions(+), 37 deletions(-)
 delete mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 55a5af7..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Use Maven 3.5 and JDK8
-image: maven:3.5-jdk-8
-
-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"
-
-# Cache downloaded dependencies and plugins between builds.
-# To keep cache across branches add 'key: "$CI_JOB_REF_NAME"'
-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.
-compile:
-  stage: build
-  script:
-    - 'mvn $MAVEN_CLI_OPTS test-compile'
-
-# Run `verify`.
-# See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
-verify:
-  stage: test
-  script:
-    - 'mvn $MAVEN_CLI_OPTS verify'
-  artifacts:
-    paths:
-    - target/*.jar
\ No newline at end of file
diff --git a/README.md b/README.md
index 4220903..251c844 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,12 @@
-This project is created from a GitLab [Project Template](https://docs.gitlab.com/ce/gitlab-basics/create-project.html)
+### Java Spring template project
 
-Additions and changes to the project can be proposed [on the original project](https://gitlab.com/gitlab-org/project-templates/spring)
+This project is based on a GitLab [Project Template](https://docs.gitlab.com/ee/gitlab-basics/create-project.html)
+
+Additions and changes to the project can be proposed in the [original project](https://gitlab.com/gitlab-org/project-templates/spring)
+
+### CI/CD with Auto DevOps
+
+This template is compatible with [Auto DevOps](https://docs.gitlab.com/ee/topics/autodevops/).
+
+If Auto DevOps is not already enabled for this project, you can [turn it on](https://docs.gitlab.com/ee/topics/autodevops/#enabling-auto-devops)
+in the project settings. Otherwise, you can create a custom `.gitlab-ci.yml` file and customize it.
-- 
GitLab