Merge pull request #267 from cesarhernandezgt/tomee-7.1.x-TT.x-patch

update to tomcat 8.5.95 and fix release notes
tomitribe · Oct 17, 2023 · ad836a2 · ad836a2
2 parents 4c05168 + f8715c1
commit ad836a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -132,7 +132,7 @@
     <version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor>
     <version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>
 
-    <tomcat.version>8.5.93</tomcat.version>
+    <tomcat.version>8.5.95</tomcat.version>
 
     <cxf.version>3.1.19-TT.8</cxf.version>
     <version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap>

diff --git a/tomee/apache-tomee/src/main/resources/META-INF/release_notes/RELEASE-NOTES-EAP-7.0.x b/tomee/apache-tomee/src/main/resources/META-INF/release_notes/RELEASE-NOTES-EAP-7.0.x
@@ -1,9 +1,8 @@
-= TomEE EAP 7.1.5-TT.24
-
-=== Changes in TomEE EAP 7.1.5-TT.24
-*  Update to Tomcat 8.5.93 to mitigate CVE-2023-41080
+= TomEE EAP 7.1.5-TT.23
 
 === Changes in TomEE EAP 7.1.5-TT.23
+* Update to Tomcat 8.5.95 to mitigate CVE-2023-45648, CVE-2023-42795, CVE-2023-42794, CVE-2023-44487
+*  Update to Tomcat 8.5.93 to mitigate CVE-2023-41080
 *  Update to bcprov-jdk15to18 1.75 to mitigate CVE-2023-33201
 *  Update to Jonhzon 1.0.2-TT.1 to mitigate CVE-2023-33008