From 21c376e4158f623a5209317af89340543bff9c5d Mon Sep 17 00:00:00 2001 From: Benny Prange Date: Thu, 3 Feb 2022 14:58:17 +0100 Subject: [PATCH] Release eumw-2.2.6 --- .hgtags | 3 +++ configuration-checker/pom.xml | 2 +- configuration-wizard/pom.xml | 2 +- databasemigration/pom.xml | 2 +- distribution/pom.xml | 4 ++-- doc/source/chapter/Changelog.rst | 4 ++++ doc/source/chapter/Configuration.rst | 6 +++--- doc/source/chapter/DemoApplication.rst | 6 +++--- doc/source/chapter/Operating.rst | 10 +++++----- doc/source/conf.py | 4 ++-- dvca-connection-configurator/pom.xml | 2 +- eidas-base-container/pom.xml | 2 +- eidas-common/pom.xml | 2 +- eidas-demo/pom.xml | 2 +- eidas-middleware/pom.xml | 2 +- eidas-starterkit/pom.xml | 2 +- password-generator/pom.xml | 2 +- pom.xml | 21 +++++++++++---------- poseidas-configuration/pom.xml | 2 +- poseidas/pom.xml | 2 +- utils/pom.xml | 2 +- 21 files changed, 46 insertions(+), 38 deletions(-) diff --git a/.hgtags b/.hgtags index f68432be..059aa971 100644 --- a/.hgtags +++ b/.hgtags @@ -62,3 +62,6 @@ d14cac49af140383c0e21a6d5321af9e093277b6 eumw-2.2.2 d2932df2e87d2e2c9e4a11180f4b794c19ceea20 eumw-2.2.3-RC2 4e9da5cfcfd457536c4b1dc963c8ecb5cc3c2f26 eumw-2.2.3 eebce4e024fdcf705d1ea6baef62e86e3f2eb947 eumw-2.2.4 +e01a380d0d99b17902d01ca28dcdb0b6e8072ddc eumw-2.2.5 +0000000000000000000000000000000000000000 eumw-2.2.5 +854ea49f65d739d700862571fb2c15b72ee83b1e eumw-2.2.5 diff --git a/configuration-checker/pom.xml b/configuration-checker/pom.xml index f63ffd33..f041c0bf 100644 --- a/configuration-checker/pom.xml +++ b/configuration-checker/pom.xml @@ -14,7 +14,7 @@ eumw de.governikus.eumw - 2.2.5 + 2.2.6 configuration-checker diff --git a/configuration-wizard/pom.xml b/configuration-wizard/pom.xml index 00c2897b..655c143c 100644 --- a/configuration-wizard/pom.xml +++ b/configuration-wizard/pom.xml @@ -14,7 +14,7 @@ de.governikus.eumw eumw - 2.2.5 + 2.2.6 configuration-wizard diff --git a/databasemigration/pom.xml b/databasemigration/pom.xml index f1d9e050..54223c37 100644 --- a/databasemigration/pom.xml +++ b/databasemigration/pom.xml @@ -14,7 +14,7 @@ eumw de.governikus.eumw - 2.2.5 + 2.2.6 database-migration diff --git a/distribution/pom.xml b/distribution/pom.xml index 02fb2d2b..053d3211 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -15,11 +15,11 @@ de.governikus.eumw eumw - 2.2.5 + 2.2.6 distribution - 2.2.5 + 2.2.6 pom diff --git a/doc/source/chapter/Changelog.rst b/doc/source/chapter/Changelog.rst index 3e4b95f4..0fda4123 100644 --- a/doc/source/chapter/Changelog.rst +++ b/doc/source/chapter/Changelog.rst @@ -145,3 +145,7 @@ Changelog * 2.2.5 - eIDAS Middleware: Fix Log4j security issue. + +* 2.2.6 + + - eIDAS Middleware: Update log4j to version 2.17.1. diff --git a/doc/source/chapter/Configuration.rst b/doc/source/chapter/Configuration.rst index bfcde4c0..7ec5df86 100644 --- a/doc/source/chapter/Configuration.rst +++ b/doc/source/chapter/Configuration.rst @@ -72,7 +72,7 @@ In case you are using your own environment, copy the JAR file to a folder of you You can start the application with the following command:: - java -jar configuration-wizard-2.2.5.jar + java -jar configuration-wizard-2.2.6.jar In addition you can define the config folder with adding the parameter ``DconfigDirectory`` and its value to the command. This way the configuration wizard will be available at ``http://localhost:8080/config-wizard.`` @@ -102,7 +102,7 @@ to run the wizard again whenever you need it. To run the configuration wizard, execute the following command. It will mount the named volume in the container so that the configuration wizard can store the configuration in the volume. :: - docker run --rm -it -v eidas-configuration:/opt/eidas-middleware/configuration -p 8080:8080 --name eidas-configuration-wizard governikus/eidas-configuration-wizard:2.2.5 + docker run --rm -it -v eidas-configuration:/opt/eidas-middleware/configuration -p 8080:8080 --name eidas-configuration-wizard governikus/eidas-configuration-wizard:2.2.6 Running this command the configuration wizard will be available on http://localhost:8080/config-wizard. @@ -116,7 +116,7 @@ with the alias ``localhost`` and the password ``123456`` for the keystore and th You can also use PKCS12 keystores, in this case you must change the value of ``SERVER_SSL_KEY_STORE_TYPE`` to ``PKCS12``. :: - docker run --rm -it -v eidas-configuration:/opt/eidas-middleware/configuration -v /home/user/keystore.jks:/opt/eidas-middleware/keystore.jks -p 443:8080 -e SERVER_SSL_KEY_STORE=file:/opt/eidas-middleware/keystore.jks -e SERVER_SSL_KEY_STORE_TYPE=JKS -e SERVER_SSL_KEY_STORE_PASSWORD=123456 -e SERVER_SSL_KEY_ALIAS=localhost -e SERVER_SSL_KEY_PASSWORD=123456 --name eidas-configuration-wizard governikus/eidas-configuration-wizard:2.2.5 + docker run --rm -it -v eidas-configuration:/opt/eidas-middleware/configuration -v /home/user/keystore.jks:/opt/eidas-middleware/keystore.jks -p 443:8080 -e SERVER_SSL_KEY_STORE=file:/opt/eidas-middleware/keystore.jks -e SERVER_SSL_KEY_STORE_TYPE=JKS -e SERVER_SSL_KEY_STORE_PASSWORD=123456 -e SERVER_SSL_KEY_ALIAS=localhost -e SERVER_SSL_KEY_PASSWORD=123456 --name eidas-configuration-wizard governikus/eidas-configuration-wizard:2.2.6 Because the application is now bound to the host in port 443, the configuration wizard is available at https://localhost/config-wizard. diff --git a/doc/source/chapter/DemoApplication.rst b/doc/source/chapter/DemoApplication.rst index b3f1855b..869425c5 100644 --- a/doc/source/chapter/DemoApplication.rst +++ b/doc/source/chapter/DemoApplication.rst @@ -50,8 +50,8 @@ Using the eIDAS Demo Application To use the eIDAS Demo Application, start by running the eIDAS Demo Application. #. Change to the correct directory where the aforementioned configuration is present. -#. If not present, copy the ``eidas-demo-2.2.5.jar`` file in this directory. -#. Start the application by executing ``java -jar eidas-demo-2.2.5.jar``. +#. If not present, copy the ``eidas-demo-2.2.6.jar`` file in this directory. +#. Start the application by executing ``java -jar eidas-demo-2.2.6.jar``. Now you must configure your eIDAS Middleware to communicate with the eIDAS Demo Application. @@ -93,7 +93,7 @@ Also bear in mind that you must use the path of the container file system in the To run the middleware, execute the following command after you have prepared the configuration, certificate and keystores:: - docker run --rm -it -v /path/to/your/config-directory:/opt/eidas-middleware/config -p 8080:8080 governikus/eidas-demo-application:2.2.5 + docker run --rm -it -v /path/to/your/config-directory:/opt/eidas-middleware/config -p 8080:8080 governikus/eidas-demo-application:2.2.6 Now you can follow the steps above to configure and test the eIDAS Middleware. diff --git a/doc/source/chapter/Operating.rst b/doc/source/chapter/Operating.rst index c2a3d53b..9d163a4a 100644 --- a/doc/source/chapter/Operating.rst +++ b/doc/source/chapter/Operating.rst @@ -106,14 +106,14 @@ To run the eIDAS Middleware, execute the following command. It will mount the named volumes containing the database and configuration in the container and the application will be available on port 8443. :: - docker run --rm -it -v eidas-configuration:/opt/eidas-middleware/configuration -v eidas-database:/opt/eidas-middleware/database -p 8443:8443 --name eidas-middleware-application governikus/eidas-middleware-application:2.2.5 + docker run --rm -it -v eidas-configuration:/opt/eidas-middleware/configuration -v eidas-database:/opt/eidas-middleware/database -p 8443:8443 --name eidas-middleware-application governikus/eidas-middleware-application:2.2.6 To stop and remove the container, just hit ``CTRL+C``. To keep the container running longer without being attached to the STDOUT and STDERR, change the command to the following:: - docker run -d -v eidas-configuration:/opt/eidas-middleware/configuration -v eidas-database:/opt/eidas-middleware/database -p 8443:8443 --name eidas-middleware-application governikus/eidas-middleware-application:2.2.5 + docker run -d -v eidas-configuration:/opt/eidas-middleware/configuration -v eidas-database:/opt/eidas-middleware/database -p 8443:8443 --name eidas-middleware-application governikus/eidas-middleware-application:2.2.6 For more information on starting and stopping containers and viewing the logs, see the `Docker Docs `_. @@ -177,7 +177,7 @@ Scalability The performance of the eIDAS Middleware improves by adding more memory (RAM) and using a faster CPU. In case the memory configuration has changed, the server needs to be restarted. To start the JVM with more memory, add ``-Xmx`` with the new maximum memory size to the start command, -e.g. ``java -Xmx8g -jar eidas-middleware-2.2.5.jar`` for 8 GB. +e.g. ``java -Xmx8g -jar eidas-middleware-2.2.6.jar`` for 8 GB. Request Signer Certificate @@ -269,7 +269,7 @@ Optional property for ``TRAP`` is ``poseidas.snmp.managementport`` (port 162 is set). All existing SNMP GET values are explained in detail in the MIB located at -``https://github.com/Governikus/eidas-middleware/blob/2.2.5/poseidas/snmp/EIDASMW-SNMP-MIB.mib``. +``https://github.com/Governikus/eidas-middleware/blob/2.2.6/poseidas/snmp/EIDASMW-SNMP-MIB.mib``. Global GET '''''''''' @@ -369,6 +369,6 @@ Stop the eIDAS Middleware Application and copy the database file to your backup e.g. ``cp /opt/eidas-middleware/database/eidasmw.mv.db /path/to/your/backup-location/eidasmw.mv.db``. To perform the migration, copy the database migration JAR file to the directory where your -configuration file is available and execute the command ``java -jar database-migration-2.2.5.jar``. +configuration file is available and execute the command ``java -jar database-migration-2.2.6.jar``. If there are errors in the log output, please send the complete log output and some information on your environment to eidas-middleware@governikus.com. diff --git a/doc/source/conf.py b/doc/source/conf.py index 21f192b8..db74b41a 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -55,9 +55,9 @@ # built documents. # # The short X.Y version. -version = '2.2.5' +version = '2.2.6' # The full version, including alpha/beta/rc tags. -release = '2.2.5' +release = '2.2.6' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/dvca-connection-configurator/pom.xml b/dvca-connection-configurator/pom.xml index af18ecbf..dda7494e 100644 --- a/dvca-connection-configurator/pom.xml +++ b/dvca-connection-configurator/pom.xml @@ -14,7 +14,7 @@ de.governikus.eumw eumw - 2.2.5 + 2.2.6 dvca-connection-configurator dvca-connection-configurator diff --git a/eidas-base-container/pom.xml b/eidas-base-container/pom.xml index 736aa0a3..6f95b273 100644 --- a/eidas-base-container/pom.xml +++ b/eidas-base-container/pom.xml @@ -14,7 +14,7 @@ eumw de.governikus.eumw - 2.2.5 + 2.2.6 eidas-base-container diff --git a/eidas-common/pom.xml b/eidas-common/pom.xml index da6efa75..9f80bfd0 100644 --- a/eidas-common/pom.xml +++ b/eidas-common/pom.xml @@ -14,7 +14,7 @@ de.governikus.eumw eumw - 2.2.5 + 2.2.6 eidas-common diff --git a/eidas-demo/pom.xml b/eidas-demo/pom.xml index 2db93db0..79bfa937 100644 --- a/eidas-demo/pom.xml +++ b/eidas-demo/pom.xml @@ -14,7 +14,7 @@ de.governikus.eumw eumw - 2.2.5 + 2.2.6 eidas-demo diff --git a/eidas-middleware/pom.xml b/eidas-middleware/pom.xml index 1f84f1c3..57606eec 100644 --- a/eidas-middleware/pom.xml +++ b/eidas-middleware/pom.xml @@ -14,7 +14,7 @@ de.governikus.eumw eumw - 2.2.5 + 2.2.6 eidas-middleware diff --git a/eidas-starterkit/pom.xml b/eidas-starterkit/pom.xml index 4e03b2ce..a95b0e88 100644 --- a/eidas-starterkit/pom.xml +++ b/eidas-starterkit/pom.xml @@ -14,7 +14,7 @@ de.governikus.eumw eumw - 2.2.5 + 2.2.6 eidas-starterkit diff --git a/password-generator/pom.xml b/password-generator/pom.xml index b86184ce..b7004288 100644 --- a/password-generator/pom.xml +++ b/password-generator/pom.xml @@ -14,7 +14,7 @@ de.governikus.eumw eumw - 2.2.5 + 2.2.6 password-generator diff --git a/pom.xml b/pom.xml index 0ba87a8c..42a36377 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ de.governikus.eumw eumw - 2.2.5 + 2.2.6 pom EU Middleware @@ -37,7 +37,7 @@ https://hg.govkg.de/Autent/eumw scm:hg:https://hg.govkg.de/Autent/eumw - eumw-2.2.5 + eumw-2.2.6 @@ -89,9 +89,9 @@ 2.3.0 3.4.5 - 2.6.1 - 3.0.14.RELEASE - 2.5.2 + 2.6.3 + 3.0.15.RELEASE + 2.5.3 9.2 1.15 @@ -103,7 +103,7 @@ 31.0.1-jre 1.4.200 4.0.1 - 2.13.0 + 2.13.1 1.11.1 2.10.13 2.2.14 @@ -116,19 +116,20 @@ 1.18.22 - 2.16.0 - 1.7.32 + 2.17.1 + 1.7.35 2.31 4.5.13 - 5.7.1 + 5.8.2 + 5.11.1 1.2.0 - 6.5.0 + 6.5.3 diff --git a/poseidas-configuration/pom.xml b/poseidas-configuration/pom.xml index b5722366..0c3f8bb7 100644 --- a/poseidas-configuration/pom.xml +++ b/poseidas-configuration/pom.xml @@ -13,7 +13,7 @@ eumw de.governikus.eumw - 2.2.5 + 2.2.6 4.0.0 diff --git a/poseidas/pom.xml b/poseidas/pom.xml index 72e39a93..2af07a1d 100644 --- a/poseidas/pom.xml +++ b/poseidas/pom.xml @@ -14,7 +14,7 @@ de.governikus.eumw eumw - 2.2.5 + 2.2.6 poseidas diff --git a/utils/pom.xml b/utils/pom.xml index a8792019..71adc36d 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -14,7 +14,7 @@ de.governikus.eumw eumw - 2.2.5 + 2.2.6 utils