Skip to content

Commit

Permalink
Prepared for 5.2.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
phax committed Feb 17, 2020
1 parent 3d863f6 commit 108792d
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 !!**

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-release-binary-mongodb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-release-binary-sql
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-release-binary-xml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-release-from-source-xml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docker/build-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#


version=5.2.1
version=5.2.2

# --------------- Building -----------------------

Expand Down
2 changes: 1 addition & 1 deletion docker/build-release-latest.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@REM

@echo off
set XVER=5.2.1
set XVER=5.2.2

@REM --------------- Building -----------------------

Expand Down
2 changes: 1 addition & 1 deletion docker/release-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#


version=5.2.1
version=5.2.2

docker login --username phelger

Expand Down
4 changes: 2 additions & 2 deletions vagrant/playbook-xml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 108792d

Please sign in to comment.