You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2022/09/13 06:26:13 UTC

[tomee] branch tomee-8.x updated: TOMEE-4044 - Snakeyaml 1.32

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

rzo1 pushed a commit to branch tomee-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/tomee-8.x by this push:
     new 602ce6a43a TOMEE-4044 - Snakeyaml 1.32
602ce6a43a is described below

commit 602ce6a43a23002dd575f602d7336f0bcbf224bb
Author: Richard Zowalla <ri...@hs-heilbronn.de>
AuthorDate: Tue Sep 13 08:25:58 2022 +0200

    TOMEE-4044 - Snakeyaml 1.32
---
 pom.xml                                    | 14 ++++++++++++++
 tomee/tomee-microprofile/mp-common/pom.xml |  5 +++++
 2 files changed, 19 insertions(+)

diff --git a/pom.xml b/pom.xml
index ec7d6b2f0a..8f5c0e9e52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -244,6 +244,8 @@
     <!-- Jackson required by OpenAPI Impl -->
     <jackson.version>2.13.4</jackson.version>
     <jackson.dataformat.version>2.13.4</jackson.dataformat.version>
+    <!-- required by Jackson dataformat yaml -->
+    <snakeyaml.version>1.32</snakeyaml.version>
 
     <!-- Javadoc & Asciidoclet -->
     <javadoc.version>3.0.1</javadoc.version>
@@ -2010,6 +2012,18 @@
         <groupId>com.fasterxml.jackson.dataformat</groupId>
         <artifactId>jackson-dataformat-yaml</artifactId>
         <version>${jackson.dataformat.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <!-- Jackson Dataformat Yaml requires snakeyaml -->
+      <dependency>
+        <groupId>org.yaml</groupId>
+        <artifactId>snakeyaml</artifactId>
+        <version>${snakeyaml.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/tomee/tomee-microprofile/mp-common/pom.xml b/tomee/tomee-microprofile/mp-common/pom.xml
index b3e78e5fb2..ed059b7a2b 100644
--- a/tomee/tomee-microprofile/mp-common/pom.xml
+++ b/tomee/tomee-microprofile/mp-common/pom.xml
@@ -209,6 +209,11 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
+    <!-- Jackson Dataformat Yaml requires snakeyaml -->
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.eclipse.microprofile.opentracing</groupId>