Work-around modularity issues with okio (square/okio#1306)

barchetta · Jul 26, 2023 · 605488c · 605488c
1 parent 9f44fbe
commit 605488c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/applications/parent/pom.xml b/applications/parent/pom.xml
@@ -105,6 +105,8 @@
                                 <overWriteIfNewer>true</overWriteIfNewer>
                                 <overWriteIfNewer>true</overWriteIfNewer>
                                 <includeScope>runtime</includeScope>
+                                <!-- Hack to work-around https://github.com/square/okio/issues/1306 -->
+                                <excludeArtifactIds>okio</excludeArtifactIds>
                             </configuration>
                         </execution>
                     </executions>

diff --git a/tracing/jaeger/pom.xml b/tracing/jaeger/pom.xml
@@ -82,6 +82,13 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+        <!-- Hack to get around module issue in okio. See module-info.java -->
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib</artifactId>
+            <version>1.8.0</version>
+            <scope>provided</scope>
+        </dependency>
         <!--
          - Test dependencies
          -->

diff --git a/tracing/jaeger/src/main/java/module-info.java b/tracing/jaeger/src/main/java/module-info.java
@@ -25,6 +25,12 @@
     requires io.helidon.common.context;
     requires io.helidon.common.configurable;
 
+    // Hack because okhttp and okio are not modularized
+    // but kotlin.stdlib is, and therefore kotlin.stdlib
+    // will be missing from module graph unless some module
+    // requires it.
+    requires kotlin.stdlib;
+
     requires static io.helidon.config.metadata;
 
     requires java.logging;