diff --git a/clients/cli/Cargo.toml b/clients/cli/Cargo.toml index 9dac436d13..c20a4e5a9e 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.12" [[bin]] name = "otoroshicli" diff --git a/clients/tcp-udp-tunnel-client/client.js b/clients/tcp-udp-tunnel-client/client.js index 3eac52fa00..f1dd98c271 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.12'.yellow) console.log('') } diff --git a/demos/basic-setup/docker-compose.yml b/demos/basic-setup/docker-compose.yml index 81de694e1d..3def13ac7b 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.12 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.12 networks: - basicsetup environment: diff --git a/demos/service-mesh/docker-compose-manual.yml b/demos/service-mesh/docker-compose-manual.yml index 91876e3be1..3e5b45f111 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.12 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.12 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.12 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.12 networks: - mesh ports: @@ -99,7 +99,7 @@ services: - service-frontend otoroshi-gateway: - image: maif/otoroshi:1.5.0-dev + image: maif/otoroshi:1.5.12 networks: - mesh ports: diff --git a/demos/service-mesh/docker-compose.yml b/demos/service-mesh/docker-compose.yml index bd4b739cd3..3d974d2d1a 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.12 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.12 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.12 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.12 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.12 networks: - mesh ports: diff --git a/docker/build/build.sh b/docker/build/build.sh index 1fcd032160..a8fd94c227 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.12.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.12 otoroshi rm -rf otoroshi-dist.zip chmod +x ./otoroshi/bin/otoroshi mkdir -p ./otoroshi/imports @@ -159,21 +159,21 @@ 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.12-$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.12-$NBR" docker tag otoroshi-jdk11 "maif/otoroshi:dev" cleanup - docker push "maif/otoroshi:1.5.0-dev-$NBR" + docker push "maif/otoroshi:1.5.12-$NBR" docker push "maif/otoroshi:dev" ;; build-and-push-local) 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 "registry.oto.tools:5000/maif/otoroshi:1.5.0-dev-local" + docker tag otoroshi-jdk11 "registry.oto.tools:5000/maif/otoroshi:1.5.12-local" cleanup - docker push "registry.oto.tools:5000/maif/otoroshi:1.5.0-dev-local" + docker push "registry.oto.tools:5000/maif/otoroshi:1.5.12-local" ;; build-snapshot) cp ../../otoroshi/target/scala-2.12/otoroshi.jar otoroshi.jar @@ -197,7 +197,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.12.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 e40f7e5ce2..7bc0de55db 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 2f9f378c90..4f77528383 100644 --- a/kubernetes/helm/otoroshi/Chart.yaml +++ b/kubernetes/helm/otoroshi/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v3 name: otoroshi description: An Otoroshi based Kubernetes ingress controller type: application -version: 1.5.0-dev -appVersion: 1.5.0-dev +version: 1.5.12 +appVersion: 1.5.12 keywords: - otoroshi - ingress diff --git a/kubernetes/helm/otoroshi/values.yaml b/kubernetes/helm/otoroshi/values.yaml index a75cffbc7c..feefef15a2 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 + tag: 1.5.12 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 7e3f6734e5..12aa9f60af 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.12-jdk11 imagePullPolicy: IfNotPresent name: otoroshi-leader ports: @@ -225,7 +225,7 @@ spec: hostNetwork: false restartPolicy: Always containers: - - image: maif/otoroshi:1.5.11-dev + - image: maif/otoroshi:1.5.12-dev imagePullPolicy: IfNotPresent name: otoroshi-worker ports: diff --git a/kubernetes/kustomize/overlays/cluster-baremetal/deployment.yaml b/kubernetes/kustomize/overlays/cluster-baremetal/deployment.yaml index ddeb0b83a1..4fc3d5c8fb 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.12-jdk11 imagePullPolicy: IfNotPresent name: otoroshi-leader ports: @@ -200,7 +200,7 @@ spec: hostNetwork: false restartPolicy: Always containers: - - image: maif/otoroshi:1.5.11-dev + - image: maif/otoroshi:1.5.12-dev imagePullPolicy: IfNotPresent name: otoroshi-worker ports: diff --git a/kubernetes/kustomize/overlays/cluster/deployment.yaml b/kubernetes/kustomize/overlays/cluster/deployment.yaml index ec3b9d0180..abaf6e09bd 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.12-jdk11 imagePullPolicy: IfNotPresent name: otoroshi-leader ports: @@ -200,7 +200,7 @@ spec: hostNetwork: false restartPolicy: Always containers: - - image: maif/otoroshi:1.5.11-dev + - image: maif/otoroshi:1.5.12-dev imagePullPolicy: IfNotPresent name: otoroshi-worker ports: diff --git a/kubernetes/kustomize/overlays/simple-baremetal-daemonset/deployment.yaml b/kubernetes/kustomize/overlays/simple-baremetal-daemonset/deployment.yaml index a1d54660d9..ab6c820693 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.12-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..d4ea7d22af 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.12-jdk11 imagePullPolicy: IfNotPresent name: otoroshi ports: diff --git a/kubernetes/kustomize/overlays/simple/deployment.yaml b/kubernetes/kustomize/overlays/simple/deployment.yaml index fde12ec090..3664932813 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.12-jdk11 imagePullPolicy: IfNotPresent name: otoroshi ports: diff --git a/manual/build.sbt b/manual/build.sbt index 2b383451ee..ade037abfc 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.12" 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 a2e252bc82..35ad6817c1 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.12", "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 efed26984b..f725f0a351 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.12 ``` 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 + - image: maif/otoroshi:1.5.12 imagePullPolicy: IfNotPresent name: otoroshi args: ['-Dconfig.file=/usr/app/otoroshi/conf/oto.conf'] diff --git a/manual/src/main/paradox/getting-started.md b/manual/src/main/paradox/getting-started.md index 1628f72cf1..27dff0fc19 100644 --- a/manual/src/main/paradox/getting-started.md +++ b/manual/src/main/paradox/getting-started.md @@ -5,7 +5,7 @@ Download the latest jar of 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.12/otoroshi.jar' ``` Once downloading, run Otoroshi. diff --git a/manual/src/main/paradox/how-to-s/import-export-otoroshi-datastore.md b/manual/src/main/paradox/how-to-s/import-export-otoroshi-datastore.md index 280491f000..4789cb481b 100644 --- a/manual/src/main/paradox/how-to-s/import-export-otoroshi-datastore.md +++ b/manual/src/main/paradox/how-to-s/import-export-otoroshi-datastore.md @@ -4,7 +4,7 @@ Let's start by downloading the latest 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.12/otoroshi.jar' ``` By default, Otoroshi starts with domain `oto.tools` that targets `127.0.0.1` Now you are almost ready to run Otoroshi for the first time, we want run it with an initial data. diff --git a/manual/src/main/paradox/how-to-s/setup-otoroshi-cluster.md b/manual/src/main/paradox/how-to-s/setup-otoroshi-cluster.md index 9684851fc3..d72bf1a8ed 100644 --- a/manual/src/main/paradox/how-to-s/setup-otoroshi-cluster.md +++ b/manual/src/main/paradox/how-to-s/setup-otoroshi-cluster.md @@ -5,7 +5,7 @@ In this tutorial, we will deploy an Otoroshi cluster with one leader and 2 worke Let's start by downloading the latest jar of 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.12/otoroshi.jar' ``` Then create an instance of Otoroshi and indicates with the `otoroshi.cluster.mode` environment variable that it will be the leader. diff --git a/manual/src/main/paradox/includes/fetch-and-start.md b/manual/src/main/paradox/includes/fetch-and-start.md index e64d759cb6..e18bbca194 100644 --- a/manual/src/main/paradox/includes/fetch-and-start.md +++ b/manual/src/main/paradox/includes/fetch-and-start.md @@ -4,7 +4,7 @@ If you already have an up and running otoroshi instance, you can skip the follow Let's start by downloading the latest 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.12/otoroshi.jar' ``` then you can run start Otoroshi : diff --git a/manual/src/main/paradox/includes/initialize.md b/manual/src/main/paradox/includes/initialize.md index a218ff5a5e..507ba4bd91 100644 --- a/manual/src/main/paradox/includes/initialize.md +++ b/manual/src/main/paradox/includes/initialize.md @@ -13,7 +13,7 @@ If you already have an up and running otoroshi instance, you can skip the follow Let's start by downloading the latest 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.12/otoroshi.jar' ``` then you can run start Otoroshi : diff --git a/manual/src/main/paradox/index.md b/manual/src/main/paradox/index.md index 0fce101f99..1e508b1365 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.12/otoroshi.jar) @@@ @@@ div { .centered-img } @@ -20,14 +20,14 @@ You can download the latest build of Otoroshi as a @ref:[fat jar](./install/get- 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.12/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.12 ``` 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](./getting-started.md) or directly to the @ref:[installation instructions](./install/get-otoroshi.md) diff --git a/manual/src/main/paradox/install/get-otoroshi.md b/manual/src/main/paradox/install/get-otoroshi.md index 932f93a35e..ac9c379af5 100644 --- a/manual/src/main/paradox/install/get-otoroshi.md +++ b/manual/src/main/paradox/install/get-otoroshi.md @@ -6,23 +6,23 @@ All release can be bound on the releases page of the @link:[repository](https:// ```sh # Download the latest version -wget https://github.com/MAIF/otoroshi/releases/download/v1.5.0-dev/otoroshi-1.5.0-dev.zip -unzip ./otoroshi-1.5.0-dev.zip -cd otoroshi-1.5.0-dev +wget https://github.com/MAIF/otoroshi/releases/download/v1.5.12/otoroshi-1.5.12.zip +unzip ./otoroshi-1.5.12.zip +cd otoroshi-1.5.12 ``` ## From jar file ```sh # Download the latest version -wget https://github.com/MAIF/otoroshi/releases/download/v1.5.0-dev/otoroshi.jar +wget https://github.com/MAIF/otoroshi/releases/download/v1.5.12/otoroshi.jar ``` ## From Docker ```sh # Download the latest version -docker pull maif/otoroshi:1.5.0-dev-jdk11 +docker pull maif/otoroshi:1.5.12-jdk11 ``` ## From Sources diff --git a/manual/src/main/paradox/snippets/build.gradle b/manual/src/main/paradox/snippets/build.gradle index 1926118358..0768456431 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.12' + compile group: 'fr.maif', name: 'otoroshi_2.12', version: '1.5.12', classifier 'assets' } diff --git a/manual/src/main/paradox/snippets/build.sbt b/manual/src/main/paradox/snippets/build.sbt index 745ef54086..1942947431 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.12" +libraryDependencies += "fr.maif" %% "otoroshi" % "1.5.12" classifier "assets" \ No newline at end of file diff --git a/manual/src/main/paradox/snippets/fetch.sh b/manual/src/main/paradox/snippets/fetch.sh index d9b9350a42..f7a9ece827 100644 --- a/manual/src/main/paradox/snippets/fetch.sh +++ b/manual/src/main/paradox/snippets/fetch.sh @@ -1,7 +1,7 @@ // #curl -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.12/otoroshi.jar' // #curl // #wget -wget 'https://github.com/MAIF/otoroshi/releases/download/v1.5.0-dev/otoroshi.jar' +wget 'https://github.com/MAIF/otoroshi/releases/download/v1.5.12/otoroshi.jar' // #wget diff --git a/manual/src/main/paradox/topics/expression-language.md b/manual/src/main/paradox/topics/expression-language.md index 7d26df8355..4d16f5126e 100644 --- a/manual/src/main/paradox/topics/expression-language.md +++ b/manual/src/main/paradox/topics/expression-language.md @@ -20,7 +20,7 @@ You can test to get the same values than the right part by creating these follow ```sh # Let's start by downloading the latest Otoroshi. -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.12/otoroshi.jar' # Once downloading, run Otoroshi. java -Dotoroshi.adminPassword=password -jar otoroshi.jar diff --git a/otoroshi/app/controllers/SwaggerController.scala b/otoroshi/app/controllers/SwaggerController.scala index cac2ef721a..72f790ccf0 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.12", "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 b5536a51fe..54eb6a318f 100644 --- a/otoroshi/app/env/Env.scala +++ b/otoroshi/app/env/Env.scala @@ -1011,7 +1011,7 @@ class Env( useAkkaHttpClient = true ) - lazy val otoroshiVersion = "1.5.0-dev" + lazy val otoroshiVersion = "1.5.12" 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 7b42e214ef..3a199bc423 100644 --- a/otoroshi/app/openapi/openapi.scala +++ b/otoroshi/app/openapi/openapi.scala @@ -1034,7 +1034,7 @@ class OpenApiGenerator( "info" -> Json.obj( "title" -> "Otoroshi Admin API", "description" -> "Admin API of the Otoroshi reverse proxy", - "version" -> "1.5.0-dev", + "version" -> "1.5.12", "contact" -> Json.obj( "name" -> "Otoroshi Team", "email" -> "oss@maif.fr" diff --git a/otoroshi/build.sbt b/otoroshi/build.sbt index b5c5e56b23..efb1117cae 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.12" scalaVersion := scalaLangVersion inThisBuild( diff --git a/readme.md b/readme.md index 944e980e18..1b9c606e31 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.11/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.12/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.