Skip to content

Commit 1baa2e4

Browse files
dhirupandeydhirupandey
committed
Bug #36110610: [36110601->22.06.7] Update Helidon version in Coherence to 2.6.5 (14.1.1.2206 -> ce/22.06 @105443)
Job: job.9.20231218011742.1105 [git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v22.06/": change = 105468]
1 parent d601c82 commit 1baa2e4

File tree

11 files changed

+32
-112
lines changed

11 files changed

+32
-112
lines changed

‎prj/coherence-dependencies/pom.xml‎

Lines changed: 6 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<graal.version>19.3.1</graal.version>
181181
<!-- the tag of the Graal image at ghcr.io/graalvm/graalvm-ce -->
182182
<graal.image.tag>ol8-java11-22.1.0</graal.image.tag>
183-
<grpc.version>1.57.1</grpc.version>
183+
<grpc.version>1.60.0</grpc.version>
184184
<!--
185185
NOTE: changing this version may mean updating other dependencies to match versions that Helidon uses:
186186
eclipse.mp.config.version
@@ -189,7 +189,7 @@
189189
grpc.version ???
190190
This is not always possible if we need to bump versions for CVE's
191191
-->
192-
<helidon.version>2.6.4</helidon.version>
192+
<helidon.version>2.6.5</helidon.version>
193193
<helidon.sitegen.version>2.1.2</helidon.sitegen.version>
194194
<hsqldb.version>2.3.2</hsqldb.version>
195195
<jackson.version>2.14.1</jackson.version>
@@ -880,61 +880,12 @@
880880
<!-- gRPC -->
881881
<dependency>
882882
<groupId>io.grpc</groupId>
883-
<artifactId>grpc-protobuf</artifactId>
883+
<artifactId>grpc-bom</artifactId>
884884
<version>${grpc.version}</version>
885-
<exclusions>
886-
<exclusion>
887-
<artifactId>grpc-api</artifactId>
888-
<groupId>io.grpc</groupId>
889-
</exclusion>
890-
</exclusions>
891-
</dependency>
892-
<dependency>
893-
<groupId>io.grpc</groupId>
894-
<artifactId>grpc-stub</artifactId>
895-
<version>${grpc.version}</version>
896-
<exclusions>
897-
<exclusion>
898-
<!-- Used for compilation of "their" sources -->
899-
<groupId>com.google.errorprone</groupId>
900-
<artifactId>error_prone_annotations</artifactId>
901-
</exclusion>
902-
</exclusions>
903-
</dependency>
904-
<dependency>
905-
<groupId>io.grpc</groupId>
906-
<artifactId>grpc-services</artifactId>
907-
<version>${grpc.version}</version>
908-
<exclusions>
909-
<exclusion>
910-
<groupId>io.grpc</groupId>
911-
<artifactId>grpc-core</artifactId>
912-
</exclusion>
913-
<exclusion>
914-
<groupId>io.grpc</groupId>
915-
<artifactId>grpc-api</artifactId>
916-
</exclusion>
917-
</exclusions>
918-
</dependency>
919-
<dependency>
920-
<groupId>io.grpc</groupId>
921-
<artifactId>grpc-netty</artifactId>
922-
<version>${grpc.version}</version>
923-
<exclusions>
924-
<exclusion>
925-
<groupId>io.grpc</groupId>
926-
<artifactId>grpc-context</artifactId>
927-
</exclusion>
928-
<exclusion>
929-
<groupId>io.grpc</groupId>
930-
<artifactId>grpc-core</artifactId>
931-
</exclusion>
932-
<exclusion>
933-
<groupId>io.grpc</groupId>
934-
<artifactId>grpc-api</artifactId>
935-
</exclusion>
936-
</exclusions>
885+
<type>pom</type>
886+
<scope>import</scope>
937887
</dependency>
888+
938889
<dependency>
939890
<!-- required for dependency convergence, used from guava and perfmark-api -->
940891
<groupId>com.google.errorprone</groupId>

‎prj/coherence-grpc-proxy/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
<groupId>io.grpc</groupId>
4343
<artifactId>grpc-services</artifactId>
4444
</dependency>
45+
<dependency>
46+
<groupId>io.grpc</groupId>
47+
<artifactId>grpc-inprocess</artifactId>
48+
</dependency>
4549

4650
<dependency>
4751
<groupId>io.opentracing.contrib</groupId>

‎prj/coherence-grpc/pom.xml‎

Lines changed: 6 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -54,56 +54,25 @@
5454
<artifactId>netty-transport-native-unix-common</artifactId>
5555
</dependency>
5656

57-
<!--
58-
We use Helidon's repackaged io.grpc artifact so that gRPC
59-
will work with Java modules.
60-
-->
6157
<dependency>
62-
<groupId>io.helidon.grpc</groupId>
63-
<artifactId>io.grpc</artifactId>
58+
<groupId>io.grpc</groupId>
59+
<artifactId>grpc-api</artifactId>
60+
</dependency>
61+
<dependency>
62+
<groupId>io.grpc</groupId>
63+
<artifactId>grpc-core</artifactId>
6464
</dependency>
65-
6665
<dependency>
6766
<groupId>io.grpc</groupId>
6867
<artifactId>grpc-netty</artifactId>
69-
<exclusions>
70-
<exclusion>
71-
<groupId>io.grpc</groupId>
72-
<artifactId>grpc-context</artifactId>
73-
</exclusion>
74-
<exclusion>
75-
<groupId>io.grpc</groupId>
76-
<artifactId>grpc-core</artifactId>
77-
</exclusion>
78-
<exclusion>
79-
<groupId>io.grpc</groupId>
80-
<artifactId>grpc-api</artifactId>
81-
</exclusion>
82-
</exclusions>
8368
</dependency>
8469
<dependency>
8570
<groupId>io.grpc</groupId>
8671
<artifactId>grpc-stub</artifactId>
87-
<exclusions>
88-
<exclusion>
89-
<groupId>io.grpc</groupId>
90-
<artifactId>grpc-api</artifactId>
91-
</exclusion>
92-
</exclusions>
9372
</dependency>
9473
<dependency>
9574
<groupId>io.grpc</groupId>
9675
<artifactId>grpc-protobuf</artifactId>
97-
<exclusions>
98-
<exclusion>
99-
<groupId>io.grpc</groupId>
100-
<artifactId>grpc-core</artifactId>
101-
</exclusion>
102-
<exclusion>
103-
<groupId>io.grpc</groupId>
104-
<artifactId>grpc-api</artifactId>
105-
</exclusion>
106-
</exclusions>
10776
</dependency>
10877

10978
<dependency>

‎prj/coherence-java-client/src/main/java/com/oracle/coherence/client/GrpcChannelFactory.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
import java.util.concurrent.TimeUnit;
7777

7878
import java.util.concurrent.locks.ReentrantLock;
79+
import java.util.stream.Collectors;
7980

8081
/**
8182
* A default implementation of {@link GrpcChannelFactory}.
@@ -460,8 +461,16 @@ public void run()
460461
.set(LoadBalancer.ATTR_HEALTH_CHECKING_CONFIG, config)
461462
.build();
462463

464+
// ToDo: This is a work around for a bug in gRPC Java 1.60.0
465+
// We should be able to create a single EquivalentAddressGroup with all the addresses in
466+
// but if we do that gRPC throws an NPE
467+
// This code can be changed when gRPC fixes the issues
468+
List<EquivalentAddressGroup> listGroup = list.stream()
469+
.map(addr -> new EquivalentAddressGroup(addr, attrs))
470+
.collect(Collectors.toList());
471+
463472
result = NameResolver.ResolutionResult.newBuilder()
464-
.setAddresses(Collections.singletonList(new EquivalentAddressGroup(list, attrs)))
473+
.setAddresses(listGroup)
465474
.setAttributes(Attributes.EMPTY)
466475
.build();
467476
}

‎prj/etc/dependency-check-suppression.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -474,17 +474,4 @@
474474
<cve>CVE-2023-5763</cve>
475475
</suppress>
476476

477-
<!-- COH-29067 Update grpc-*-1.57.1 jar if and when fix available for CVE-2023-44487
478-
-->
479-
<suppress>
480-
<notes><![CDATA[
481-
file name: grpc-core-1.57.1.jar
482-
file name: grpc-protobuf-1.57.1.jar
483-
]]></notes>
484-
<packageUrl regex="true">^pkg:maven/io\.grpc/grpc.*@.*$</packageUrl>
485-
<cpe>cpe:2.3:a:grpc:grpc</cpe>
486-
<cpe>cpe:2.3:a:protobuf:protobuf</cpe>
487-
<cve>CVE-2023-44487</cve>
488-
</suppress>
489-
490477
</suppressions>

‎prj/examples/guides/600-response-caching/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ coherenceGroupId=com.oracle.coherence.ce
1010

1111
junitVersion=5.8.2
1212

13-
helidonVersion=2.6.4
13+
helidonVersion=2.6.5

‎prj/examples/guides/600-response-caching/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>io.helidon.applications</groupId>
1616
<artifactId>helidon-mp</artifactId>
17-
<version>2.6.4</version>
17+
<version>2.6.5</version>
1818
<relativePath/>
1919
</parent>
2020

‎prj/examples/tutorials/500-graphql/complete/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
coherenceVersion=22.06.7-SNAPSHOT
99
coherenceGroupId=com.oracle.coherence.ce
1010

11-
helidonVersion=2.6.4
11+
helidonVersion=2.6.5
1212

1313
junitVersion=5.8.2
1414

‎prj/examples/tutorials/500-graphql/complete/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<coherence.group.id>com.oracle.coherence.ce</coherence.group.id>
2323
<coherence.version>${project.version}</coherence.version>
24-
<helidon.version>2.6.4</helidon.version>
24+
<helidon.version>2.6.5</helidon.version>
2525

2626
<java.version>11</java.version>
2727
<java.version.release>11</java.version.release>

‎prj/examples/tutorials/500-graphql/initial/gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
coherenceVersion=22.06.7-SNAPSHOT
99
coherenceGroupId=com.oracle.coherence.ce
1010

11-
helidonVersion=2.6.4
11+
helidonVersion=2.6.5
1212

1313
junitVersion=5.8.2
1414

0 commit comments

Comments
 (0)