You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2022/02/13 13:31:36 UTC

[myfaces-tobago] 05/32: cherrypick from 2.x: build: CVE fix

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

weber pushed a commit to branch TOBAGO-1999_Select2
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit b821e137e0881d267b1a018e6e9d99a3d10bdd2d
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Mon Dec 13 10:29:21 2021 +0100

    cherrypick from 2.x: build: CVE fix
    
    also cleanup some unused
    
    * update log4j 2
---
 pom.xml                                             |  7 +------
 .../tobago-example-addressbook-cdi/pom.xml          | 21 ---------------------
 tobago-example/tobago-example-addressbook/pom.xml   | 21 ---------------------
 3 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/pom.xml b/pom.xml
index f0eae40..f31220a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
     <mojarra22.version>2.2.16</mojarra22.version>
     <slf4j.version>1.7.30</slf4j.version>
     <logback.version>1.2.3</logback.version>
-    <log4j.version>2.13.3</log4j.version>
+    <log4j.version>2.15.0</log4j.version>
     <commons-io.version>2.8.0</commons-io.version>
     <commons-lang.version>2.6</commons-lang.version>
     <commons-logging.version>1.1.1</commons-logging.version>
@@ -493,11 +493,6 @@
         <version>1.4</version>
       </dependency>
       <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>${log4j.version}</version>
-      </dependency>
-      <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
         <version>4.12</version>
diff --git a/tobago-example/tobago-example-addressbook-cdi/pom.xml b/tobago-example/tobago-example-addressbook-cdi/pom.xml
index e013f8a..8954c18 100644
--- a/tobago-example/tobago-example-addressbook-cdi/pom.xml
+++ b/tobago-example/tobago-example-addressbook-cdi/pom.xml
@@ -65,27 +65,6 @@
           <stopKey>stopKey</stopKey>
           <stopPort>9999</stopPort>
         </configuration>
-        <dependencies>
-         <!--
-          <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.6.1</version>
-            <type>jar</type>
-          </dependency>-->
-        <!--dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-jcl</artifactId>
-          <version>1.0.1</version>
-          <type>jar</type>
-        </dependency>
-        <dependency>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-          <version>1.2.14</version>
-          <type>jar</type>
-        </dependency-->
-       </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/tobago-example/tobago-example-addressbook/pom.xml b/tobago-example/tobago-example-addressbook/pom.xml
index 3621a5e..578e441 100644
--- a/tobago-example/tobago-example-addressbook/pom.xml
+++ b/tobago-example/tobago-example-addressbook/pom.xml
@@ -59,27 +59,6 @@
           <stopKey>stopKey</stopKey>
           <stopPort>9999</stopPort>
         </configuration>
-        <dependencies>
-         <!--
-          <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.6.1</version>
-            <type>jar</type>
-          </dependency>-->
-        <!--dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-jcl</artifactId>
-          <version>1.0.1</version>
-          <type>jar</type>
-        </dependency>
-        <dependency>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-          <version>1.2.14</version>
-          <type>jar</type>
-        </dependency-->
-       </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>