Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.x: upgrade okio to 3.4.0 #7238

Merged
merged 4 commits into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions applications/parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@
<version.lib.ojdbc8>21.3.0.0</version.lib.ojdbc8>
<version.lib.database.messaging>19.3.0.0</version.lib.database.messaging>
<version.lib.okhttp3>3.14.9</version.lib.okhttp3>
<version.lib.okio>1.17.5</version.lib.okio>
<!-- Force upgrade to more current version -->
<version.lib.okio>3.4.0</version.lib.okio>
<version.lib.opentelemetry>1.22.0</version.lib.opentelemetry>
<version.lib.opentelemetry.semconv>1.22.0-alpha</version.lib.opentelemetry.semconv>
<version.lib.opentelemetry.opentracing.shim>1.22.0-alpha</version.lib.opentelemetry.opentracing.shim>
Expand Down
14 changes: 14 additions & 0 deletions etc/dependency-check-suppression.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,19 @@
<vulnerabilityName>CVE-2020-8908</vulnerabilityName>
</suppress>

<!-- False Positive. This does not apply to server Java deployment and certainly not to our use of graalvm SDK.
This vulnerability applies to Java deployments, typically in clients running sandboxed
Java Web Start applications or sandboxed Java applets, that load and run untrusted code
(e.g., code that comes from the internet) and rely on the Java sandbox for security. This
vulnerability does not apply to Java deployments, typically in servers, that load and run only trusted code
-->
<suppress>
<notes><![CDATA[
file name: graal-sdk-22.3.0.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/org\.graalvm\.sdk/graal\-sdk@.*$</packageUrl>
<vulnerabilityName>CVE-2023-22006</vulnerabilityName>
</suppress>


</suppressions>
7 changes: 7 additions & 0 deletions tracing/jaeger/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
-->
Expand Down
8 changes: 7 additions & 1 deletion tracing/jaeger/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2022 Oracle and/or its affiliates.
* Copyright (c) 2019, 2023 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -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;
Expand Down
Loading