Update Gradle version up to 5.1-rc-3.

daggerok · Dec 24, 2018 · 7a9d42f · 7a9d42f
1 parent 5bf22ba
commit 7a9d42f
Show file tree

Hide file tree

Showing 33 changed files with 1,718 additions and 1,932 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/generators/app/templates/java-akka-actor/.travis.yml b/generators/app/templates/java-akka-actor/.travis.yml
@@ -3,66 +3,66 @@ notifications:
 
 env:
   global:
-  - TERM=dumb
+    - TERM=dumb
 
 language: java
 jdk: oraclejdk8
 
 service:
-- docker
+  - docker
 
 addons:
   apt:
     sources:
-    - google-chrome
+      - google-chrome
     packages:
-    - google-chrome-stable
-    - libappindicator1
-    - fonts-liberation
-    - bash
-    - curl
-    - libxml2-utils
-    - docker-ce
+      - google-chrome-stable
+      - libappindicator1
+      - fonts-liberation
+      - bash
+      - curl
+      - libxml2-utils
+      - docker-ce
 
 install: true
 before_install:
-- sudo apt-get update -yqq >/dev/null
-- sudo apt-get install -yqq --no-install-suggests --no-install-recommends
-  tree jq python-pip curl bash sudo >/dev/null
-#
-- sudo pip install docker-compose httpie >/dev/null 2>&1
-#
-- source <(curl -s https://raw.githubusercontent.com/daggerok/bash-functions/master/main.bash)
-- stop_any 8080 3000 80 >/dev/null
+  - sudo apt-get update -yqq >/dev/null
+  - sudo apt-get install -yqq --no-install-suggests --no-install-recommends
+    tree jq python-pip curl bash sudo >/dev/null
+  #
+  - sudo pip install docker-compose httpie >/dev/null 2>&1
+  #
+  - source <(curl -s https://raw.githubusercontent.com/daggerok/bash-functions/master/main.bash)
+  - stop_any 8080 3000 80 >/dev/null
 
 script:
-- export root=$(pwd)
-#
-- bash gradlew >/dev/null 2>&1
-- java -jar ./build/libs/*.jar
-#
-- bash gradlew clean installDist >/dev/null 2>&1
-- bash ./build/install/<%= projectDirectory %>/bin/<%= projectDirectory %>
-#
-- bash gradlew clean distZip >/dev/null 2>&1
-- unzip -o ./build/distributions/<%= projectDirectory %>-0.0.1.zip -d /tmp
-- bash /tmp/<%= projectDirectory %>-0.0.1/bin/<%= projectDirectory %>
-#
-- bash gradlew clean build composeUp
-- bash gradlew composeDown
-#
-- bash mvnw clean package >/dev/null 2>&1
-- java -jar target/*-all.jar
-#
-- bash mvnw docker-compose:up -P docker
-- bash mvnw docker-compose:down -P docker
+  - export root=$(pwd)
+  #
+  - bash gradlew >/dev/null 2>&1
+  - java -jar ./build/libs/*.jar
+  #
+  - bash gradlew clean installDist >/dev/null 2>&1
+  - bash ./build/install/<%= projectDirectory %>/bin/<%= projectDirectory %>
+  #
+  - bash gradlew clean distZip >/dev/null 2>&1
+  - unzip -o ./build/distributions/<%= projectDirectory %>-0.0.1.zip -d /tmp
+  - bash /tmp/<%= projectDirectory %>-0.0.1/bin/<%= projectDirectory %>
+  #
+  - bash gradlew clean build composeUp
+  - bash gradlew composeDown
+  #
+  - bash mvnw clean package >/dev/null 2>&1
+  - java -jar target/*-all.jar
+  #
+  - bash mvnw docker-compose:up -P docker
+  - bash mvnw docker-compose:down -P docker
 
 before_deploy:
-- cd ${root}
-#- ./gradlew documentation -Dorg.gradle.jvmargs='-Xmx1g'
-- ./mvnw -Pdocs
-- mkdir -p ./target/generated-docs
-- cp -Rf ./target/generated-docs/index.html ./target/generated-docs/404.html
+  - cd ${root}
+  #- ./gradlew documentation -Dorg.gradle.jvmargs='-Xmx1g'
+  - ./mvnw -Pdocs
+  - mkdir -p ./target/generated-docs
+  - cp -Rf ./target/generated-docs/index.html ./target/generated-docs/404.html
 
 deploy:
   provider: pages
@@ -76,12 +76,10 @@ deploy:
   target_branch: gh-pages
 
 before_cache:
-- for item in $(find ~/.gradle -name "*.lock");
-    do sudo rm -rf $item ;
-  done
+  - for item in $(find ~/.gradle -name "*.lock") ; do sudo rm -rf $item ; done
 
 cache:
   directories:
-  - $HOME/.m2
-  - $HOME/.gradle
-  - $HOME/.docker
+    - $HOME/.m2
+    - $HOME/.gradle
+    - $HOME/.docker
diff --git a/generators/app/templates/java-ee-cdi-full-multi-project/.travis.yml b/generators/app/templates/java-ee-cdi-full-multi-project/.travis.yml
@@ -3,94 +3,87 @@ notifications:
 
 env:
   global:
-  - TERM=dumb
+    - TERM=dumb
 
 language: java
 jdk: oraclejdk8
 
 service:
-- docker
+  - docker
 
 addons:
   apt:
     sources:
-    - google-chrome
+      - google-chrome
     packages:
-    - google-chrome-stable
-    - libappindicator1
-    - fonts-liberation
-    - bash
-    - curl
-    - libxml2-utils
-    - docker-ce
+      - google-chrome-stable
+      - libappindicator1
+      - fonts-liberation
+      - bash
+      - curl
+      - libxml2-utils
+      - docker-ce
 
 install: true
 before_install:
-- export CHROME_BIN=/usr/bin/google-chrome
-- export DISPLAY=:99.0
-- sh -e /etc/init.d/xvfb start
-#
-- sudo add-apt-repository universe -y >/dev/null
-- echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list >/dev/null
-- sudo apt-get update -yqq >/dev/null
-- sudo apt-get install -yqq --no-install-suggests --no-install-recommends
-  tree jq python-pip curl bash sudo >/dev/null
-#
-- sudo pip install docker-compose httpie >/dev/null 2>&1
-#
-- source <(curl -s https://raw.githubusercontent.com/daggerok/bash-functions/master/main.bash)
-- stop_any 8080 3000 80 >/dev/null
-#
-- curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - >/dev/null
-- echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list >/dev/null
-- sudo apt-get update -yqq >/dev/null
-- sudo apt-get install -yqq --no-install-suggests --no-install-recommends yarn >/dev/null
+  - export CHROME_BIN=/usr/bin/google-chrome
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  #
+  - sudo apt-get update -yqq >/dev/null
+  - sudo apt-get install -yqq --no-install-suggests --no-install-recommends
+    tree jq python-pip curl bash sudo >/dev/null
+  #
+  - sudo pip install docker-compose httpie >/dev/null 2>&1
+  #
+  - source <(curl -s https://raw.githubusercontent.com/daggerok/bash-functions/master/main.bash)
+  - stop_any 8080 3000 80 >/dev/null
 
 script:
-- export root=$(pwd)
-#
-# maven
-- bash ./mvnw >/dev/null
-- bash ./mvnw -pl ear docker-compose:up -P docker >/dev/null
-- wait_for 8080
-- docker logs -f ear_<%= projectDirectory %>_1 &
-- sleep 35
-- http :8080/web/
-- http --form :8080/servlet/api/ name=Max
-- http post :8080/rest/api/ name=Maksim
-- http :8080/jsp/
-- bash ./mvnw -pl ear docker-compose:down -P docker >/dev/null 2>&1
-- stop_any 8080 80
-# gradle
-- bash ./gradlew >/dev/null
-- bash ./gradlew composeUp >/dev/null
-- sleep 3
-- wait_for 8080
-- docker logs -f ear_<%= projectDirectory %>_1 &
-- http :8080/web/
-- http --form :8080/servlet/api/ name=Maksim
-- http post :8080/rest/api/ name=Maksimko
-- http :8080/jsp/
-- bash ./gradlew composeDown >/dev/null 2>&1
-- stop_any 8080 80
-# gradle (maven profile)
-- bash ./gradlew -Pprofile=maven clean build composeUp >/dev/null
-- wait_for 8080
-- docker logs -f ear_<%= projectDirectory %>_1 &
-- sleep 3
-- http :8080/web/
-- http --form :8080/servlet/api/ name=Maksimko
-- http post :8080/rest/api/ buddy=Max
-- http :8080/jsp/
-- bash ./gradlew -Pprofile=maven composeDown >/dev/null 2>&1
-- stop_any 8080 80
+  - export root=$(pwd)
+  #
+  # maven
+  - bash ./mvnw >/dev/null
+  - bash ./mvnw -pl ear docker-compose:up -P docker >/dev/null
+  - wait_for 8080
+  - docker logs -f ear_<%= projectDirectory %>_1 &
+  - sleep 35
+  - http :8080/web/
+  - http --form :8080/servlet/api/ name=Max
+  - http post :8080/rest/api/ name=Maksim
+  - http :8080/jsp/
+  - bash ./mvnw -pl ear docker-compose:down -P docker >/dev/null 2>&1
+  - stop_any 8080 80
+  # gradle
+  - bash ./gradlew >/dev/null
+  - bash ./gradlew composeUp >/dev/null
+  - sleep 3
+  - wait_for 8080
+  - docker logs -f ear_<%= projectDirectory %>_1 &
+  - http :8080/web/
+  - http --form :8080/servlet/api/ name=Maksim
+  - http post :8080/rest/api/ name=Maksimko
+  - http :8080/jsp/
+  - bash ./gradlew composeDown >/dev/null 2>&1
+  - stop_any 8080 80
+  # gradle (maven profile)
+  - bash ./gradlew -Pprofile=maven clean build composeUp >/dev/null
+  - wait_for 8080
+  - docker logs -f ear_<%= projectDirectory %>_1 &
+  - sleep 3
+  - http :8080/web/
+  - http --form :8080/servlet/api/ name=Maksimko
+  - http post :8080/rest/api/ buddy=Max
+  - http :8080/jsp/
+  - bash ./gradlew -Pprofile=maven composeDown >/dev/null 2>&1
+  - stop_any 8080 80
 
 before_deploy:
-- cd ${root}
-#- ./gradlew documentation -Dorg.gradle.jvmargs='-Xmx1g'
-- ./mvnw -Pdocs
-- mkdir -p ./target/generated-docs
-- cp -Rf ./target/generated-docs/index.html ./target/generated-docs/404.html
+  - cd ${root}
+  #- ./gradlew documentation -Dorg.gradle.jvmargs='-Xmx1g'
+  - ./mvnw -Pdocs
+  - mkdir -p ./target/generated-docs
+  - cp -Rf ./target/generated-docs/index.html ./target/generated-docs/404.html
 
 deploy:
   provider: pages
@@ -104,12 +97,12 @@ deploy:
   target_branch: gh-pages
 
 before_cache:
-- for item in $(find ~/.gradle -name "*.lock");
-    do sudo rm -rf $item ;
-  done
+  - for item in $(find ~/.gradle -name "*.lock") ;
+      do sudo rm -rf $item ;
+    done
 
 cache:
   directories:
-  - $HOME/.m2
-  - $HOME/.gradle
-  - $HOME/.docker
+    - $HOME/.m2
+    - $HOME/.gradle
+    - $HOME/.docker