Prepared for 5.6.1 release

phax · Feb 24, 2022 · 0c0e718 · 0c0e718
1 parent 319efe3
commit 0c0e718
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ phoss SMP is a complete SMP server that supports both the PEPPOL SMP specificati
 It comes with a management GUI and an XML backend for simplified operations.  
 It was the first SMP to be [CEF eDelivery conformant](https://ec.europa.eu/cefdigital/wiki/display/CEFDIGITAL/OASIS+SMP+conformant+solutions).
 
-Latest version: **[5.6.0](https://github.com/phax/phoss-smp/releases/tag/phoss-smp-parent-pom-5.6.0)** (2022-02-22).
+Latest version: **[5.6.1](https://github.com/phax/phoss-smp/releases/tag/phoss-smp-parent-pom-5.6.1)** (2022-02-22).
 See the special [Migrations guide](https://github.com/phax/phoss-smp/wiki/Migrations) for actions necessary on updates/version changes.
 
 **!! Users with SQL backend need to change the DB layout when updating to 5.3.x !!**

diff --git a/docker/Dockerfile-release-binary-mongodb b/docker/Dockerfile-release-binary-mongodb
@@ -25,7 +25,7 @@ RUN apt-get update \
 
 ARG SMP_VERSION
 # Set to environment to be persistent
-ENV SMP_VERSION=${SMP_VERSION:-5.6.0}
+ENV SMP_VERSION=${SMP_VERSION:-5.6.1}
 
 # Download, unzip and copy result to Tomcat webapps dir
 RUN echo Downloading phoss SMP $SMP_VERSION \
@@ -43,7 +43,7 @@ ENV CATALINA_OPTS="$CATALINA_OPTS -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_EN
 # Set arguments and labels after initial cleanup was performed
 ARG SMP_VERSION
 # Set to environment to be persistent
-ENV SMP_VERSION=${SMP_VERSION:-5.6.0}
+ENV SMP_VERSION=${SMP_VERSION:-5.6.1}
 LABEL vendor="Philip Helger"
 LABEL version=$SMP_VERSION
 

diff --git a/docker/Dockerfile-release-binary-sql b/docker/Dockerfile-release-binary-sql
@@ -25,7 +25,7 @@ RUN apt-get update \
 
 ARG SMP_VERSION
 # Set to environment to be persistent
-ENV SMP_VERSION=${SMP_VERSION:-5.6.0}
+ENV SMP_VERSION=${SMP_VERSION:-5.6.1}
 
 # Download, unzip and copy result to Tomcat webapps dir
 RUN echo Downloading phoss SMP $SMP_VERSION \
@@ -43,7 +43,7 @@ ENV CATALINA_OPTS="$CATALINA_OPTS -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_EN
 # Set arguments and labels after initial cleanup was performed
 ARG SMP_VERSION
 # Set to environment to be persistent
-ENV SMP_VERSION=${SMP_VERSION:-5.6.0}
+ENV SMP_VERSION=${SMP_VERSION:-5.6.1}
 LABEL vendor="Philip Helger"
 LABEL version=$SMP_VERSION
 

diff --git a/docker/Dockerfile-release-binary-xml b/docker/Dockerfile-release-binary-xml
@@ -25,7 +25,7 @@ RUN apt-get update \
 
 ARG SMP_VERSION
 # Set to environment to be persistent
-ENV SMP_VERSION=${SMP_VERSION:-5.6.0}
+ENV SMP_VERSION=${SMP_VERSION:-5.6.1}
 
 # Download, unzip and copy result to Tomcat webapps dir
 RUN echo Downloading phoss SMP $SMP_VERSION \
@@ -43,7 +43,7 @@ ENV CATALINA_OPTS="$CATALINA_OPTS -Dorg.apache.tomcat.util.buf.UDecoder.ALLOW_EN
 # Set arguments and labels after initial cleanup was performed
 ARG SMP_VERSION
 # Set to environment to be persistent
-ENV SMP_VERSION=${SMP_VERSION:-5.6.0}
+ENV SMP_VERSION=${SMP_VERSION:-5.6.1}
 LABEL vendor="Philip Helger"
 LABEL version=$SMP_VERSION
 

diff --git a/docker/Dockerfile-release-from-source-xml b/docker/Dockerfile-release-from-source-xml
@@ -18,7 +18,7 @@
 FROM adoptopenjdk:11-hotspot as build
 
 ARG SMP_VERSION
-ENV SMP_VERSION=${SMP_VERSION:-5.6.0}
+ENV SMP_VERSION=${SMP_VERSION:-5.6.1}
 
 # Install git and maven
 RUN apt-get update \
@@ -41,7 +41,7 @@ RUN echo Building phoss SMP $SMP_VERSION \
 FROM tomcat:9-jdk11
 
 ARG SMP_VERSION
-ENV SMP_VERSION=${SMP_VERSION:-5.6.0}
+ENV SMP_VERSION=${SMP_VERSION:-5.6.1}
 LABEL vendor="Philip Helger"
 LABEL version=$SMP_VERSION
 

diff --git a/docker/README.md b/docker/README.md
@@ -191,7 +191,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.6.0 -t phoss-smp-release-binary-xml-5.6.0 -f Dockerfile-release-binary-xml .
+docker build --build-arg SMP_VERSION=5.6.1 -t phoss-smp-release-binary-xml-5.6.1 -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 &ge; 5.0.1

diff --git a/docker/build-all.cmd b/docker/build-all.cmd
@@ -17,7 +17,7 @@
 
 @echo off
 
-set version=5.6.0
+set version=5.6.1
 
 rem --------------- XML -----------------------
 

diff --git a/docker/build-all.sh b/docker/build-all.sh
@@ -17,7 +17,7 @@
 #
 
 
-version=5.6.0
+version=5.6.1
 
 # --------------- XML -----------------------
 

diff --git a/docker/build-release-latest.cmd b/docker/build-release-latest.cmd
@@ -16,7 +16,7 @@
 @REM
 
 @echo off
-set XVER=5.6.0
+set XVER=5.6.1
 
 @REM --------------- XML -----------------------
 

diff --git a/docker/release-all.cmd b/docker/release-all.cmd
@@ -17,7 +17,7 @@
 
 @echo off
 
-set version=5.6.0
+set version=5.6.1
 
 docker login --username phelger
 

diff --git a/docker/release-all.sh b/docker/release-all.sh
@@ -17,7 +17,7 @@
 #
 
 
-version=5.6.0
+version=5.6.1
 
 docker login --username phelger
 

diff --git a/docker/test-scenario-sql-multiple/Dockerfile b/docker/test-scenario-sql-multiple/Dockerfile
@@ -19,7 +19,7 @@
 FROM tomcat:9-jdk11
 
 ARG SMP_VERSION
-ENV SMP_VERSION=${SMP_VERSION:-5.6.0}
+ENV SMP_VERSION=${SMP_VERSION:-5.6.1}
 LABEL vendor="Philip Helger"
 LABEL version=$SMP_VERSION
 

diff --git a/docker/test-scenario-sql-multiple/build-compile.cmd b/docker/test-scenario-sql-multiple/build-compile.cmd
@@ -24,7 +24,7 @@ popd
 
 rmdir /S /Q smp-binary 
 if errorlevel 1 goto error
-xcopy /K /R /E /I /S /H /Y ..\..\phoss-smp-webapp-sql\target\phoss-smp-webapp-sql-5.6.0\* smp-binary\
+xcopy /K /R /E /I /S /H /Y ..\..\phoss-smp-webapp-sql\target\phoss-smp-webapp-sql-5.6.1\* smp-binary\
 if errorlevel 1 goto error
 
 goto end

diff --git 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.6.0
+    git: repo=https://github.com/phax/phoss-smp.git dest={{ sources_dir }}/phoss-smp version=phoss-smp-parent-pom-5.6.1
     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.6.0.war" dest="{{tomcat_dir}}/webapps/ROOT.war"
+    copy: src="{{ sources_dir }}/phoss-smp/phoss-smp-webapp-xml/target/phoss-smp-webapp-xml-5.6.1.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
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ @@
     #
-    version=5.6.0
+    version=5.6.1
     # --------------- XML -----------------------
@@ Expand Down @@