Skip to content

Commit 623516a

Browse files
davidcavazosdavidcavazos
authored
dataflow: use log4j 2.15 to patch security bug (GoogleCloudPlatform#6587)
1 parent d8abd23 commit 623516a

File tree

5 files changed

+42
-35
lines changed

5 files changed

+42
-35
lines changed

‎dataflow/encryption-keys/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
4141
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
4242
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
43-
<slf4j.version>1.7.32</slf4j.version>
43+
<log4j2.version>2.15.0</log4j2.version>
4444
</properties>
4545

4646
<repositories>
@@ -131,16 +131,16 @@
131131
</build>
132132

133133
<dependencies>
134-
<!-- slf4j API frontend binding with JUL backend -->
135134
<dependency>
136-
<groupId>org.slf4j</groupId>
137-
<artifactId>slf4j-api</artifactId>
138-
<version>${slf4j.version}</version>
135+
<groupId>org.apache.logging.log4j</groupId>
136+
<artifactId>log4j-api</artifactId>
137+
<version>${log4j2.version}</version>
139138
</dependency>
140139
<dependency>
141-
<groupId>org.slf4j</groupId>
142-
<artifactId>slf4j-jdk14</artifactId>
143-
<version>${slf4j.version}</version>
140+
<groupId>org.apache.logging.log4j</groupId>
141+
<artifactId>log4j-core</artifactId>
142+
<version>${log4j2.version}</version>
143+
<scope>runtime</scope>
144144
</dependency>
145145

146146
<!-- Apache Beam

‎dataflow/flex-templates/kafka_to_bigquery/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
4242
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
4343
<maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
44-
<slf4j.version>1.7.32</slf4j.version>
44+
<log4j2.version>2.15.0</log4j2.version>
4545
</properties>
4646

4747
<repositories>
@@ -127,16 +127,16 @@
127127
</build>
128128

129129
<dependencies>
130-
<!-- slf4j API frontend binding with JUL backend -->
131130
<dependency>
132-
<groupId>org.slf4j</groupId>
133-
<artifactId>slf4j-api</artifactId>
134-
<version>${slf4j.version}</version>
131+
<groupId>org.apache.logging.log4j</groupId>
132+
<artifactId>log4j-api</artifactId>
133+
<version>${log4j2.version}</version>
135134
</dependency>
136135
<dependency>
137-
<groupId>org.slf4j</groupId>
138-
<artifactId>slf4j-jdk14</artifactId>
139-
<version>${slf4j.version}</version>
136+
<groupId>org.apache.logging.log4j</groupId>
137+
<artifactId>log4j-core</artifactId>
138+
<version>${log4j2.version}</version>
139+
<scope>runtime</scope>
140140
</dependency>
141141

142142
<!-- Apache Beam

‎dataflow/flex-templates/streaming_beam_sql/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
4141
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
4242
<maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
43-
<slf4j.version>1.7.32</slf4j.version>
43+
<log4j2.version>2.15.0</log4j2.version>
4444
</properties>
4545

4646
<repositories>
@@ -132,16 +132,16 @@
132132
</build>
133133

134134
<dependencies>
135-
<!-- slf4j API frontend binding with JUL backend -->
136135
<dependency>
137-
<groupId>org.slf4j</groupId>
138-
<artifactId>slf4j-api</artifactId>
139-
<version>${slf4j.version}</version>
136+
<groupId>org.apache.logging.log4j</groupId>
137+
<artifactId>log4j-api</artifactId>
138+
<version>${log4j2.version}</version>
140139
</dependency>
141140
<dependency>
142-
<groupId>org.slf4j</groupId>
143-
<artifactId>slf4j-jdk14</artifactId>
144-
<version>${slf4j.version}</version>
141+
<groupId>org.apache.logging.log4j</groupId>
142+
<artifactId>log4j-core</artifactId>
143+
<version>${log4j2.version}</version>
144+
<scope>runtime</scope>
145145
</dependency>
146146

147147
<!-- Apache Beam

‎dataflow/spanner-io/pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<maven.compiler.source>1.8</maven.compiler.source>
4040
<maven.compiler.target>1.8</maven.compiler.target>
4141
<apache_beam.version>2.31.0</apache_beam.version>
42+
<log4j2.version>2.15.0</log4j2.version>
4243
</properties>
4344

4445
<build>
@@ -101,9 +102,15 @@
101102

102103
<!-- Misc -->
103104
<dependency>
104-
<groupId>org.slf4j</groupId>
105-
<artifactId>slf4j-jdk14</artifactId>
106-
<version>1.7.32</version>
105+
<groupId>org.apache.logging.log4j</groupId>
106+
<artifactId>log4j-api</artifactId>
107+
<version>${log4j2.version}</version>
108+
</dependency>
109+
<dependency>
110+
<groupId>org.apache.logging.log4j</groupId>
111+
<artifactId>log4j-core</artifactId>
112+
<version>${log4j2.version}</version>
113+
<scope>runtime</scope>
107114
</dependency>
108115

109116
</dependencies>

‎dataflow/templates/pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
4141
<maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
4242
<maven-shade-plugin.version>3.2.4</maven-shade-plugin.version>
43-
<slf4j.version>1.7.32</slf4j.version>
43+
<log4j2.version>2.15.0</log4j2.version>
4444
</properties>
4545

4646
<repositories>
@@ -131,16 +131,16 @@
131131
</build>
132132

133133
<dependencies>
134-
<!-- slf4j API frontend binding with JUL backend -->
135134
<dependency>
136-
<groupId>org.slf4j</groupId>
137-
<artifactId>slf4j-api</artifactId>
138-
<version>${slf4j.version}</version>
135+
<groupId>org.apache.logging.log4j</groupId>
136+
<artifactId>log4j-api</artifactId>
137+
<version>${log4j2.version}</version>
139138
</dependency>
140139
<dependency>
141-
<groupId>org.slf4j</groupId>
142-
<artifactId>slf4j-jdk14</artifactId>
143-
<version>${slf4j.version}</version>
140+
<groupId>org.apache.logging.log4j</groupId>
141+
<artifactId>log4j-core</artifactId>
142+
<version>${log4j2.version}</version>
143+
<scope>runtime</scope>
144144
</dependency>
145145

146146
<!-- Apache Beam

0 commit comments

Comments
 (0)