diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-08-08 10:28:55 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-08-08 10:28:55 +0300 |
| commit | 5ff3e93720a1f55a8b515b2b74b7d14c99be4bc1 (patch) | |
| tree | d37f6291356dc65d9dbe1eaaac0e11c2111ff0c9 /vendor/gitlab-ci-yml | |
| parent | 4271325283cf4bb5fda5ffffbd4b8d1465834efa (diff) | |
Update templates for 11.2
Diffstat (limited to 'vendor/gitlab-ci-yml')
| -rw-r--r-- | vendor/gitlab-ci-yml/Maven.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vendor/gitlab-ci-yml/Maven.gitlab-ci.yml b/vendor/gitlab-ci-yml/Maven.gitlab-ci.yml index d5ee7ed2c13..5f9c9b2c965 100644 --- a/vendor/gitlab-ci-yml/Maven.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Maven.gitlab-ci.yml @@ -17,7 +17,7 @@ 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" + MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -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. diff --git a/vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml b/vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml index ff7bdd32239..93cb31f48c0 100644 --- a/vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml @@ -1,6 +1,6 @@ # Official language image. Look for the different tagged releases at: # https://hub.docker.com/r/library/ruby/tags/ -image: "ruby:2.4" +image: "ruby:2.5" # Pick zero or more services to be used on all builds. # Only needed when using a docker container to run your tests in. |