From e1a76ab356bea119f2f5deab118bca4bedf30c18 Mon Sep 17 00:00:00 2001
From: Santiago Pericas-Geertsen <santiago.pericasgeertsen@oracle.com>
Date: Wed, 31 Jul 2024 10:52:43 -0400
Subject: [PATCH] Fixes problems in some pom files. Simplifies test.

Signed-off-by: Santiago Pericas-Geertsen <santiago.pericasgeertsen@oracle.com>
---
 examples/microprofile/grpc/pom.xml            |  2 +-
 .../microprofile/grpc/StringServiceTest.java  |  5 ----
 microprofile/grpc/client/pom.xml              | 30 +++++++++++++++++--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/examples/microprofile/grpc/pom.xml b/examples/microprofile/grpc/pom.xml
index 5f0c47e3ce8..eadf8814af5 100644
--- a/examples/microprofile/grpc/pom.xml
+++ b/examples/microprofile/grpc/pom.xml
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>io.helidon.logging</groupId>
             <artifactId>helidon-logging-jul</artifactId>
-            <scope>test</scope>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <!--
diff --git a/examples/microprofile/grpc/src/test/java/io/helidon/examples/microprofile/grpc/StringServiceTest.java b/examples/microprofile/grpc/src/test/java/io/helidon/examples/microprofile/grpc/StringServiceTest.java
index 15f51306ff4..0d37d16cde3 100644
--- a/examples/microprofile/grpc/src/test/java/io/helidon/examples/microprofile/grpc/StringServiceTest.java
+++ b/examples/microprofile/grpc/src/test/java/io/helidon/examples/microprofile/grpc/StringServiceTest.java
@@ -22,9 +22,6 @@
 import java.util.stream.Stream;
 
 import io.helidon.grpc.api.Grpc;
-import io.helidon.microprofile.grpc.client.GrpcClientCdiExtension;
-import io.helidon.microprofile.grpc.server.GrpcMpCdiExtension;
-import io.helidon.microprofile.testing.junit5.AddExtension;
 import io.helidon.microprofile.testing.junit5.HelidonTest;
 
 import io.grpc.stub.StreamObserver;
@@ -37,8 +34,6 @@
 import static org.hamcrest.Matchers.hasSize;
 
 @HelidonTest
-@AddExtension(GrpcMpCdiExtension.class)
-@AddExtension(GrpcClientCdiExtension.class)
 class StringServiceTest {
 
     @Inject
diff --git a/microprofile/grpc/client/pom.xml b/microprofile/grpc/client/pom.xml
index e6980fae5e2..653580e479b 100644
--- a/microprofile/grpc/client/pom.xml
+++ b/microprofile/grpc/client/pom.xml
@@ -112,7 +112,6 @@
             -->
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
-            <scope>provided</scope>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -136,13 +135,40 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.helidon.codegen</groupId>
+                            <artifactId>helidon-codegen-apt</artifactId>
+                            <version>${helidon.version}</version>
+                        </path>
                         <path>
                             <groupId>io.helidon.builder</groupId>
-                            <artifactId>helidon-builder-processor</artifactId>
+                            <artifactId>helidon-builder-codegen</artifactId>
+                            <version>${helidon.version}</version>
+                        </path>
+                        <path>
+                            <groupId>io.helidon.codegen</groupId>
+                            <artifactId>helidon-codegen-helidon-copyright</artifactId>
                             <version>${helidon.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>io.helidon.codegen</groupId>
+                        <artifactId>helidon-codegen-apt</artifactId>
+                        <version>${helidon.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>io.helidon.builder</groupId>
+                        <artifactId>helidon-builder-codegen</artifactId>
+                        <version>${helidon.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>io.helidon.codegen</groupId>
+                        <artifactId>helidon-codegen-helidon-copyright</artifactId>
+                        <version>${helidon.version}</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>