update travis anf gitbook

daggerok · Mar 5, 2018 · 505a265 · 505a265
1 parent 448aaf4
commit 505a265
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 63 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,65 +1,54 @@
-group: edge
-dist: trusty
-
+service:
+- docker
+group: trusty_lts
 env:
   global:
     TERM=dumb
-
 language: java
 jdk:
   - openjdk8
   - oraclejdk8
-
 install: true
 before_install:
-
-  # install docker-compose
-  - sudo apt update
-  - sudo apt install -y python-pip curl jq libxml2-utils
-  - sudo pip install docker-compose httpie
-  - sudo usermod -aG docker $(whoami)
-
-  # kill whatever punning on postgres / rabbitmq port
-  - sudo kill $(sudo lsof -t -i:5432) | true
-  - sudo kill $(sudo lsof -t -i:5672) | true
-  - sudo kill $(sudo lsof -t -i:27017) | true
-
+# install docker-compose
+- sudo apt update -y || true
+- sudo apt install -y --no-install-recommends docker-ce python-pip curl jq libxml2-utils
+- sudo pip install docker-compose httpie
+# kill on ports
+- source <(curl -s https://raw.githubusercontent.com/daggerok/bash-functions/master/main.bash)
+- stop_any 5432 5672 27017 3000 8000 8080 80 27017 5672 5432
 script:
-  ## gitbbok
-  #- bash gradlew buildDocs
-
-  # all
-  - export ROOT=$PWD
-  - >
-    for path in \
-      spring-integration-5-example-02 \
-      spring-integration-5-example-01 \
-    ; do
-      export TARGET="$ROOT/$path"
-      cd $TARGET
-      bash gradlew clean build
-    done;
-
-  # 01 e2e
-  - cd $ROOT/spring-integration-5-example-01
-  - bash gradlew clean build
-  - sudo mkdir -p /var/app
-  - sudo mv -f ./build/libs/*.jar /var/app/01.jar
-  - sudo ln -s /var/app/01.jar /etc/init.d/01
-  - sudo service 01 start
-  - sleep 15
-  - curl localhost:8080/sse &
-  - sleep 1
-  - sudo service 01 stop
+- export ROOT=$PWD
+## gitbbok
+- cd $ROOT/gitbbok
+- bash gradlew clean buildDocs
+# all
+- >
+  for path in \
+    spring-integration-5-example-02 \
+    spring-integration-5-example-01 \
+  ; do
+    export TARGET="$ROOT/$path"
+    cd $TARGET
+    bash gradlew clean build
+  done;
+
+# 01 e2e
+- cd $ROOT/spring-integration-5-example-01
+- bash gradlew clean build
+- sudo mkdir -p /var/app
+- sudo mv -f ./build/libs/*.jar /var/app/01.jar
+- sudo ln -s /var/app/01.jar /etc/init.d/01
+- sudo service 01 start
+- sleep 15
+- curl localhost:8080/sse &
+- sleep 1
+- sudo service 01 stop
 
 after_script:
-  - bash gradlew --stop
-
-before_cache:
-  - rm -rf $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -rf $HOME/.gradle/caches/*/plugin-resolution/
+- bash gradlew --stop
 
 cache:
   directories:
-    - docs/
-    - gitbook/node_modules/
+  - docs/
+  - gitbook/node_modules/
diff --git a/docs/404.html b/docs/404.html
@@ -55,7 +55,7 @@
         data-chapter-title="Introduction"
         data-filepath="README.md"
         data-basepath="."
-        data-revision="Thu Oct 05 2017 05:50:37 GMT+0300 (EEST)"
+        data-revision="Tue Mar 06 2018 00:47:14 GMT+0200 (EET)"
         data-innerlanguage="">
 
 

diff --git a/docs/index.html b/docs/index.html
@@ -55,7 +55,7 @@
         data-chapter-title="Introduction"
         data-filepath="README.md"
         data-basepath="."
-        data-revision="Thu Oct 05 2017 05:50:37 GMT+0300 (EEST)"
+        data-revision="Tue Mar 06 2018 00:47:14 GMT+0200 (EET)"
         data-innerlanguage="">
 
 

diff --git a/docs/projects/01.html b/docs/projects/01.html
@@ -57,7 +57,7 @@
         data-chapter-title="Spring Integration 5 example"
         data-filepath="projects/01.md"
         data-basepath=".."
-        data-revision="Thu Oct 05 2017 05:50:37 GMT+0300 (EEST)"
+        data-revision="Tue Mar 06 2018 00:47:14 GMT+0200 (EET)"
         data-innerlanguage="">
 
 

diff --git a/docs/projects/02.html b/docs/projects/02.html
@@ -55,7 +55,7 @@
         data-chapter-title="Spring Integration 5 example"
         data-filepath="projects/02.md"
         data-basepath=".."
-        data-revision="Thu Oct 05 2017 05:50:37 GMT+0300 (EEST)"
+        data-revision="Tue Mar 06 2018 00:47:14 GMT+0200 (EET)"
         data-innerlanguage="">
 
 

diff --git a/gitbook/build.gradle b/gitbook/build.gradle
@@ -9,27 +9,33 @@ sourceSets {
 }
 
 node {
+  download = true
   version = "5.12.0"
   npmVersion = "5.3.0"
   yarnVersion = "v0.24.5"
-  distBaseUrl = "http://nodejs.org/dist"
-  download = true
   workDir = file("$project.buildDir/nodejs")
 }
+clean.doFirst {
+  [
+      "out", 
+      "build", 
+      ".gradle",
+      "yarn.lock",
+      "node_modules",
+      "package-lock.json",
+
+  ].each { delete "$projectDir/$it" }
 
-clean {
-  delete "$buildDir"
-  delete "$projectDir/node_modules"
   delete "$rootDir/docs"
-  delete "$projectDir/package-lock.json"
-  delete "$projectDir/yarn.lock"
 }
 
 task buildDocs(dependsOn: [npm_run_docs])
 buildDocs.dependsOn examplesClasses
 assemble.dependsOn buildDocs
 
 task wrapper(type: Wrapper) {
-  gradleVersion = "4.3"
+  gradleVersion = "4.6"
   distributionType = "ALL"
 }
+
+defaultTasks "clean", "build"
diff --git a/gitbook/gradle/wrapper/gradle-wrapper.jar b/gitbook/gradle/wrapper/gradle-wrapper.jar
diff --git a/gitbook/gradle/wrapper/gradle-wrapper.properties b/gitbook/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip