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 2022/03/30 17:04:50 UTC
[myfaces-tobago] branch tobago-5.x updated: chore: update pom
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 d1a0678 chore: update pom
d1a0678 is described below
commit d1a067803558340d6194c2aacc71cd2b69161d15
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Mar 30 18:51:14 2022 +0200
chore: update pom
* update jackson-databind: 2.13.2.2
* update joinfaces: 4.6.5
---
pom.xml | 2 +-
tobago-example/tobago-example-spring-boot/pom.xml | 31 +++++++++++++++++------
2 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9f3f16d..5415770 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
<!-- Note: defined here in master pom, because of problems with enforcer plugin -->
<jetty.version>9.4.44.v20210927</jetty.version>
- <joinfaces.version>4.6.4</joinfaces.version>
+ <joinfaces.version>4.6.5</joinfaces.version>
<spring-boot.version>2.6.5</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 ac7cb4c..558beb2 100644
--- a/tobago-example/tobago-example-spring-boot/pom.xml
+++ b/tobago-example/tobago-example-spring-boot/pom.xml
@@ -135,6 +135,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>
@@ -147,9 +148,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 -->
+ -->
+ </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>
@@ -165,11 +168,23 @@
<artifactId>tomcat-embed-websocket</artifactId>
<version>9.0.60</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
- <dependency> <!-- add JAXB to run the demo with Java 11 and higher -->
+ -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>2.13.2.2</version>
+ </dependency>
+ <dependency> <!-- add JAXB to run the demo with Java 11 and higher -->
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>