From 108792d3af21eb0d1d6d6681be05ea3804cc210a Mon Sep 17 00:00:00 2001 From: Philip Helger Date: Mon, 17 Feb 2020 13:25:24 +0100 Subject: [PATCH] Prepared for 5.2.2 release --- README.md | 2 +- docker/Dockerfile-release-binary-mongodb | 2 +- docker/Dockerfile-release-binary-sql | 2 +- docker/Dockerfile-release-binary-xml | 2 +- docker/Dockerfile-release-from-source-xml | 2 +- docker/README.md | 8 ++++---- docker/build-all.sh | 2 +- docker/build-release-latest.cmd | 2 +- docker/release-all.sh | 2 +- vagrant/playbook-xml.yml | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index f9c4a0dc0..582afeac5 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ It was the first SMP to be [CEF eDelivery conformant](https://ec.europa.eu/cefdi [![Gitter](https://badges.gitter.im/phax/phoss-smp.svg)](https://gitter.im/phax/peppol-smp-server?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) -Latest version: **[5.2.1](https://github.com/phax/phoss-smp/releases/tag/phoss-smp-parent-pom-5.2.1)** (2020-01-24). +Latest version: **[5.2.2](https://github.com/phax/phoss-smp/releases/tag/phoss-smp-parent-pom-5.2.2)** (2020-02-17). **!! Users with SQL backend need to change the DB layout for 5.2.x !!** diff --git a/docker/Dockerfile-release-binary-mongodb b/docker/Dockerfile-release-binary-mongodb index b63dc2fb2..a41ccfc4b 100644 --- a/docker/Dockerfile-release-binary-mongodb +++ b/docker/Dockerfile-release-binary-mongodb @@ -35,7 +35,7 @@ RUN rm -r $CATALINA_HOME/webapps/ROOT \ # Set arguments and labels after initial cleanup was performed :) ARG SMP_VERSION # Set to environment to be persistent -ENV SMP_VERSION=${SMP_VERSION:-5.2.1} +ENV SMP_VERSION=${SMP_VERSION:-5.2.2} LABEL vendor="Philip Helger" LABEL version=$SMP_VERSION diff --git a/docker/Dockerfile-release-binary-sql b/docker/Dockerfile-release-binary-sql index 52f4790fd..91c43a42b 100644 --- a/docker/Dockerfile-release-binary-sql +++ b/docker/Dockerfile-release-binary-sql @@ -36,7 +36,7 @@ RUN rm -r $CATALINA_HOME/webapps/ROOT \ # Minimum version for this layout is 5.0.1 ARG SMP_VERSION # Set to environment to be persistent -ENV SMP_VERSION=${SMP_VERSION:-5.2.1} +ENV SMP_VERSION=${SMP_VERSION:-5.2.2} LABEL vendor="Philip Helger" LABEL version=$SMP_VERSION diff --git a/docker/Dockerfile-release-binary-xml b/docker/Dockerfile-release-binary-xml index 93f53568a..e30cf2cdd 100644 --- a/docker/Dockerfile-release-binary-xml +++ b/docker/Dockerfile-release-binary-xml @@ -36,7 +36,7 @@ RUN rm -r $CATALINA_HOME/webapps/ROOT \ # Minimum version for this layout is 5.0.1 ARG SMP_VERSION # Set to environment to be persistent -ENV SMP_VERSION=${SMP_VERSION:-5.2.1} +ENV SMP_VERSION=${SMP_VERSION:-5.2.2} LABEL vendor="Philip Helger" LABEL version=$SMP_VERSION diff --git a/docker/Dockerfile-release-from-source-xml b/docker/Dockerfile-release-from-source-xml index 9eb613e52..0932ac7c6 100644 --- a/docker/Dockerfile-release-from-source-xml +++ b/docker/Dockerfile-release-from-source-xml @@ -36,7 +36,7 @@ RUN rm -r $CATALINA_HOME/webapps/ROOT \ # Minimum version for this layout is 5.0.1 ARG SMP_VERSION # Set to environment to be persistent -ENV SMP_VERSION=${SMP_VERSION:-5.2.1} +ENV SMP_VERSION=${SMP_VERSION:-5.2.2} LABEL vendor="Philip Helger" LABEL version=$SMP_VERSION diff --git a/docker/README.md b/docker/README.md index d231821f2..96760d1ac 100644 --- a/docker/README.md +++ b/docker/README.md @@ -109,7 +109,7 @@ Open `http://localhost:8888` in your browser. To change the version build of binary release versions you can specify the version on the commandline when building: ``` -docker build --build-arg SMP_VERSION=5.2.1 -t phoss-smp-release-binary-xml-5.2.1 -f Dockerfile-release-binary-xml . +docker build --build-arg SMP_VERSION=5.2.2 -t phoss-smp-release-binary-xml-5.2.2 -f Dockerfile-release-binary-xml . ``` Note: since the file system layout changed between 5.0.0 and 5.0.1, the current version is only applicable to versions ≥ 5.0.1 @@ -121,9 +121,9 @@ Note: up to and including v5.1.1 the variable `SMP_VERSION` was called `VERSION` Running a pre-build image (XML backend only): ``` -docker run -d --name phoss-smp-release-binary-xml-5.2.1 -p 8888:8080 phelger/smp:5.2.1 -docker stop phoss-smp-release-binary-xml-5.2.1 -docker rm phoss-smp-release-binary-xml-5.2.1 +docker run -d --name phoss-smp-release-binary-xml-5.2.2 -p 8888:8080 phelger/smp:5.2.2 +docker stop phoss-smp-release-binary-xml-5.2.2 +docker rm phoss-smp-release-binary-xml-5.2.2 ``` It exposes port 8888 where Tomcat is running successfully. diff --git a/docker/build-all.sh b/docker/build-all.sh index f1b7e8c44..1d07ac769 100755 --- a/docker/build-all.sh +++ b/docker/build-all.sh @@ -17,7 +17,7 @@ # -version=5.2.1 +version=5.2.2 # --------------- Building ----------------------- diff --git a/docker/build-release-latest.cmd b/docker/build-release-latest.cmd index 78246b22d..7131b30ab 100644 --- a/docker/build-release-latest.cmd +++ b/docker/build-release-latest.cmd @@ -16,7 +16,7 @@ @REM @echo off -set XVER=5.2.1 +set XVER=5.2.2 @REM --------------- Building ----------------------- diff --git a/docker/release-all.sh b/docker/release-all.sh index d476316d9..a6cf737ac 100755 --- a/docker/release-all.sh +++ b/docker/release-all.sh @@ -17,7 +17,7 @@ # -version=5.2.1 +version=5.2.2 docker login --username phelger diff --git a/vagrant/playbook-xml.yml b/vagrant/playbook-xml.yml index bd2261699..c59ef9c6f 100644 --- a/vagrant/playbook-xml.yml +++ b/vagrant/playbook-xml.yml @@ -116,7 +116,7 @@ lineinfile: dest="{{tomcat_dir}}/conf/catalina.properties" regexp="^peppol.pd.client.properties.path=" line="peppol.pd.client.properties.path={{tomcat_dir}}/conf/pdclient.properties" - name: Clone the phoss SMP Server in {{ sources_dir }}/phoss-smp - git: repo=https://github.com/phax/phoss-smp.git dest={{ sources_dir }}/phoss-smp version=phoss-smp-parent-pom-5.2.1 + git: repo=https://github.com/phax/phoss-smp.git dest={{ sources_dir }}/phoss-smp version=phoss-smp-parent-pom-5.2.2 register: smp_result - name: Build SMP Server from {{ sources_dir }}/phoss-smp @@ -127,7 +127,7 @@ chdir: "{{ sources_dir }}/phoss-smp" - name: Deploy SMP Server to tomcat - copy: src="{{ sources_dir }}/phoss-smp/phoss-smp-webapp-xml/target/phoss-smp-webapp-xml-5.2.1.war" dest="{{tomcat_dir}}/webapps/ROOT.war" + copy: src="{{ sources_dir }}/phoss-smp/phoss-smp-webapp-xml/target/phoss-smp-webapp-xml-5.2.2.war" dest="{{tomcat_dir}}/webapps/ROOT.war" - name: Copy SMP Keystore to tomcat copy: src="{{smp_keystore}}" dest="{{smp_keystore_path}}" mode=0600 backup=yes