8000 dataflow: update imports and upgrade log4j version (#6588) · coderatgoogle/java-docs-samples@9f782f6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9f782f6

Browse files
anguillanneufanguillanneuf
authored
dataflow: update imports and upgrade log4j version (GoogleCloudPlatform#6588)
* dataflow: update imports and upgrade log4j version * lint * reorder imports
1 parent 623516a commit 9f782f6

File tree

11 files changed

+15
-18
lines changed

11 files changed

+15
-18
lines changed

‎dataflow/encryption-keys/pom.xml

Lines changed: 1 addition & 1 deletion
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-
<log4j2.version>2.15.0</log4j2.version>
43+
<log4j2.version>2.16.0</log4j2.version>
4444
</properties>
4545

4646
<repositories>

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

Lines changed: 1 addition & 1 deletion
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-
<log4j2.version>2.15.0</log4j2.version>
44+
<log4j2.version>2.16.0</log4j2.version>
4545
</properties>
4646

4747
<repositories>

‎dataflow/flex-templates/kafka_to_bigquery/src/main/java/org/apache/beam/samples/KafkaToBigQuery.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@
3939
import org.apache.beam.sdk.transforms.windowing.Window;
4040
import org.apache.beam.sdk.values.TypeDescriptor;
4141
import org.apache.kafka.common.serialization.StringDeserializer;
42+
import org.apache.logging.log4j.LogManager;
43+
import org.apache.logging.log4j.Logger;
4244
import org.joda.time.Duration;
4345
import org.joda.time.Instant;
44-
import org.slf4j.Logger;
45-
import org.slf4j.LoggerFactory;
4646

4747
/**
4848
* An Apache Beam pipeline that reads JSON encoded messages from Kafka and
4949
* writes them to a BigQuery table.
5050
*/
5151
public class KafkaToBigQuery {
52-
private static final Logger LOG = LoggerFactory.getLogger(KafkaToBigQuery.class);
52+
private static final Logger LOG = LogManager.getLogger(KafkaToBigQuery.class);
5353
private static final Gson GSON = new Gson();
5454

5555
public interface Options extends StreamingOptions {

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

Lines changed: 1 addition & 1 deletion
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-
<log4j2.version>2.15.0</log4j2.version>
43+
<log4j2.version>2.16.0</log4j2.version>
4444
</properties>
4545

4646
<repositories>

‎dataflow/flex-templates/streaming_beam_sql/src/main/java/org/apache/beam/samples/StreamingBeamSql.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@
4242
import org.apache.beam.sdk.transforms.windowing.Window;
4343
import org.apache.beam.sdk.values.Row;
4444
import org.apache.beam.sdk.values.TypeDescriptor;
45+
import org.apache.logging.log4j.LogManager;
46+
import org.apache.logging.log4j.Logger;
4547
import org.joda.time.Duration;
4648
import org.joda.time.Instant;
47-
import org.slf4j.Logger;
48-
import org.slf4j.LoggerFactory;
4949

5050
/**
5151
* An Apache Beam streaming pipeline that reads JSON encoded messages fromPub/Sub,
5252
* uses Beam SQL to transform the message data, and writes the results to a BigQuery.
5353
*/
5454
public class StreamingBeamSql {
55-
private static final Logger LOG = LoggerFactory.getLogger(StreamingBeamSql.class);
55+
private static final Logger LOG = LogManager.getLogger(StreamingBeamSql.class);
5656
private static final Gson GSON = new Gson();
5757

5858
public interface Options extends StreamingOptions {

‎dataflow/spanner-io/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +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>
42+
<log4j2.version>2.16.0</log4j2.version>
4343
</properties>
4444

4545
<build>

‎dataflow/spanner-io/src/main/java/com/example/dataflow/SpannerWrite.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import org.apache.beam.sdk.transforms.DoFn;
3030
import org.apache.beam.sdk.transforms.ParDo;
3131
import org.apache.beam.sdk.values.PCollection;
32-
import org.slf4j.Logger;
33-
import org.slf4j.LoggerFactory;
32+
import org.apache.logging.log4j.LogManager;
33+
import org.apache.logging.log4j.Logger;
3434

3535
/*
3636
This sample demonstrates how to write to a Spanner table.
@@ -128,7 +128,7 @@ static class Album {
128128
* singer_id\tfirstName\tlastName
129129
*/
130130
static class ParseSinger extends DoFn<String, Singer> {
131-
private static final Logger LOG = LoggerFactory.getLogger(ParseSinger.class);
131+
private static final Logger LOG = LogManager.getLogger(ParseSinger.class);
132132

133133
@ProcessElement
134134
public void processElement(ProcessContext c) {
@@ -149,7 +149,7 @@ public void processElement(ProcessContext c) {
149149
* singer_id\talbumId\talbumTitle
150150
*/
151151
static class ParseAlbum extends DoFn<String, Album> {
152-
private static final Logger LOG = LoggerFactory.getLogger(ParseAlbum.class);
152+
private static final Logger LOG = LogManager.getLogger(ParseAlbum.class);
153153

154154
@ProcessElement
155155
public void processElement(ProcessContext c) {

‎dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerGroupWriteIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import java.util.Arrays;
4141
import java.util.List;
4242
import java.util.Random;
43-
import java.util.UUID;
4443
import java.util.stream.Collectors;
4544
import java.util.stream.IntStream;
4645
import javax.annotation.Nullable;

‎dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerReadIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.util.Arrays;
3636
import java.util.List;
3737
import java.util.Random;
38-
import java.util.UUID;
3938
import java.util.concurrent.ExecutionException;
4039
import java.util.stream.Collectors;
4140
import javax.annotation.Nullable;

‎dataflow/spanner-io/src/test/java/com/example/dataflow/SpannerWriteIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.nio.file.Path;
3636
import java.util.Arrays;
3737
import java.util.Random;
38-
import java.util.UUID;
3938
import java.util.stream.Collectors;
4039
import java.util.stream.Stream;
4140
import org.junit.After;

‎dataflow/templates/pom.xml

Lines changed: 1 addition & 1 deletion
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-
<log4j2.version>2.15.0</log4j2.version>
43+
<log4j2.version>2.16.0</log4j2.version>
4444
</properties>
4545

4646
<repositories>

0 commit comments

Comments
 (0)
0