You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2021/10/27 09:42:57 UTC

[myfaces-tobago] branch tobago-5.x updated: build: update spring-boot version to 2.5.6

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch tobago-5.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/tobago-5.x by this push:
     new e2c549e  build: update spring-boot version to 2.5.6
e2c549e is described below

commit e2c549eb1aef9fea18888c71b0134c666d1e9234
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Oct 27 11:42:13 2021 +0200

    build: update spring-boot version to 2.5.6
---
 pom.xml                                           | 2 +-
 tobago-example/tobago-example-spring-boot/pom.xml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8257204..c05737c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     <!-- Note: defined here in master pom, because of problems with enforcer plugin -->
     <jetty.version>9.4.44.v20210927</jetty.version>
     <joinfaces.version>4.5.5</joinfaces.version>
-    <spring-boot.version>2.5.5</spring-boot.version>
+    <spring-boot.version>2.5.6</spring-boot.version>
 
   </properties>
 
diff --git a/tobago-example/tobago-example-spring-boot/pom.xml b/tobago-example/tobago-example-spring-boot/pom.xml
index a58a9dc..ca446ba 100644
--- a/tobago-example/tobago-example-spring-boot/pom.xml
+++ b/tobago-example/tobago-example-spring-boot/pom.xml
@@ -121,6 +121,7 @@
                     <artifactId>jakarta.el</artifactId>
                 </exclusion>
             <!-- tomcat version set where: fix CVE in tomcat-spring-boot-starter -->
+<!--
                 <exclusion>
                     <groupId>org.apache.tomcat.embed</groupId>
                     <artifactId>tomcat-embed-core</artifactId>
@@ -133,9 +134,11 @@
                     <groupId>org.apache.tomcat.embed</groupId>
                     <artifactId>tomcat-embed-websocket</artifactId>
                 </exclusion>
+-->
             </exclusions>
         </dependency>
         <!-- tomcat version set where: fix CVE in tomcat-spring-boot-starter -->
+<!--
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
@@ -151,6 +154,7 @@
             <artifactId>tomcat-embed-websocket</artifactId>
             <version>9.0.54</version>
         </dependency>
+-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>