Skip to content
This repository was archived by the owner on Jan 31, 2025. It is now read-only.

Commit d8faf4c

Browse files
TomaszGawedakrzysztofslusarski
authored andcommitted
Downgrade gRPC and upgrade Woodstox (#3131)
Co-authored-by: Krzysztof Ślusarski <[email protected]>
1 parent b1367e8 commit d8faf4c

File tree

9 files changed

+48
-42
lines changed
  • extensions
    • grpc/src/main/resources
    • hadoop-dist
      • files-azure/src/main/resources
      • files-gcs/src/main/resources
      • files-s3/src/main/resources
      • hadoop-all/src/main/resources
      • src/main/resources
    • python/src/main/resources
  • hazelcast-jet-distribution/src/root

9 files changed

+48
-42
lines changed

extensions/grpc/src/main/resources/NOTICE

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ Apache License, Version 2.0
2929
Guava: Google Core Libraries for Java:30.1-jre
3030
Guava ListenableFuture only:9999.0-empty-to-avoid-conflict-with-guava
3131
J2ObjC Annotations:1.3
32-
io.grpc:grpc-api:1.51.0
33-
io.grpc:grpc-context:1.51.0
34-
io.grpc:grpc-core:1.51.0
35-
io.grpc:grpc-netty-shaded:1.51.0
36-
io.grpc:grpc-protobuf:1.51.0
37-
io.grpc:grpc-protobuf-lite:1.51.0
38-
io.grpc:grpc-stub:1.51.0
32+
io.grpc:grpc-api:1.48.2
33+
io.grpc:grpc-context:1.48.2
34+
io.grpc:grpc-core:1.48.2
35+
io.grpc:grpc-netty-shaded:1.48.2
36+
io.grpc:grpc-protobuf:1.48.2
37+
io.grpc:grpc-protobuf-lite:1.48.2
38+
io.grpc:grpc-stub:1.48.2
3939
perfmark:perfmark-api:0.25.0
4040
BSD 3-Clause License
4141
Protocol Buffers [Core]:3.19.6

extensions/hadoop-dist/files-azure/src/main/resources/NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Apache License, Version 2.0
2727
Jackson-JAXRS: base:2.14.1
2828
Jackson-JAXRS: JSON:2.14.1
2929
Jackson module: Old JAXB Annotations (javax.xml.bind):2.14.1
30-
Woodstox:5.3.0
30+
Woodstox:6.4.0
3131
JCIP Annotations under Apache License:1.0-1
3232
FindBugs-jsr305:3.0.2
3333
Gson:2.10

extensions/hadoop-dist/files-gcs/src/main/resources/NOTICE

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Apache License, Version 2.0
2727
Jackson-JAXRS: base:2.14.1
2828
Jackson-JAXRS: JSON:2.14.1
2929
Jackson module: Old JAXB Annotations (javax.xml.bind):2.14.1
30-
Woodstox:5.3.0
30+
Woodstox:6.4.0
3131
guava-retrying:2.0.0
3232
JCIP Annotations under Apache License:1.0-1
3333
Google Android Annotations Library:4.1.1.4
@@ -68,16 +68,16 @@ Apache License, Version 2.0
6868
Apache Commons Logging:1.2
6969
Apache Commons Net:3.6
7070
Commons Pool:1.6
71-
io.grpc:grpc-alts:1.51.0
72-
io.grpc:grpc-api:1.51.0
73-
io.grpc:grpc-auth:1.51.0
74-
io.grpc:grpc-context:1.51.0
75-
io.grpc:grpc-core:1.51.0
76-
io.grpc:grpc-grpclb:1.51.0
77-
io.grpc:grpc-netty-shaded:1.51.0
78-
io.grpc:grpc-protobuf:1.51.0
79-
io.grpc:grpc-protobuf-lite:1.51.0
80-
io.grpc:grpc-stub:1.51.0
71+
io.grpc:grpc-alts:1.48.2
72+
io.grpc:grpc-api:1.48.2
73+
io.grpc:grpc-auth:1.48.2
74+
io.grpc:grpc-context:1.48.2
75+
io.grpc:grpc-core:1.48.2
76+
io.grpc:grpc-grpclb:1.48.2
77+
io.grpc:grpc-netty-shaded:1.48.2
78+
io.grpc:grpc-protobuf:1.48.2
79+
io.grpc:grpc-protobuf-lite:1.48.2
80+
io.grpc:grpc-stub:1.48.2
8181
OpenCensus:0.24.0
8282
OpenCensus:0.24.0
8383
perfmark:perfmark-api:0.25.0

extensions/hadoop-dist/files-s3/src/main/resources/NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Apache License, Version 2.0
2828
Jackson-JAXRS: base:2.14.1
2929
Jackson-JAXRS: JSON:2.14.1
3030
Jackson module: Old JAXB Annotations (javax.xml.bind):2.14.1
31-
Woodstox:5.3.0
31+
Woodstox:6.4.0
3232
JCIP Annotations under Apache License:1.0-1
3333
FindBugs-jsr305:3.0.2
3434
Gson:2.10

extensions/hadoop-dist/hadoop-all/src/main/resources/NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Apache License, Version 2.0
2727
Jackson-JAXRS: base:2.14.1
2828
Jackson-JAXRS: JSON:2.14.1
2929
Jackson module: Old JAXB Annotations (javax.xml.bind):2.14.1
30-
Woodstox:5.3.0
30+
Woodstox:6.4.0
3131
JCIP Annotations under Apache License:1.0-1
3232
FindBugs-jsr305:3.0.2
3333
Gson:2.10

extensions/hadoop-dist/src/main/resources/NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Apache License, Version 2.0
2727
Jackson-JAXRS: base:2.14.1
2828
Jackson-JAXRS: JSON:2.14.1
2929
Jackson module: Old JAXB Annotations (javax.xml.bind):2.14.1
30-
Woodstox:5.3.0
30+
Woodstox:6.4.0
3131
JCIP Annotations under Apache License:1.0-1
3232
FindBugs-jsr305:3.0.2
3333
Gson:2.10

extensions/python/src/main/resources/NOTICE

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ Apache License, Version 2.0
2929
Guava: Google Core Libraries for Java:30.1-jre
3030
Guava ListenableFuture only:9999.0-empty-to-avoid-conflict-with-guava
3131
J2ObjC Annotations:1.3
32-
io.grpc:grpc-api:1.51.0
33-
io.grpc:grpc-context:1.51.0
34-
io.grpc:grpc-core:1.51.0
35-
io.grpc:grpc-netty-shaded:1.51.0
36-
io.grpc:grpc-protobuf:1.51.0
37-
io.grpc:grpc-protobuf-lite:1.51.0
38-
io.grpc:grpc-stub:1.51.0
32+
io.grpc:grpc-api:1.48.2
33+
io.grpc:grpc-context:1.48.2
34+
io.grpc:grpc-core:1.48.2
35+
io.grpc:grpc-netty-shaded:1.48.2
36+
io.grpc:grpc-protobuf:1.48.2
37+
io.grpc:grpc-protobuf-lite:1.48.2
38+
io.grpc:grpc-stub:1.48.2
3939
perfmark:perfmark-api:0.25.0
4040
BSD 3-Clause License
4141
Protocol Buffers [Core]:3.19.6

hazelcast-jet-distribution/src/root/NOTICE

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Apache License, Version 2.0
4242
jackson-jr-annotation-support:2.14.1
4343
jackson-jr-objects:2.14.1
4444
Jackson module: Old JAXB Annotations (javax.xml.bind):2.14.1
45-
Woodstox:5.3.0
45+
Woodstox:6.4.0
4646
guava-retrying:2.0.0
4747
mysql-binlog-connector-java:0.20.1
4848
compiler:0.9.6
@@ -96,16 +96,16 @@ Apache License, Version 2.0
9696
Debezium Connector for PostgreSQL:1.2.5.Final
9797
Debezium Core:1.2.5.Final
9898
Debezium ANTLR DDL parsers:1.2.5.Final
99-
io.grpc:grpc-alts:1.51.0
100-
io.grpc:grpc-api:1.51.0
101-
io.grpc:grpc-auth:1.51.0
102-
io.grpc:grpc-context:1.51.0
103-
io.grpc:grpc-core:1.51.0
104-
io.grpc:grpc-grpclb:1.51.0
105-
io.grpc:grpc-netty-shaded:1.51.0
106-
io.grpc:grpc-protobuf:1.51.0
107-
io.grpc:grpc-protobuf-lite:1.51.0
108-
io.grpc:grpc-stub:1.51.0
99+
io.grpc:grpc-alts:1.48.2
100+
io.grpc:grpc-api:1.48.2
101+
io.grpc:grpc-auth:1.48.2
102+
io.grpc:grpc-context:1.48.2
103+
io.grpc:grpc-core:1.48.2
104+
io.grpc:grpc-grpclb:1.48.2
105+
io.grpc:grpc-netty-shaded:1.48.2
106+
io.grpc:grpc-protobuf:1.48.2
107+
io.grpc:grpc-protobuf-lite:1.48.2
108+
io.grpc:grpc-stub:1.48.2
109109
Netty/Buffer:4.1.72.Final
110110
Netty/Codec:4.1.72.Final
111111
Netty/Codec/HTTP:4.1.72.Final

pom.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<scala.version>2.12</scala.version>
122122
<zookeeper.version>3.5.8</zookeeper.version>
123123
<kafka.version>2.2.2</kafka.version>
124-
<grpc.version>1.51.0</grpc.version>
124+
<grpc.version>1.48.2</grpc.version>
125125
<protobuf.version>3.19.6</protobuf.version>
126126
<picocli.version>3.9.0</picocli.version>
127127
<jline.version>3.16.0</jline.version>
@@ -134,7 +134,8 @@
134134
<netty.version>4.1.72.Final</netty.version>
135135
<mysql.connector.version>8.0.25</mysql.connector.version>
136136
<postgresql.version>42.5.1</postgresql.version>
137-
137+
<woodstox-version>6.4.0</woodstox-version>
138+
138139
<!-- test dependencies -->
139140
<activemq.version>5.15.11</activemq.version>
140141
<activemq-artemis.version>2.11.0</activemq-artemis.version>
@@ -230,6 +231,11 @@
230231
<artifactId>jackson-mapper-asl</artifactId>
231232
<version>1.9.13</version>
232233
</dependency>
234+
<dependency>
235+
<groupId>com.fasterxml.woodstox</groupId>
236+
<artifactId>woodstox-core</artifactId>
237+
<version>${woodstox-version}</version>
238+
</dependency>
233239
<dependency>
234240
<groupId>software.amazon.awssdk</groupId>
235241
<artifactId>bom</artifactId>

0 commit comments

Comments
 (0)