Update version to 1.4.19-dev

MAIF · Jan 17, 2020 · 09ba161 · 09ba161
1 parent 4404521
commit 09ba161
Show file tree

Hide file tree

Showing 20 changed files with 50 additions and 50 deletions.
diff --git a/clients/cli/Cargo.toml b/clients/cli/Cargo.toml
@@ -3,7 +3,7 @@ authors = ["Mathieu <[email protected]>"]
 license = "ASL-2.0"
 name = "otoroshi-cli"
 readme = "readme.md"
-version = "1.4.18-dev"
+version = "1.4.18"
 
 [[bin]]
 name = "otoroshicli"

diff --git a/clients/tcp-udp-tunnel-client/client.js b/clients/tcp-udp-tunnel-client/client.js
@@ -614,7 +614,7 @@ function ProxyServer(options, optionalConfigFile) {
 
 function displayHeader() {
   console.log('')
-  console.log('Otoroshi TCP tunnel CLI, version 1.4.18-dev'.yellow)
+  console.log('Otoroshi TCP tunnel CLI, version 1.4.18'.yellow)
   console.log('')
 }
 

diff --git a/demos/basic-setup/docker-compose.yml b/demos/basic-setup/docker-compose.yml
@@ -36,7 +36,7 @@ services:
       - postgres-prod
 
   otoroshi-instance-1:
-    image: maif/otoroshi:1.4.18-dev
+    image: maif/otoroshi:1.4.18
     networks:
       - basicsetup
     environment:
@@ -53,7 +53,7 @@ services:
       - redis-slave
 
   otoroshi-instance-2:
-    image: maif/otoroshi:1.4.18-dev
+    image: maif/otoroshi:1.4.18
     networks:
       - basicsetup
     environment:

diff --git a/demos/service-mesh/docker-compose-manual.yml b/demos/service-mesh/docker-compose-manual.yml
@@ -46,7 +46,7 @@ services:
       - config-server
 
   otoroshi-service-1:
-    image: maif/otoroshi:1.4.18-dev
+    image: maif/otoroshi:1.4.18
     networks:
       - mesh
     environment:
@@ -59,7 +59,7 @@ services:
       - config-server
 
   otoroshi-service-2:
-    image: maif/otoroshi:1.4.18-dev
+    image: maif/otoroshi:1.4.18
     networks:
       - mesh
     environment:
@@ -72,7 +72,7 @@ services:
       - config-server
 
   otoroshi-service-3:
-    image: maif/otoroshi:1.4.18-dev
+    image: maif/otoroshi:1.4.18
     networks:
       - mesh
     environment:
@@ -85,7 +85,7 @@ services:
       - config-server
 
   otoroshi-service-frontend:
-    image: maif/otoroshi:1.4.18-dev
+    image: maif/otoroshi:1.4.18
     networks:
       - mesh
     ports:
@@ -99,7 +99,7 @@ services:
       - service-frontend
 
   otoroshi-gateway:
-    image: maif/otoroshi:1.4.18-dev
+    image: maif/otoroshi:1.4.18
     networks:
       - mesh
     ports:

diff --git a/demos/service-mesh/docker-compose.yml b/demos/service-mesh/docker-compose.yml
@@ -50,7 +50,7 @@ services:
         ipv4_address: 172.16.239.44
 
   otoroshi-service-1:
-    image: maif/otoroshi:1.4.18-dev
+    image: maif/otoroshi:1.4.18
     networks:
       - mesh
     environment:
@@ -75,7 +75,7 @@ services:
         ipv4_address: 172.16.239.31
 
   otoroshi-service-2:
-    image: maif/otoroshi:1.4.18-dev
+    image: maif/otoroshi:1.4.18
     networks:
       - mesh
     environment:
@@ -101,7 +101,7 @@ services:
         ipv4_address: 172.16.239.32
 
   otoroshi-service-3:
-    image: maif/otoroshi:1.4.18-dev
+    image: maif/otoroshi:1.4.18
     networks:
       - mesh
     environment:
@@ -127,7 +127,7 @@ services:
         ipv4_address: 172.16.239.33
 
   otoroshi-service-frontend:
-    image: maif/otoroshi:1.4.18-dev
+    image: maif/otoroshi:1.4.18
     networks:
       - mesh
     ports:
@@ -155,7 +155,7 @@ services:
         ipv4_address: 172.16.239.34
 
   otoroshi-gateway:
-    image: maif/otoroshi:1.4.18-dev
+    image: maif/otoroshi:1.4.18
     networks:
       - mesh
     ports:

diff --git a/docker/build/build.sh b/docker/build/build.sh
@@ -17,11 +17,11 @@ prepare_build () {
     sbt dist
     sbt assembly
     cd $LOCATION
-    cp ../../otoroshi/target/universal/otoroshi-1.4.18-dev.zip ./otoroshi-dist.zip
+    cp ../../otoroshi/target/universal/otoroshi-1.4.18.zip ./otoroshi-dist.zip
     cp ../../otoroshi/target/scala-2.12/otoroshi.jar ./otoroshi.jar
   fi
   unzip otoroshi-dist.zip
-  mv otoroshi-1.4.18-dev otoroshi
+  mv otoroshi-1.4.18 otoroshi
   rm -rf otoroshi-dist.zip
   chmod +x ./otoroshi/bin/otoroshi
   mkdir -p ./otoroshi/imports
@@ -152,21 +152,21 @@ case "${1}" in
     ;;
   build-and-push-snapshot)
     NBR=`date +%s`
-    echo "Will build version 1.4.18-dev-$NBR"
-    cp ../../otoroshi/target/universal/otoroshi-1.4.18-dev.zip otoroshi-dist.zip
+    echo "Will build version 1.4.18-$NBR"
+    cp ../../otoroshi/target/universal/otoroshi-1.4.18.zip otoroshi-dist.zip
     prepare_build
     docker build --no-cache -f ./Dockerfile-jdk11 -t otoroshi .
-    docker tag otoroshi "maif/otoroshi:1.4.18-dev-$NBR"
+    docker tag otoroshi "maif/otoroshi:1.4.18-$NBR"
     cleanup
-    docker push "maif/otoroshi:1.4.18-dev-$NBR"
+    docker push "maif/otoroshi:1.4.18-$NBR"
     ;;
   build-snapshot)
     NBR=`date +%s`
-    echo "Will build version 1.4.18-dev-$NBR"
-    cp ../../otoroshi/target/universal/otoroshi-1.4.18-dev.zip otoroshi-dist.zip
+    echo "Will build version 1.4.18-$NBR"
+    cp ../../otoroshi/target/universal/otoroshi-1.4.18.zip otoroshi-dist.zip
     prepare_build
     docker build --no-cache -f ./Dockerfile-jdk11 -t otoroshi .
-    docker tag otoroshi "maif/otoroshi:1.4.18-dev-$NBR"
+    docker tag otoroshi "maif/otoroshi:1.4.18-$NBR"
     cleanup
     ;;
   *)

diff --git a/docs/index.html b/docs/index.html
@@ -109,7 +109,7 @@ <h2>high productivity</h2>
 						</a>
           </div>
           <div class="col-md-12 col-xs-4">
-						<a href="https://github.com/MAIF/otoroshi/releases/download/v1.4.17/otoroshi.jar">
+						<a href="https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar">
 							<div class="outer-circle">
 								<div class="inner-circle">
 									<p class="inner-circle--lowerText">DOWNLOAD</p>

diff --git a/manual/build.sbt b/manual/build.sbt
@@ -1,6 +1,6 @@
 name := """otoroshi-manual"""
 organization := "fr.maif"
-version := "1.4.18-dev"
+version := "1.4.18"
 scalaVersion := "2.12.4"
 
 lazy val docs = (project in file("."))

diff --git a/manual/src/main/paradox/code/swagger.json b/manual/src/main/paradox/code/swagger.json
@@ -1,7 +1,7 @@
 {
   "swagger" : "2.0",
   "info" : {
-    "version" : "1.4.18-dev",
+    "version" : "1.4.18",
     "title" : "Otoroshi Admin API",
     "description" : "Admin API of the Otoroshi reverse proxy",
     "contact" : {

diff --git a/manual/src/main/paradox/getotoroshi/fromdocker.md b/manual/src/main/paradox/getotoroshi/fromdocker.md
@@ -5,17 +5,17 @@ If you're a Docker aficionado, Otoroshi is provided as a Docker image that your
 first, fetch the last Docker image of Otoroshi :
 
 ```sh
-docker pull maif/otoroshi:1.4.18-dev
+docker pull maif/otoroshi:1.4.18
 # or 
 docker pull maif/otoroshi:latest
 # or 
-docker pull maif/otoroshi:jdk8-1.4.18-dev
+docker pull maif/otoroshi:jdk8-1.4.18
 # or 
-docker pull maif/otoroshi:jdk11-1.4.18-dev
+docker pull maif/otoroshi:jdk11-1.4.18
 # or 
-docker pull maif/otoroshi:jdk12-1.4.18-dev
+docker pull maif/otoroshi:jdk12-1.4.18
 # or 
-docker pull maif/otoroshi:jdk13-1.4.18-dev
+docker pull maif/otoroshi:jdk13-1.4.18
 # or 
-docker pull maif/otoroshi:jdk14-1.4.18-dev
+docker pull maif/otoroshi:jdk14-1.4.18
 ```
diff --git a/manual/src/main/paradox/index.md b/manual/src/main/paradox/index.md
@@ -6,7 +6,7 @@
 > *The <a href="https://en.wikipedia.org/wiki/Gazu_Hyakki_Yagy%C5%8D#/media/File:SekienOtoroshi.jpg" target="blank">Otoroshi</a> is a large hairy monster that tends to lurk on the top of the torii gate in front of Shinto shrines. It's a hostile creature, but also said to be the guardian of the shrine and is said to leap down from the top of the gate to devour those who approach the shrine for only self-serving purposes.*
 
 @@@ div { .centered-img }
-[![Build Status](https://travis-ci.org/MAIF/otoroshi.svg?branch=master)](https://travis-ci.org/MAIF/otoroshi) [![Join the chat at https://gitter.im/MAIF/otoroshi](https://badges.gitter.im/MAIF/otoroshi.svg)](https://gitter.im/MAIF/otoroshi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [ ![Download](https://img.shields.io/github/release/MAIF/otoroshi.svg) ](hhttps://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi.jar)
+[![Build Status](https://travis-ci.org/MAIF/otoroshi.svg?branch=master)](https://travis-ci.org/MAIF/otoroshi) [![Join the chat at https://gitter.im/MAIF/otoroshi](https://badges.gitter.im/MAIF/otoroshi.svg)](https://gitter.im/MAIF/otoroshi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [ ![Download](https://img.shields.io/github/release/MAIF/otoroshi.svg) ](hhttps://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar)
 @@@
 
 @@@ div { .centered-img }
@@ -15,19 +15,19 @@
 
 ## Installation
 
-You can download the latest build of Otoroshi as a [fat jar](https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi.jar), as a [zip package](https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi-dist.zip) or as a @ref:[docker image](./getotoroshi/fromdocker.md).
+You can download the latest build of Otoroshi as a [fat jar](https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar), as a [zip package](https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi-dist.zip) or as a @ref:[docker image](./getotoroshi/fromdocker.md).
 
 You can install and run Otoroshi with this little bash snippet
 
 ```sh
-curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi.jar'
+curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar'
 java -jar otoroshi.jar
 ```
 
 or using docker
 
 ```sh
-docker run -p "8080:8080" maif/otoroshi:1.4.18-dev
+docker run -p "8080:8080" maif/otoroshi:1.4.18
 ```
 
 now open your browser to <a href="http://otoroshi.oto.tools:8080/" target="_blank">http://otoroshi.oto.tools:8080/</a>, **log in with the credential generated in the logs** and explore by yourself, if you want better instructions, just go to the @ref:[Quick Start](./quickstart.md) or directly to the @ref:[installation instructions](./getotoroshi/index.md)

diff --git a/manual/src/main/paradox/quickstart.md b/manual/src/main/paradox/quickstart.md
@@ -29,8 +29,8 @@ As Otoroshi uses Otoroshi to serve its own admin UI and admin API, you won't be
 ## Now some sh :)
 
 ```sh
-curl -L -o otoroshi.jar https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi.jar
-curl -L -o otoroshicli https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/linux-otoroshicli
+curl -L -o otoroshi.jar https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar
+curl -L -o otoroshicli https://github.com/MAIF/otoroshi/releases/download/v1.4.18/linux-otoroshicli
 
 chmod +x otoroshicli
 
@@ -107,7 +107,7 @@ If you want to use Docker, just follow these instructions
 export OTOROSHI_PORT=8080
 export LOCAL_IP_ADDRESS=999.999.999.999 # use your real local ip address here
 
-curl -L -o otoroshicli https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/linux-otoroshicli
+curl -L -o otoroshicli https://github.com/MAIF/otoroshi/releases/download/v1.4.18/linux-otoroshicli
 
 chmod +x otoroshicli 
 

diff --git a/manual/src/main/paradox/snippets/build.gradle b/manual/src/main/paradox/snippets/build.gradle
@@ -3,6 +3,6 @@ repositories {
 }
 
 dependencies {
-  compile group: 'fr.maif.otoroshi', name: 'otoroshi_2.12', version: '1.4.18-dev'
-  compile group: 'fr.maif.otoroshi', name: 'otoroshi_2.12', version: '1.4.18-dev', classifier 'assets'
+  compile group: 'fr.maif.otoroshi', name: 'otoroshi_2.12', version: '1.4.18'
+  compile group: 'fr.maif.otoroshi', name: 'otoroshi_2.12', version: '1.4.18', classifier 'assets'
 }
diff --git a/manual/src/main/paradox/snippets/build.sbt b/manual/src/main/paradox/snippets/build.sbt
@@ -1,4 +1,4 @@
 resolvers += Resolver.bintrayRepo("maif", "maven")
 
-libraryDependencies += "fr.maif.otoroshi" %% "otoroshi" % "1.4.18-dev"
-libraryDependencies += "fr.maif.otoroshi" %% "otoroshi" % "1.4.18-dev" classifier "assets"
+libraryDependencies += "fr.maif.otoroshi" %% "otoroshi" % "1.4.18"
+libraryDependencies += "fr.maif.otoroshi" %% "otoroshi" % "1.4.18" classifier "assets"
diff --git a/otoroshi/app/controllers/SwaggerController.scala b/otoroshi/app/controllers/SwaggerController.scala
@@ -2342,7 +2342,7 @@ class SwaggerController(cc: ControllerComponents)(implicit env: Env) extends Abs
     Json.obj(
       "swagger" -> "2.0",
       "info" -> Json.obj(
-        "version"     -> "1.4.18-dev",
+        "version"     -> "1.4.18",
         "title"       -> "Otoroshi Admin API",
         "description" -> "Admin API of the Otoroshi reverse proxy",
         "contact" -> Json.obj(

diff --git a/otoroshi/app/env/Env.scala b/otoroshi/app/env/Env.scala
@@ -596,7 +596,7 @@ class Env(val configuration: Configuration,
     stripPath = true
   )
 
-  lazy val otoroshiVersion     = "1.4.18-dev"
+  lazy val otoroshiVersion     = "1.4.18"
   lazy val latestVersionHolder = new AtomicReference[JsValue](JsNull)
   lazy val checkForUpdates     = configuration.getOptional[Boolean]("app.checkForUpdates").getOrElse(true)
 

diff --git a/otoroshi/build.sbt b/otoroshi/build.sbt
@@ -1,6 +1,6 @@
 name := """otoroshi"""
 organization := "fr.maif.otoroshi"
-version := "1.4.18-dev"
+version := "1.4.18"
 scalaVersion := "2.12.8"
 
 lazy val root = (project in file("."))

diff --git a/readme.md b/readme.md
@@ -1,6 +1,6 @@
 # Otoroshi
 
-[![Build Status](https://travis-ci.org/MAIF/otoroshi.svg?branch=master)](https://travis-ci.org/MAIF/otoroshi) [![Join the chat at https://gitter.im/MAIF/otoroshi](https://badges.gitter.im/MAIF/otoroshi.svg)](https://gitter.im/MAIF/otoroshi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [ ![Download](https://img.shields.io/github/release/MAIF/otoroshi.svg) ](https://github.com/MAIF/otoroshi/releases/download/v1.4.17/otoroshi.jar)
+[![Build Status](https://travis-ci.org/MAIF/otoroshi.svg?branch=master)](https://travis-ci.org/MAIF/otoroshi) [![Join the chat at https://gitter.im/MAIF/otoroshi](https://badges.gitter.im/MAIF/otoroshi.svg)](https://gitter.im/MAIF/otoroshi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [ ![Download](https://img.shields.io/github/release/MAIF/otoroshi.svg) ](https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar)
 
 **Otoroshi** is a layer of lightweight api management on top of a modern http reverse proxy written in <a href="https://www.scala-lang.org/" target="_blank">Scala</a> and developped by the <a href="https://maif.github.io" target="_blank">MAIF OSS</a> team that can handle all the calls to and between your microservices without service locator and let you change configuration dynamicaly at runtime.
 

diff --git a/scripts/upload.sh b/scripts/upload.sh
@@ -7,6 +7,6 @@ then
   then
     echo "Uploading otoroshi.jar"
     curl -T ./otoroshi/target/scala-2.12/otoroshi.jar -umathieuancelin:$BINTRAY_API_KEY -H 'X-Bintray-Publish: 1' -H 'X-Bintray-Override: 1' -H 'X-Bintray-Version: snapshot' -H 'X-Bintray-Package: otoroshi.jar' https://api.bintray.com/content/maif/binaries/otoroshi.jar/snapshot/otoroshi.jar
-    curl -T ./otoroshi/target/universal/otoroshi-1.4.18-dev.zip -umathieuancelin:$BINTRAY_API_KEY -H 'X-Bintray-Publish: 1' -H 'X-Bintray-Override: 1' -H 'X-Bintray-Version: snapshot' -H 'X-Bintray-Package: otoroshi-dist' https://api.bintray.com/content/maif/binaries/otoroshi-dist/snapshot/otoroshi-dist.zip
+    curl -T ./otoroshi/target/universal/otoroshi-1.4.18.zip -umathieuancelin:$BINTRAY_API_KEY -H 'X-Bintray-Publish: 1' -H 'X-Bintray-Override: 1' -H 'X-Bintray-Version: snapshot' -H 'X-Bintray-Package: otoroshi-dist' https://api.bintray.com/content/maif/binaries/otoroshi-dist/snapshot/otoroshi-dist.zip
   fi
 fi
diff --git a/scripts/wrk.sh b/scripts/wrk.sh
@@ -45,15 +45,15 @@ cd wrk_test
 LOCATION=`pwd`
 
 if [ ! -f "$LOCATION/otoroshi.jar" ]; then
-  wget -q --show-progress 'https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi.jar'
+  wget -q --show-progress 'https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar'
 fi 
 
 if [ ! -f "$LOCATION/otoroshicli.toml" ]; then
   wget -q --show-progress https://raw.githubusercontent.com/MAIF/otoroshi/master/clients/cli/otoroshicli.toml
 fi
 
 if [ ! -f "$LOCATION/otoroshicli" ]; then
-	wget -q --show-progress https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi.jar/linux-otoroshicli
+	wget -q --show-progress https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar/linux-otoroshicli
 fi
 
 if [ ! -f "$LOCATION/traefik_darwin-amd64" ]; then