From 7fb8279ce21d25525afddae08139c9d1174ae2b8 Mon Sep 17 00:00:00 2001 From: Choucri FAHED Date: Wed, 7 Aug 2019 18:55:28 +0200 Subject: [PATCH] Release 5.24.7 --- .env.sample | 2 +- provision_platform6.bat | 4 ++-- provision_platform6.sh | 4 ++-- .../p6core.data/conf/application.conf | 0 .../p6core.data/conf/pgsqljdbc.properties | 0 .../p6core.data/conf/reportingjdbc.properties | 0 .../p6core.data/lib/Tahoma_font.jar | Bin .../p6core.data/lib/demo-app-smart-contract-1.0.jar | Bin .../{5.24.6 => 5.24.7}/p6core.data/logs/.marker | 0 .../p6core.data/resources/certificates/readme.txt | 0 .../p6core.data/resources/ftpd/conf/users/.marker | 0 .../p6core.data/resources/ftpd/repository/.marker | 0 .../p6core.data/resources/jmsdata/.marker | 0 .../p6core.data/resources/schemas/.marker | 0 .../resources/sshd/conf/sftp.hostkey.ser | Bin .../p6core.data/resources/sshd/repository/.marker | 0 .../p6core.data/resources/templates/.marker | 0 .../{5.24.6 => 5.24.7}/p6core.data/webapps/.marker | 0 reference_data/{5.24.6 => 5.24.7}/reference.sql | 0 19 files changed, 5 insertions(+), 5 deletions(-) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/conf/application.conf (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/conf/pgsqljdbc.properties (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/conf/reportingjdbc.properties (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/lib/Tahoma_font.jar (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/lib/demo-app-smart-contract-1.0.jar (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/logs/.marker (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/resources/certificates/readme.txt (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/resources/ftpd/conf/users/.marker (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/resources/ftpd/repository/.marker (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/resources/jmsdata/.marker (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/resources/schemas/.marker (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/resources/sshd/conf/sftp.hostkey.ser (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/resources/sshd/repository/.marker (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/resources/templates/.marker (100%) rename reference_data/{5.24.6 => 5.24.7}/p6core.data/webapps/.marker (100%) rename reference_data/{5.24.6 => 5.24.7}/reference.sql (100%) diff --git a/.env.sample b/.env.sample index 9a2ccc4..c7c242b 100644 --- a/.env.sample +++ b/.env.sample @@ -2,7 +2,7 @@ INSTANCE_ID=platform6-developer-x PLATFORM6_ROOT=~/platform6/instances # Supported releases are: -# - 5.24.6 +# - 5.24.7 # - 6.0.0-alpha-4 # - 6.0.0-alpha-5 PLATFORM6_VERSION=6.0.0-alpha-5 diff --git a/provision_platform6.bat b/provision_platform6.bat index 0a903be..551b38d 100644 --- a/provision_platform6.bat +++ b/provision_platform6.bat @@ -15,7 +15,7 @@ docker rm demobc docker rm demoexplorer REM ## Set database version -IF "%PLATFORM6_VERSION%"=="5.24.6" ( +IF "%PLATFORM6_VERSION%"=="5.24.7" ( SET PGSQL_VERSION=9.6.1 ) ELSE IF %PLATFORM6_VERSION%=="6.0.0-alpha-4" ( SET PGSQL_VERSION=11.2 @@ -51,7 +51,7 @@ IF "%PLATFORM6_VERSION:~-9%"=="-SNAPSHOT" ( REM ## Update application.conf REM ## Batch scripting does not support logical OR SET RESULT=FALSE -IF "%PLATFORM6_VERSION%"=="5.24.6" SET RESULT=TRUE +IF "%PLATFORM6_VERSION%"=="5.24.7" SET RESULT=TRUE IF "%PLATFORM6_VERSION%"=="6.0.0-alpha-4" SET RESULT=TRUE IF "%PLATFORM6_VERSION%"=="6.0.0-alpha-5" SET RESULT=TRUE IF "%RESULT%"=="TRUE" ( diff --git a/provision_platform6.sh b/provision_platform6.sh index 0203dee..7ddee23 100755 --- a/provision_platform6.sh +++ b/provision_platform6.sh @@ -23,7 +23,7 @@ docker rm demobc docker rm demoexplorer # Set database version -if [ $PLATFORM6_VERSION == '5.24.6' ] +if [ $PLATFORM6_VERSION == '5.24.7' ] then export PGSQL_VERSION='9.6.1' elif [ $PLATFORM6_VERSION == '6.0.0-alpha-4' ] @@ -61,7 +61,7 @@ else fi # Update application.conf -if [ $PLATFORM6_VERSION == '5.24.6' ] || +if [ $PLATFORM6_VERSION == '5.24.7' ] || [ $PLATFORM6_VERSION == '6.0.0-alpha-4' ] || [ $PLATFORM6_VERSION == '6.0.0-alpha-5' ] then diff --git a/reference_data/5.24.6/p6core.data/conf/application.conf b/reference_data/5.24.7/p6core.data/conf/application.conf similarity index 100% rename from reference_data/5.24.6/p6core.data/conf/application.conf rename to reference_data/5.24.7/p6core.data/conf/application.conf diff --git a/reference_data/5.24.6/p6core.data/conf/pgsqljdbc.properties b/reference_data/5.24.7/p6core.data/conf/pgsqljdbc.properties similarity index 100% rename from reference_data/5.24.6/p6core.data/conf/pgsqljdbc.properties rename to reference_data/5.24.7/p6core.data/conf/pgsqljdbc.properties diff --git a/reference_data/5.24.6/p6core.data/conf/reportingjdbc.properties b/reference_data/5.24.7/p6core.data/conf/reportingjdbc.properties similarity index 100% rename from reference_data/5.24.6/p6core.data/conf/reportingjdbc.properties rename to reference_data/5.24.7/p6core.data/conf/reportingjdbc.properties diff --git a/reference_data/5.24.6/p6core.data/lib/Tahoma_font.jar b/reference_data/5.24.7/p6core.data/lib/Tahoma_font.jar similarity index 100% rename from reference_data/5.24.6/p6core.data/lib/Tahoma_font.jar rename to reference_data/5.24.7/p6core.data/lib/Tahoma_font.jar diff --git a/reference_data/5.24.6/p6core.data/lib/demo-app-smart-contract-1.0.jar b/reference_data/5.24.7/p6core.data/lib/demo-app-smart-contract-1.0.jar similarity index 100% rename from reference_data/5.24.6/p6core.data/lib/demo-app-smart-contract-1.0.jar rename to reference_data/5.24.7/p6core.data/lib/demo-app-smart-contract-1.0.jar diff --git a/reference_data/5.24.6/p6core.data/logs/.marker b/reference_data/5.24.7/p6core.data/logs/.marker similarity index 100% rename from reference_data/5.24.6/p6core.data/logs/.marker rename to reference_data/5.24.7/p6core.data/logs/.marker diff --git a/reference_data/5.24.6/p6core.data/resources/certificates/readme.txt b/reference_data/5.24.7/p6core.data/resources/certificates/readme.txt similarity index 100% rename from reference_data/5.24.6/p6core.data/resources/certificates/readme.txt rename to reference_data/5.24.7/p6core.data/resources/certificates/readme.txt diff --git a/reference_data/5.24.6/p6core.data/resources/ftpd/conf/users/.marker b/reference_data/5.24.7/p6core.data/resources/ftpd/conf/users/.marker similarity index 100% rename from reference_data/5.24.6/p6core.data/resources/ftpd/conf/users/.marker rename to reference_data/5.24.7/p6core.data/resources/ftpd/conf/users/.marker diff --git a/reference_data/5.24.6/p6core.data/resources/ftpd/repository/.marker b/reference_data/5.24.7/p6core.data/resources/ftpd/repository/.marker similarity index 100% rename from reference_data/5.24.6/p6core.data/resources/ftpd/repository/.marker rename to reference_data/5.24.7/p6core.data/resources/ftpd/repository/.marker diff --git a/reference_data/5.24.6/p6core.data/resources/jmsdata/.marker b/reference_data/5.24.7/p6core.data/resources/jmsdata/.marker similarity index 100% rename from reference_data/5.24.6/p6core.data/resources/jmsdata/.marker rename to reference_data/5.24.7/p6core.data/resources/jmsdata/.marker diff --git a/reference_data/5.24.6/p6core.data/resources/schemas/.marker b/reference_data/5.24.7/p6core.data/resources/schemas/.marker similarity index 100% rename from reference_data/5.24.6/p6core.data/resources/schemas/.marker rename to reference_data/5.24.7/p6core.data/resources/schemas/.marker diff --git a/reference_data/5.24.6/p6core.data/resources/sshd/conf/sftp.hostkey.ser b/reference_data/5.24.7/p6core.data/resources/sshd/conf/sftp.hostkey.ser similarity index 100% rename from reference_data/5.24.6/p6core.data/resources/sshd/conf/sftp.hostkey.ser rename to reference_data/5.24.7/p6core.data/resources/sshd/conf/sftp.hostkey.ser diff --git a/reference_data/5.24.6/p6core.data/resources/sshd/repository/.marker b/reference_data/5.24.7/p6core.data/resources/sshd/repository/.marker similarity index 100% rename from reference_data/5.24.6/p6core.data/resources/sshd/repository/.marker rename to reference_data/5.24.7/p6core.data/resources/sshd/repository/.marker diff --git a/reference_data/5.24.6/p6core.data/resources/templates/.marker b/reference_data/5.24.7/p6core.data/resources/templates/.marker similarity index 100% rename from reference_data/5.24.6/p6core.data/resources/templates/.marker rename to reference_data/5.24.7/p6core.data/resources/templates/.marker diff --git a/reference_data/5.24.6/p6core.data/webapps/.marker b/reference_data/5.24.7/p6core.data/webapps/.marker similarity index 100% rename from reference_data/5.24.6/p6core.data/webapps/.marker rename to reference_data/5.24.7/p6core.data/webapps/.marker diff --git a/reference_data/5.24.6/reference.sql b/reference_data/5.24.7/reference.sql similarity index 100% rename from reference_data/5.24.6/reference.sql rename to reference_data/5.24.7/reference.sql