From 3bb39bc2561b12d17bfe23e58dd617190e138d6a Mon Sep 17 00:00:00 2001 From: Mathieu Ancelin Date: Fri, 6 Aug 2021 16:57:51 +0200 Subject: [PATCH] Update version to 1.5.0-beta.3 --- clients/cli/Cargo.toml | 2 +- clients/tcp-udp-tunnel-client/client.js | 2 +- demos/basic-setup/docker-compose.yml | 4 ++-- demos/service-mesh/docker-compose-manual.yml | 10 +++++----- demos/service-mesh/docker-compose.yml | 10 +++++----- docker/build/build.sh | 12 ++++++------ docs/index.html | 2 +- kubernetes/helm/otoroshi/Chart.yaml | 2 +- kubernetes/helm/otoroshi/values.yaml | 2 +- .../cluster-baremetal-daemonset/deployment.yaml | 2 +- .../overlays/cluster-baremetal/deployment.yaml | 2 +- .../kustomize/overlays/cluster/deployment.yaml | 2 +- .../simple-baremetal-daemonset/deployment.yaml | 2 +- .../overlays/simple-baremetal/deployment.yaml | 2 +- kubernetes/kustomize/overlays/simple/deployment.yaml | 2 +- manual/build.sbt | 2 +- manual/src/main/paradox/code/openapi.json | 2 +- manual/src/main/paradox/deploy/kubernetes.md | 4 ++-- manual/src/main/paradox/getotoroshi/fromdocker.md | 12 ++++++------ manual/src/main/paradox/index.md | 8 ++++---- manual/src/main/paradox/quickstart.md | 4 ++-- manual/src/main/paradox/snippets/build.gradle | 4 ++-- manual/src/main/paradox/snippets/build.sbt | 4 ++-- otoroshi/app/controllers/SwaggerController.scala | 2 +- otoroshi/app/env/Env.scala | 2 +- otoroshi/app/openapi/openapi.scala | 2 +- otoroshi/build.sbt | 2 +- readme.md | 2 +- 28 files changed, 54 insertions(+), 54 deletions(-) diff --git a/clients/cli/Cargo.toml b/clients/cli/Cargo.toml index 9dac436d13..3a23eb1f2c 100644 --- a/clients/cli/Cargo.toml +++ b/clients/cli/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Mathieu "] license = "ASL-2.0" name = "otoroshi-cli" readme = "readme.md" -version = "1.5.0-dev" +version = "1.5.0-beta.3" [[bin]] name = "otoroshicli" diff --git a/clients/tcp-udp-tunnel-client/client.js b/clients/tcp-udp-tunnel-client/client.js index 3eac52fa00..712e440385 100644 --- 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.5.0-dev'.yellow) + console.log('Otoroshi TCP tunnel CLI, version 1.5.0-beta.3'.yellow) console.log('') } diff --git a/demos/basic-setup/docker-compose.yml b/demos/basic-setup/docker-compose.yml index 81de694e1d..334c5a18fd 100644 --- 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.5.0-dev + image: maif/otoroshi:1.5.0-beta.3 networks: - basicsetup environment: @@ -53,7 +53,7 @@ services: - redis-slave otoroshi-instance-2: - image: maif/otoroshi:1.5.0-dev + image: maif/otoroshi:1.5.0-beta.3 networks: - basicsetup environment: diff --git a/demos/service-mesh/docker-compose-manual.yml b/demos/service-mesh/docker-compose-manual.yml index 91876e3be1..a6bd1e5996 100644 --- 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.5.0-dev + image: maif/otoroshi:1.5.0-beta.3 networks: - mesh environment: @@ -59,7 +59,7 @@ services: - config-server otoroshi-service-2: - image: maif/otoroshi:1.5.0-dev + image: maif/otoroshi:1.5.0-beta.3 networks: - mesh environment: @@ -72,7 +72,7 @@ services: - config-server otoroshi-service-3: - image: maif/otoroshi:1.5.0-dev + image: maif/otoroshi:1.5.0-beta.3 networks: - mesh environment: @@ -85,7 +85,7 @@ services: - config-server otoroshi-service-frontend: - image: maif/otoroshi:1.5.0-dev + image: maif/otoroshi:1.5.0-beta.3 networks: - mesh ports: @@ -99,7 +99,7 @@ services: - service-frontend otoroshi-gateway: - image: maif/otoroshi:1.5.0-dev + image: maif/otoroshi:1.5.0-beta.3 networks: - mesh ports: diff --git a/demos/service-mesh/docker-compose.yml b/demos/service-mesh/docker-compose.yml index bd4b739cd3..bd7c51f321 100644 --- 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.5.0-dev + image: maif/otoroshi:1.5.0-beta.3 networks: - mesh environment: @@ -75,7 +75,7 @@ services: ipv4_address: 172.16.239.31 otoroshi-service-2: - image: maif/otoroshi:1.5.0-dev + image: maif/otoroshi:1.5.0-beta.3 networks: - mesh environment: @@ -101,7 +101,7 @@ services: ipv4_address: 172.16.239.32 otoroshi-service-3: - image: maif/otoroshi:1.5.0-dev + image: maif/otoroshi:1.5.0-beta.3 networks: - mesh environment: @@ -127,7 +127,7 @@ services: ipv4_address: 172.16.239.33 otoroshi-service-frontend: - image: maif/otoroshi:1.5.0-dev + image: maif/otoroshi:1.5.0-beta.3 networks: - mesh ports: @@ -155,7 +155,7 @@ services: ipv4_address: 172.16.239.34 otoroshi-gateway: - image: maif/otoroshi:1.5.0-dev + image: maif/otoroshi:1.5.0-beta.3 networks: - mesh ports: diff --git a/docker/build/build.sh b/docker/build/build.sh index 0493d9f833..f8a2ac10a8 100644 --- a/docker/build/build.sh +++ b/docker/build/build.sh @@ -18,11 +18,11 @@ prepare_build () { sbt dist sbt assembly cd $LOCATION - cp ../../otoroshi/target/universal/otoroshi-1.5.0-dev.zip ./otoroshi-dist.zip + cp ../../otoroshi/target/universal/otoroshi-1.5.0-beta.3.zip ./otoroshi-dist.zip cp ../../otoroshi/target/scala-2.12/otoroshi.jar ./otoroshi.jar fi unzip otoroshi-dist.zip - mv otoroshi-1.5.0-dev otoroshi + mv otoroshi-1.5.0-beta.3 otoroshi rm -rf otoroshi-dist.zip chmod +x ./otoroshi/bin/otoroshi mkdir -p ./otoroshi/imports @@ -141,13 +141,13 @@ case "${1}" in ;; build-and-push-snapshot) NBR=`date +%s` - echo "Will build version 1.5.0-dev-$NBR" + echo "Will build version 1.5.0-beta.3-$NBR" cp ../../otoroshi/target/scala-2.12/otoroshi.jar otoroshi.jar docker build --no-cache -f ./Dockerfile-jdk11-jar -t otoroshi-jdk11 . - docker tag otoroshi-jdk11 "maif/otoroshi:1.5.0-dev-$NBR" + docker tag otoroshi-jdk11 "maif/otoroshi:1.5.0-beta.3-$NBR" docker tag otoroshi-jdk11 "maif/otoroshi:dev" cleanup - docker push "maif/otoroshi:1.5.0-dev-$NBR" + docker push "maif/otoroshi:1.5.0-beta.3-$NBR" docker push "maif/otoroshi:dev" ;; build-and-push-local) @@ -164,7 +164,7 @@ case "${1}" in cleanup ;; prepare) - cp ../../otoroshi/target/universal/otoroshi-1.5.0-dev.zip ./otoroshi-dist.zip + cp ../../otoroshi/target/universal/otoroshi-1.5.0-beta.3.zip ./otoroshi-dist.zip cp ../../otoroshi/target/scala-2.12/otoroshi.jar ./otoroshi.jar ;; *) diff --git a/docs/index.html b/docs/index.html index 41249e9b69..25d2829d27 100644 --- a/docs/index.html +++ b/docs/index.html @@ -109,7 +109,7 @@

high productivity

- +

DOWNLOAD

diff --git a/kubernetes/helm/otoroshi/Chart.yaml b/kubernetes/helm/otoroshi/Chart.yaml index 8dc71d79aa..571675042e 100644 --- a/kubernetes/helm/otoroshi/Chart.yaml +++ b/kubernetes/helm/otoroshi/Chart.yaml @@ -3,7 +3,7 @@ name: otoroshi description: An Otoroshi based Kubernetes ingress controller type: application version: 1.0.0 -appVersion: 1.5.0-dev +appVersion: 1.5.0-beta.3 keywords: - otoroshi - ingress diff --git a/kubernetes/helm/otoroshi/values.yaml b/kubernetes/helm/otoroshi/values.yaml index e2f115622b..ec05b021f4 100644 --- a/kubernetes/helm/otoroshi/values.yaml +++ b/kubernetes/helm/otoroshi/values.yaml @@ -14,7 +14,7 @@ serviceAccount: image: name: maif/otoroshi - tag: 1.5.0-dev-jdk11 + tag: 1.5.0-beta.3-jdk11 pullPolicy: IfNotPresent https: 8443 http: 8080 diff --git a/kubernetes/kustomize/overlays/cluster-baremetal-daemonset/deployment.yaml b/kubernetes/kustomize/overlays/cluster-baremetal-daemonset/deployment.yaml index b6ef3672dd..085737ca39 100644 --- a/kubernetes/kustomize/overlays/cluster-baremetal-daemonset/deployment.yaml +++ b/kubernetes/kustomize/overlays/cluster-baremetal-daemonset/deployment.yaml @@ -34,7 +34,7 @@ spec: hostNetwork: false restartPolicy: Always containers: - - image: maif/otoroshi:1.5.0-dev-jdk11 + - image: maif/otoroshi:1.5.0-beta.3-jdk11 imagePullPolicy: IfNotPresent name: otoroshi-leader ports: diff --git a/kubernetes/kustomize/overlays/cluster-baremetal/deployment.yaml b/kubernetes/kustomize/overlays/cluster-baremetal/deployment.yaml index b3cefc5f9d..073ae3ebf1 100644 --- a/kubernetes/kustomize/overlays/cluster-baremetal/deployment.yaml +++ b/kubernetes/kustomize/overlays/cluster-baremetal/deployment.yaml @@ -23,7 +23,7 @@ spec: hostNetwork: false restartPolicy: Always containers: - - image: maif/otoroshi:1.5.0-dev-jdk11 + - image: maif/otoroshi:1.5.0-beta.3-jdk11 imagePullPolicy: IfNotPresent name: otoroshi-leader ports: diff --git a/kubernetes/kustomize/overlays/cluster/deployment.yaml b/kubernetes/kustomize/overlays/cluster/deployment.yaml index 6f4eaed022..45691a5816 100644 --- a/kubernetes/kustomize/overlays/cluster/deployment.yaml +++ b/kubernetes/kustomize/overlays/cluster/deployment.yaml @@ -23,7 +23,7 @@ spec: hostNetwork: false restartPolicy: Always containers: - - image: maif/otoroshi:1.5.0-dev-jdk11 + - image: maif/otoroshi:1.5.0-beta.3-jdk11 imagePullPolicy: IfNotPresent name: otoroshi-leader ports: diff --git a/kubernetes/kustomize/overlays/simple-baremetal-daemonset/deployment.yaml b/kubernetes/kustomize/overlays/simple-baremetal-daemonset/deployment.yaml index a1d54660d9..4fc50e658d 100644 --- a/kubernetes/kustomize/overlays/simple-baremetal-daemonset/deployment.yaml +++ b/kubernetes/kustomize/overlays/simple-baremetal-daemonset/deployment.yaml @@ -28,7 +28,7 @@ spec: restartPolicy: Always hostNetwork: false containers: - - image: maif/otoroshi:1.5.0-dev-jdk11 + - image: maif/otoroshi:1.5.0-beta.3-jdk11 imagePullPolicy: IfNotPresent name: otoroshi ports: diff --git a/kubernetes/kustomize/overlays/simple-baremetal/deployment.yaml b/kubernetes/kustomize/overlays/simple-baremetal/deployment.yaml index a1b445edca..dd91e5403a 100644 --- a/kubernetes/kustomize/overlays/simple-baremetal/deployment.yaml +++ b/kubernetes/kustomize/overlays/simple-baremetal/deployment.yaml @@ -21,7 +21,7 @@ spec: terminationGracePeriodSeconds: 60 hostNetwork: false containers: - - image: maif/otoroshi:1.5.0-dev-jdk11 + - image: maif/otoroshi:1.5.0-beta.3-jdk11 imagePullPolicy: IfNotPresent name: otoroshi ports: diff --git a/kubernetes/kustomize/overlays/simple/deployment.yaml b/kubernetes/kustomize/overlays/simple/deployment.yaml index fde12ec090..9358526898 100644 --- a/kubernetes/kustomize/overlays/simple/deployment.yaml +++ b/kubernetes/kustomize/overlays/simple/deployment.yaml @@ -21,7 +21,7 @@ spec: terminationGracePeriodSeconds: 60 hostNetwork: false containers: - - image: maif/otoroshi:1.5.0-dev-jdk11 + - image: maif/otoroshi:1.5.0-beta.3-jdk11 imagePullPolicy: IfNotPresent name: otoroshi ports: diff --git a/manual/build.sbt b/manual/build.sbt index b60a41345b..62bd19e169 100644 --- a/manual/build.sbt +++ b/manual/build.sbt @@ -1,6 +1,6 @@ name := """otoroshi-manual""" organization := "fr.maif" -version := "1.5.0-dev" +version := "1.5.0-beta.3" scalaVersion := "2.13.1" lazy val docs = (project in file(".")) diff --git a/manual/src/main/paradox/code/openapi.json b/manual/src/main/paradox/code/openapi.json index 95085ac725..2408e14c0c 100644 --- a/manual/src/main/paradox/code/openapi.json +++ b/manual/src/main/paradox/code/openapi.json @@ -3,7 +3,7 @@ "info" : { "title" : "Otoroshi Admin API", "description" : "Admin API of the Otoroshi reverse proxy", - "version" : "1.5.0-dev", + "version" : "1.5.0-beta.3", "contact" : { "name" : "Otoroshi Team", "email" : "oss@maif.fr" diff --git a/manual/src/main/paradox/deploy/kubernetes.md b/manual/src/main/paradox/deploy/kubernetes.md index dac5a34e38..b2ae41aa42 100644 --- a/manual/src/main/paradox/deploy/kubernetes.md +++ b/manual/src/main/paradox/deploy/kubernetes.md @@ -18,7 +18,7 @@ You can also create a `kustomization.yaml` file with a remote base ```yaml bases: -- github.com/MAIF/otoroshi/kubernetes/kustomize/overlays/simple/?ref=v1.5.0-dev +- github.com/MAIF/otoroshi/kubernetes/kustomize/overlays/simple/?ref=v1.5.0-beta.3 ``` Then deploy it with `kubectl apply -k ./overlays/myoverlay`. @@ -87,7 +87,7 @@ spec: terminationGracePeriodSeconds: 60 hostNetwork: false containers: - - image: maif/otoroshi:1.5.0-dev-jdk11 + - image: maif/otoroshi:1.5.0-beta.3-jdk11 imagePullPolicy: IfNotPresent name: otoroshi args: ['-Dconfig.file=/usr/app/otoroshi/conf/oto.conf'] diff --git a/manual/src/main/paradox/getotoroshi/fromdocker.md b/manual/src/main/paradox/getotoroshi/fromdocker.md index a49f9054f7..3a1c7c1d74 100644 --- 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.5.0-dev +docker pull maif/otoroshi:1.5.0-beta.3 # or docker pull maif/otoroshi:latest # or -docker pull maif/otoroshi:jdk8-1.5.0-dev +docker pull maif/otoroshi:jdk8-1.5.0-beta.3 # or -docker pull maif/otoroshi:jdk11-1.5.0-dev +docker pull maif/otoroshi:jdk11-1.5.0-beta.3 # or -docker pull maif/otoroshi:jdk12-1.5.0-dev +docker pull maif/otoroshi:jdk12-1.5.0-beta.3 # or -docker pull maif/otoroshi:jdk13-1.5.0-dev +docker pull maif/otoroshi:jdk13-1.5.0-beta.3 # or -docker pull maif/otoroshi:jdk14-1.5.0-dev +docker pull maif/otoroshi:jdk14-1.5.0-beta.3 ``` \ No newline at end of file diff --git a/manual/src/main/paradox/index.md b/manual/src/main/paradox/index.md index f72e1d491b..c50c642261 100644 --- a/manual/src/main/paradox/index.md +++ b/manual/src/main/paradox/index.md @@ -6,7 +6,7 @@ > *The Otoroshi 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](https://github.com/MAIF/otoroshi/actions/workflows/server_build_and_test.yaml/badge.svg)](https://github.com/MAIF/otoroshi/actions/workflows/server_build_and_test.yaml) [![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.5.0-dev/otoroshi.jar) +[![build](https://github.com/MAIF/otoroshi/actions/workflows/server_build_and_test.yaml/badge.svg)](https://github.com/MAIF/otoroshi/actions/workflows/server_build_and_test.yaml) [![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.5.0-beta.3/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.5.0-dev/otoroshi.jar), as a [zip package](https://github.com/MAIF/otoroshi/releases/download/v1.5.0-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.5.0-beta.3/otoroshi.jar), as a [zip package](https://github.com/MAIF/otoroshi/releases/download/v1.5.0-beta.3/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.5.0-dev/otoroshi.jar' +curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v1.5.0-beta.3/otoroshi.jar' java -jar otoroshi.jar ``` or using docker ```sh -docker run -p "8080:8080" maif/otoroshi:1.5.0-dev +docker run -p "8080:8080" maif/otoroshi:1.5.0-beta.3 ``` now open your browser to http://otoroshi.oto.tools:8080/, **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 index 599e6a75e3..59581dceef 100644 --- a/manual/src/main/paradox/quickstart.md +++ b/manual/src/main/paradox/quickstart.md @@ -14,7 +14,7 @@ Otoroshi is an awesome reverse proxy built with Scala that handles all the calls ## Download otoroshi ```sh -curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v1.5.0-dev/otoroshi.jar' +curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v1.5.0-beta.3/otoroshi.jar' ``` If you don’t/can’t have these tools on your machine, you can start a sandboxed environment using here with the following command @@ -48,7 +48,7 @@ as the result, you will see something like ```log $ java -jar otoroshi.jar -[info] otoroshi-env - Otoroshi version 1.5.0-dev +[info] otoroshi-env - Otoroshi version 1.5.0-beta.3 [info] otoroshi-env - Admin API exposed on http://otoroshi-api.oto.tools:8080 [info] otoroshi-env - Admin UI exposed on http://otoroshi.oto.tools:8080 [warn] otoroshi-env - Scripting is enabled on this Otoroshi instance ! diff --git a/manual/src/main/paradox/snippets/build.gradle b/manual/src/main/paradox/snippets/build.gradle index 1926118358..df56e90ddd 100644 --- a/manual/src/main/paradox/snippets/build.gradle +++ b/manual/src/main/paradox/snippets/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile group: 'fr.maif', name: 'otoroshi_2.12', version: '1.5.0-dev' - compile group: 'fr.maif', name: 'otoroshi_2.12', version: '1.5.0-dev', classifier 'assets' + compile group: 'fr.maif', name: 'otoroshi_2.12', version: '1.5.0-beta.3' + compile group: 'fr.maif', name: 'otoroshi_2.12', version: '1.5.0-beta.3', classifier 'assets' } diff --git a/manual/src/main/paradox/snippets/build.sbt b/manual/src/main/paradox/snippets/build.sbt index 745ef54086..5bc7143ae6 100644 --- a/manual/src/main/paradox/snippets/build.sbt +++ b/manual/src/main/paradox/snippets/build.sbt @@ -1,2 +1,2 @@ -libraryDependencies += "fr.maif" %% "otoroshi" % "1.5.0-dev" -libraryDependencies += "fr.maif" %% "otoroshi" % "1.5.0-dev" classifier "assets" \ No newline at end of file +libraryDependencies += "fr.maif" %% "otoroshi" % "1.5.0-beta.3" +libraryDependencies += "fr.maif" %% "otoroshi" % "1.5.0-beta.3" classifier "assets" \ No newline at end of file diff --git a/otoroshi/app/controllers/SwaggerController.scala b/otoroshi/app/controllers/SwaggerController.scala index 6766ddbe64..dd8e168b34 100644 --- a/otoroshi/app/controllers/SwaggerController.scala +++ b/otoroshi/app/controllers/SwaggerController.scala @@ -2886,7 +2886,7 @@ class SwaggerController(cc: ControllerComponents, assetsBuilder: AssetsBuilder)( Json.obj( "openapi" -> "3.0.0", "info" -> Json.obj( - "version" -> "1.5.0-dev", + "version" -> "1.5.0-beta.3", "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 index 17e1c7746f..f7c9aa668c 100644 --- a/otoroshi/app/env/Env.scala +++ b/otoroshi/app/env/Env.scala @@ -942,7 +942,7 @@ class Env( useAkkaHttpClient = true ) - lazy val otoroshiVersion = "1.5.0-dev" + lazy val otoroshiVersion = "1.5.0-beta.3" lazy val otoroshiVersionSem = Version(otoroshiVersion) lazy val checkForUpdates = configuration.getOptionalWithFileSupport[Boolean]("app.checkForUpdates").getOrElse(true) diff --git a/otoroshi/app/openapi/openapi.scala b/otoroshi/app/openapi/openapi.scala index bbe51bfd95..24af6dde50 100644 --- a/otoroshi/app/openapi/openapi.scala +++ b/otoroshi/app/openapi/openapi.scala @@ -875,7 +875,7 @@ class OpenApiGenerator(routerPath: String, configFilePath: String, specFiles: Se "info" -> Json.obj( "title" -> "Otoroshi Admin API", "description" -> "Admin API of the Otoroshi reverse proxy", - "version" -> "1.5.0-dev", + "version" -> "1.5.0-beta.3", "contact" -> Json.obj( "name" -> "Otoroshi Team", "email" -> "oss@maif.fr" diff --git a/otoroshi/build.sbt b/otoroshi/build.sbt index fe79981afc..4b761b55c0 100644 --- a/otoroshi/build.sbt +++ b/otoroshi/build.sbt @@ -2,7 +2,7 @@ import xerial.sbt.Sonatype._ name := """otoroshi""" organization := "fr.maif" -version := "1.5.0-dev" +version := "1.5.0-beta.3" scalaVersion := scalaLangVersion inThisBuild( diff --git a/readme.md b/readme.md index 288fc42d2c..c937e19fdc 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # Otoroshi -[![Build status](https://github.com/MAIF/otoroshi/actions/workflows/server_build_and_test.yaml/badge.svg)](https://github.com/MAIF/otoroshi/actions/workflows/server_build_and_test.yaml) [![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.5.0-beta.2/otoroshi.jar) +[![Build status](https://github.com/MAIF/otoroshi/actions/workflows/server_build_and_test.yaml/badge.svg)](https://github.com/MAIF/otoroshi/actions/workflows/server_build_and_test.yaml) [![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.5.0-beta.3/otoroshi.jar) **Otoroshi** is a layer of lightweight api management on top of a modern http reverse proxy written in Scala and developped by the MAIF OSS team that can handle all the calls to and between your microservices without service locator and let you change configuration dynamicaly at runtime.