fix(TUP-34105): upgrade log4j2 to 2.16.0 (#4870 )

fix(TUP-34105): upgrade log4j2 (#4853 ) (#4866 )
* fix(TUP-34105): upgrade log4j2 * fix(TUP-34105): upgrade log4j2 * fix(TUP-34105): revert to 2.15.0
2021-12-15 15:32:08 +08:00 · 2021-12-15 10:41:08 +08:00
7 changed files with 61 additions and 20 deletions
--- a/main/plugins/org.talend.core/.classpath
+++ b/main/plugins/org.talend.core/.classpath
@@ -6,8 +6,8 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-api-2.12.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/log4j-core-2.12.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/log4j-api-2.16.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/log4j-core-2.16.0.jar"/>
 	<classpathentry kind="src" path="src/main/java/"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/main/plugins/org.talend.core/META-INF/MANIFEST.MF
+++ b/main/plugins/org.talend.core/META-INF/MANIFEST.MF
@@ -55,6 +55,6 @@ Export-Package: org.talend.core,
 org.talend.core.views,
 org.talend.designer.runprocess
 Import-Package: org.apache.commons.collections4.map
-Bundle-ClassPath: lib/log4j-api-2.12.1.jar,
- lib/log4j-core-2.12.1.jar,
+Bundle-ClassPath: lib/log4j-api-2.16.0.jar,
+ lib/log4j-core-2.16.0.jar,
 .
--- a/main/plugins/org.talend.core/pom.xml
+++ b/main/plugins/org.talend.core/pom.xml
@@ -13,7 +13,7 @@
  		<dependency>
            <groupId>org.apache.logging.log4j</groupId>
            <artifactId>log4j-core</artifactId>
-            <version>2.12.1</version>
+            <version>2.16.0</version>
        </dependency>
  </dependencies>
  <build>
--- a/main/plugins/org.talend.designer.maven.tos/resources/log4j/pom.xml
+++ b/main/plugins/org.talend.designer.maven.tos/resources/log4j/pom.xml
@@ -14,22 +14,22 @@
        <dependency>
            <groupId>org.apache.logging.log4j</groupId>
            <artifactId>log4j-slf4j-impl</artifactId>
-            <version>2.12.1</version>
+            <version>2.16.0</version>
        </dependency>
        <dependency>
            <groupId>org.apache.logging.log4j</groupId>
            <artifactId>log4j-core</artifactId>
-            <version>2.12.1</version>
+            <version>2.16.0</version>
        </dependency>
        <dependency>
            <groupId>org.apache.logging.log4j</groupId>
            <artifactId>log4j-api</artifactId>
-            <version>2.12.1</version>
+            <version>2.16.0</version>
        </dependency>
        <dependency>
 	      <groupId>org.apache.logging.log4j</groupId>
 	      <artifactId>log4j-1.2-api</artifactId>
-	      <version>2.12.1</version>
+	      <version>2.16.0</version>
 	    </dependency>
 	</dependencies>
 	<build>
@@ -55,4 +55,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>
--- a/main/plugins/org.talend.designer.maven.tos/resources/tcompv1/pom.xml
+++ b/main/plugins/org.talend.designer.maven.tos/resources/tcompv1/pom.xml
@@ -9,12 +9,13 @@
    </parent>
    <artifactId>studio-tcompv1-dependencies</artifactId>
    <packaging>pom</packaging>
-    
+
    <properties>
        <tcomp.version>1.38.3</tcomp.version>
        <slf4j.version>1.7.32</slf4j.version>
+        <log4j2.version>2.16.0</log4j2.version>
    </properties>
-    
+
    <repositories>
        <repository>
            <id>talend_open</id>
@@ -57,9 +58,49 @@
            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
        </repository>
    </repositories>
-    
+
    <dependencyManagement>
        <dependencies>
+            <dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-core</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-api</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-slf4j-impl</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-jul</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-jcl</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-1.2-api</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-to-slf4j</artifactId>
+				<version>${log4j2.version}</version>
+			</dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-web</artifactId>
+                <version>${log4j2.version}</version>
+            </dependency>
            <dependency>
                <groupId>org.talend.sdk.component</groupId>
                <artifactId>component-runtime</artifactId>
@@ -69,7 +110,7 @@
            </dependency>
        </dependencies>
    </dependencyManagement>
-    
+
    <dependencies>
        <dependency>
            <groupId>org.talend.sdk.component</groupId>
@@ -112,7 +153,7 @@
            <version>1.14</version>
        </dependency>
    </dependencies>
-    
+
    <build>
        <plugins>
            <plugin>
--- a/main/plugins/org.talend.libraries.apache/pom.xml
+++ b/main/plugins/org.talend.libraries.apache/pom.xml
@@ -12,7 +12,7 @@
 	<properties>
 		<log4j.version>1.2.17</log4j.version>
 		<slf4j.version>1.7.25</slf4j.version>
-		<log4j2.version>2.12.1</log4j2.version>
+		<log4j2.version>2.16.0</log4j2.version>
 	</properties>
 	<dependencies>
 		<dependency>
--- a/test/plugins/org.talend.designer.maven.test/src/main/java/org/talend/designer/maven/tools/creator/CreateMavenJobPomTest.java
+++ b/test/plugins/org.talend.designer.maven.test/src/main/java/org/talend/designer/maven/tools/creator/CreateMavenJobPomTest.java
@@ -37,14 +37,14 @@ public class CreateMavenJobPomTest {
    @Test
    public void testNormalizeSpaces() throws Exception {
        String inputSh = "#!/bin/sh\n" + "cd `dirname $0`\n" + "ROOT_PATH=`pwd`\n"
-                + "java -Dtalend.component.manager.m2.repository=$ROOT_PATH/../lib  -cp .:$ROOT_PATH:$ROOT_PATH/../lib/routines.jar:$ROOT_PATH/../lib/log4j-slf4j-impl-2.12.1.jar:$ROOT_PATH/../lib/log4j-api-2.12.1.jar:$ROOT_PATH/../lib/log4j-core-2.12.1.jar:$ROOT_PATH/../lib/antlr-runtime-3.5.2.jar:$ROOT_PATH/../lib/org.talend.dataquality.parser.jar:$ROOT_PATH/../lib/crypto-utils.jar:$ROOT_PATH/../lib/talend_file_enhanced-1.1.jar:$ROOT_PATH/../lib/slf4j-api-1.7.25.jar:$ROOT_PATH/../lib/dom4j-2.1.1.jar:$ROOT_PATH/nojvmparam_0_1.jar: local_project.nojvmparam_0_1.noJVMparam --context=Default \"$@\"\n";
+                + "java -Dtalend.component.manager.m2.repository=$ROOT_PATH/../lib  -cp .:$ROOT_PATH:$ROOT_PATH/../lib/routines.jar:$ROOT_PATH/../lib/log4j-slf4j-impl-2.16.0.jar:$ROOT_PATH/../lib/log4j-api-2.16.0.jar:$ROOT_PATH/../lib/log4j-core-2.16.0.jar:$ROOT_PATH/../lib/antlr-runtime-3.5.2.jar:$ROOT_PATH/../lib/org.talend.dataquality.parser.jar:$ROOT_PATH/../lib/crypto-utils.jar:$ROOT_PATH/../lib/talend_file_enhanced-1.1.jar:$ROOT_PATH/../lib/slf4j-api-1.7.25.jar:$ROOT_PATH/../lib/dom4j-2.1.1.jar:$ROOT_PATH/nojvmparam_0_1.jar: local_project.nojvmparam_0_1.noJVMparam --context=Default \"$@\"\n";
        String expectSh = "#!/bin/sh\n" + "cd `dirname $0`\n" + "ROOT_PATH=`pwd`\n"
-                + "java -Dtalend.component.manager.m2.repository=$ROOT_PATH/../lib -cp .:$ROOT_PATH:$ROOT_PATH/../lib/routines.jar:$ROOT_PATH/../lib/log4j-slf4j-impl-2.12.1.jar:$ROOT_PATH/../lib/log4j-api-2.12.1.jar:$ROOT_PATH/../lib/log4j-core-2.12.1.jar:$ROOT_PATH/../lib/antlr-runtime-3.5.2.jar:$ROOT_PATH/../lib/org.talend.dataquality.parser.jar:$ROOT_PATH/../lib/crypto-utils.jar:$ROOT_PATH/../lib/talend_file_enhanced-1.1.jar:$ROOT_PATH/../lib/slf4j-api-1.7.25.jar:$ROOT_PATH/../lib/dom4j-2.1.1.jar:$ROOT_PATH/nojvmparam_0_1.jar: local_project.nojvmparam_0_1.noJVMparam --context=Default \"$@\"\n";
+                + "java -Dtalend.component.manager.m2.repository=$ROOT_PATH/../lib -cp .:$ROOT_PATH:$ROOT_PATH/../lib/routines.jar:$ROOT_PATH/../lib/log4j-slf4j-impl-2.16.0.jar:$ROOT_PATH/../lib/log4j-api-2.16.0.jar:$ROOT_PATH/../lib/log4j-core-2.16.0.jar:$ROOT_PATH/../lib/antlr-runtime-3.5.2.jar:$ROOT_PATH/../lib/org.talend.dataquality.parser.jar:$ROOT_PATH/../lib/crypto-utils.jar:$ROOT_PATH/../lib/talend_file_enhanced-1.1.jar:$ROOT_PATH/../lib/slf4j-api-1.7.25.jar:$ROOT_PATH/../lib/dom4j-2.1.1.jar:$ROOT_PATH/nojvmparam_0_1.jar: local_project.nojvmparam_0_1.noJVMparam --context=Default \"$@\"\n";

        String inputBat = "%~d0\n" + "cd %~dp0\n"
-                + "java -Dtalend.component.manager.m2.repository=\"%cd%/../lib\"  -cp .;../lib/routines.jar;../lib/log4j-slf4j-impl-2.12.1.jar;../lib/log4j-api-2.12.1.jar;../lib/log4j-core-2.12.1.jar;../lib/antlr-runtime-3.5.2.jar;../lib/org.talend.dataquality.parser.jar;../lib/crypto-utils.jar;../lib/talend_file_enhanced-1.1.jar;../lib/slf4j-api-1.7.25.jar;../lib/dom4j-2.1.1.jar;nojvmparam_0_1.jar; local_project.nojvmparam_0_1.noJVMparam --context=Default %*\n";
+                + "java -Dtalend.component.manager.m2.repository=\"%cd%/../lib\"  -cp .;../lib/routines.jar;../lib/log4j-slf4j-impl-2.16.0.jar;../lib/log4j-api-2.16.0.jar;../lib/log4j-core-2.16.0.jar;../lib/antlr-runtime-3.5.2.jar;../lib/org.talend.dataquality.parser.jar;../lib/crypto-utils.jar;../lib/talend_file_enhanced-1.1.jar;../lib/slf4j-api-1.7.25.jar;../lib/dom4j-2.1.1.jar;nojvmparam_0_1.jar; local_project.nojvmparam_0_1.noJVMparam --context=Default %*\n";
        String expectBat = "%~d0\n" + "cd %~dp0\n"
-                + "java -Dtalend.component.manager.m2.repository=\"%cd%/../lib\" -cp .;../lib/routines.jar;../lib/log4j-slf4j-impl-2.12.1.jar;../lib/log4j-api-2.12.1.jar;../lib/log4j-core-2.12.1.jar;../lib/antlr-runtime-3.5.2.jar;../lib/org.talend.dataquality.parser.jar;../lib/crypto-utils.jar;../lib/talend_file_enhanced-1.1.jar;../lib/slf4j-api-1.7.25.jar;../lib/dom4j-2.1.1.jar;nojvmparam_0_1.jar; local_project.nojvmparam_0_1.noJVMparam --context=Default %*\n";
+                + "java -Dtalend.component.manager.m2.repository=\"%cd%/../lib\" -cp .;../lib/routines.jar;../lib/log4j-slf4j-impl-2.16.0.jar;../lib/log4j-api-2.16.0.jar;../lib/log4j-core-2.16.0.jar;../lib/antlr-runtime-3.5.2.jar;../lib/org.talend.dataquality.parser.jar;../lib/crypto-utils.jar;../lib/talend_file_enhanced-1.1.jar;../lib/slf4j-api-1.7.25.jar;../lib/dom4j-2.1.1.jar;nojvmparam_0_1.jar; local_project.nojvmparam_0_1.noJVMparam --context=Default %*\n";

        String actualSh = CreateMavenJobPom.normalizeSpaces(inputSh);
        assertEquals(expectSh, actualSh);
Author	SHA1	Message	Date
bhe-talendbj	4d97f7c57c	fix(TUP-34105): upgrade log4j2 to 2.16.0 (#4870 )	2021-12-15 15:32:08 +08:00
bhe-talendbj	e14b1e769e	fix(TUP-34105): upgrade log4j2 (#4853 ) (#4866 ) * fix(TUP-34105): upgrade log4j2 * fix(TUP-34105): upgrade log4j2 * fix(TUP-34105): revert to 2.15.0	2021-12-15 10:41:08 +08:00