Release eumw-3.1.3

Governikus · Dec 27, 2023 · 0db6bd6 · 0db6bd6
1 parent 8d740f0
commit 0db6bd6
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 57 deletions.
diff --git a/.hgtags b/.hgtags
@@ -100,3 +100,4 @@ dbb0aaf15106841268b424e0a5a0b3b46bb7836d eumw-3.1.0
 6a60d2f37150a5fbf7551ae868bc1d6074ccc8fd eumw-3.1.1-RC1
 43ee82a021713ba4a0075638319c12deaeb1fad4 eumw-3.1.1
 b8cd1357f8fa8823a4e035fa769991f13d5a98b9 eumw-3.1.2-RC1
+0def8c4795f0e696c61b25b58e9d8413b2d02582 eumw-3.1.2
diff --git a/configuration-migration/pom.xml b/configuration-migration/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>eumw</artifactId>
         <groupId>de.governikus.eumw</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -60,9 +60,6 @@
                             <name>governikus/eidas-middleware-configuration-migration:${project.version}
                             </name>
                             <build>
-                                <tags>
-                                    <tag>latest</tag>
-                                </tags>
                                 <contextDir>.</contextDir>
                                 <assembly>
                                     <descriptorRef>artifact</descriptorRef>

diff --git a/databasemigration/pom.xml b/databasemigration/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>eumw</artifactId>
         <groupId>de.governikus.eumw</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
     </parent>
     <artifactId>database-migration</artifactId>
 

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -15,11 +15,11 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
     </parent>
 
     <artifactId>distribution</artifactId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
     <packaging>pom</packaging>
 
     <dependencies>

diff --git a/doc/source/chapter/Changelog.rst b/doc/source/chapter/Changelog.rst
@@ -239,3 +239,7 @@ Changelog
 * 3.1.2
 
     - eIDAS Middleware: Fix CVEs by updating affected libraries, most notably xmlsec.
+
+* 3.1.3
+
+    - eIDAS Middleware: Fix CVEs by updating affected libraries, most notably Tomcat.
diff --git a/doc/source/chapter/DemoApplication.rst b/doc/source/chapter/DemoApplication.rst
@@ -51,8 +51,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-3.1.2.jar`` file in this directory.
-#. Start the application by executing ``java -jar eidas-demo-3.1.2.jar``.
+#. If not present, copy the ``eidas-demo-3.1.3.jar`` file in this directory.
+#. Start the application by executing ``java -jar eidas-demo-3.1.3.jar``.
 
 Now you must configure your eIDAS Middleware to communicate with the eIDAS Demo Application.
 
@@ -90,7 +90,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 key stores::
 
-    docker run --rm -it -v /path/to/your/config-directory:/opt/eidas-middleware/config -p 8080:8080 governikus/eidas-demo-application:3.1.2
+    docker run --rm -it -v /path/to/your/config-directory:/opt/eidas-middleware/config -p 8080:8080 governikus/eidas-demo-application:3.1.3
 
 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
@@ -60,14 +60,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:3.1.2
+    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:3.1.3
 
 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:3.1.2
+    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:3.1.3
 
 For more information on starting and stopping containers and viewing the logs,
 see the `Docker Docs <https://docs.docker.com/engine/reference/run/>`_.
@@ -173,7 +173,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-3.1.2.jar`` for 8 GB.
+e.g. ``java -Xmx8g -jar eidas-middleware-3.1.3.jar`` for 8 GB.
 
 
 Request Signer Certificate
@@ -277,7 +277,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/3.1.2/poseidas/snmp/EIDASMW-SNMP-MIB.mib``.
+``https://github.com/Governikus/eidas-middleware/blob/3.1.3/poseidas/snmp/EIDASMW-SNMP-MIB.mib``.
 
 Global GET
 ''''''''''

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.2'
+version = '3.1.3'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.2'
+release = '3.1.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/eidas-base-container/pom.xml b/eidas-base-container/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>eumw</artifactId>
         <groupId>de.governikus.eumw</groupId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
     </parent>
 
     <artifactId>eidas-base-container</artifactId>
@@ -30,9 +30,6 @@
                         <image>
                             <name>governikus/eidas-base-container:${project.version}</name>
                             <build>
-                                <tags>
-                                    <tag>latest</tag>
-                                </tags>
                                 <contextDir>.</contextDir>
                             </build>
                         </image>

diff --git a/eidas-common/pom.xml b/eidas-common/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
     </parent>
     <artifactId>eidas-common</artifactId>
 

diff --git a/eidas-demo/pom.xml b/eidas-demo/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
     </parent>
     <artifactId>eidas-demo</artifactId>
 
@@ -109,9 +109,6 @@
                         <image>
                             <name>governikus/eidas-demo-application:${project.version}</name>
                             <build>
-                                <tags>
-                                    <tag>latest</tag>
-                                </tags>
                                 <contextDir>.</contextDir>
                                 <assembly>
                                     <descriptorRef>artifact</descriptorRef>

diff --git a/eidas-middleware/pom.xml b/eidas-middleware/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
     </parent>
     <artifactId>eidas-middleware</artifactId>
 
@@ -175,9 +175,6 @@
                         <image>
                             <name>governikus/eidas-middleware-application:${project.version}</name>
                             <build>
-                                <tags>
-                                    <tag>latest</tag>
-                                </tags>
                                 <contextDir>.</contextDir>
                                 <assembly>
                                     <descriptorRef>artifact</descriptorRef>
@@ -187,9 +184,6 @@
                         <image>
                             <name>governikus/eidas-middleware-application-hsm:${project.version}</name>
                             <build>
-                                <tags>
-                                    <tag>latest</tag>
-                                </tags>
                                 <contextDir>.</contextDir>
                                 <dockerFile>Dockerfile_HSM</dockerFile>
                             </build>

diff --git a/eidas-starterkit/pom.xml b/eidas-starterkit/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
     </parent>
     <artifactId>eidas-starterkit</artifactId>
 

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>de.governikus.eumw</groupId>
     <artifactId>eumw</artifactId>
-    <version>3.1.2</version>
+    <version>3.1.3</version>
     <packaging>pom</packaging>
 
     <name>EU Middleware</name>
@@ -37,7 +37,7 @@
     <scm>
         <url>https://hg.govkg.de/Autent/eumw</url>
         <connection>scm:hg:https://hg.govkg.de/Autent/eumw</connection>
-        <tag>eumw-3.1.2</tag>
+        <tag>eumw-3.1.3</tag>
     </scm>
 
     <repositories>
@@ -99,7 +99,7 @@
 
         <!-- 3.6.1 is available but there are problems with the client services to the dvca. Version 4.0.0 has the jakarta namespace -->
         <version.cxf>3.5.6</version.cxf>
-        <version.springboot>2.7.13</version.springboot>
+        <version.springboot>2.7.18</version.springboot>
         <!-- thymeleaf 3.1.x has support for spring 6 and the jakarta namespace -->
         <version.thymeleaf>3.0.15.RELEASE</version.thymeleaf>
         <version.thymeleaf-layout-dialect>3.2.1</version.thymeleaf-layout-dialect>
@@ -129,8 +129,6 @@
         <version.jsr305>3.0.2</version.jsr305>
         <version.groovy>3.0.18</version.groovy>
         <version.snmp4j>3.6.7</version.snmp4j>
-        <!-- manage for CVE -->
-        <version.tomcat>9.0.82</version.tomcat>
 
         <!-- IDE helper -->
         <version.lombok>1.18.28</version.lombok>
@@ -880,23 +878,6 @@
                 <version>${version.jmrtd}</version>
             </dependency>
 
-            <!-- manage tomcat for CVE -->
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-core</artifactId>
-                <version>${version.tomcat}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-el</artifactId>
-                <version>${version.tomcat}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat.embed</groupId>
-                <artifactId>tomcat-embed-websocket</artifactId>
-                <version>${version.tomcat}</version>
-            </dependency>
-
             <!-- test dependencies -->
             <dependency>
                 <groupId>org.slf4j</groupId>

diff --git a/poseidas/pom.xml b/poseidas/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
     </parent>
     <artifactId>poseidas</artifactId>
 

diff --git a/utils/pom.xml b/utils/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
     </parent>
     <artifactId>utils</artifactId>
-Original file line number
+Diff line change
@@ Expand Up / @@ -239,3 +239,7 @@ Changelog @@
     * 3.1.2
         - eIDAS Middleware: Fix CVEs by updating affected libraries, most notably xmlsec.
+    * 3.1.3
+        - eIDAS Middleware: Fix CVEs by updating affected libraries, most notably Tomcat.