Skip to content

HDDS-11733. Remove okio versioning and unused okhttp dependency #7447

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.

Sign up for GitHub

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

Merged
adoroszlai merged 3 commits into from
Nov 21, 2024
Merged

HDDS-11733. Remove okio versioning and unused okhttp dependency #7447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6001b29
HDDS-11733. Remove okio versioning and unused okhttp dependency
adoroszlai Nov 16, 2024
4ff2214
add missing LICENSE entries related to okio
adoroszlai Nov 21, 2024
5f09f98
Merge remote-tracking branch 'origin/master' into HDDS-11733
adoroszlai Nov 21, 2024
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
3 changes: 3 additions & 0 deletions hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ Apache License 2.0
com.nimbusds:nimbus-jose-jwt
com.squareup.okhttp3:okhttp
com.squareup.okio:okio
com.squareup.okio:okio-jvm
commons-beanutils:commons-beanutils
commons-cli:commons-cli
commons-codec:commons-codec
Expand Down Expand Up @@ -431,6 +432,8 @@ Apache License 2.0
org.jetbrains:annotations
org.jetbrains.kotlin:kotlin-stdlib
org.jetbrains.kotlin:kotlin-stdlib-common
org.jetbrains.kotlin:kotlin-stdlib-jdk7
org.jetbrains.kotlin:kotlin-stdlib-jdk8
org.jboss.weld.servlet:weld-servlet-shaded
org.jheaps:jheaps
org.jooq:jooq
Expand Down
12 changes: 0 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<guice.version>6.0.0</guice.version>
<gson.version>2.10.1</gson.version>

<okhttp.version>2.7.5</okhttp.version>
<okio.version>3.6.0</okio.version>
<mockito.version>4.11.0</mockito.version>
<hamcrest.version>2.2</hamcrest.version>
<junit5.version>5.11.3</junit5.version>
Expand Down Expand Up @@ -320,16 +318,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio.version}</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp</groupId>
<artifactId>okhttp</artifactId>
<version>${okhttp.version}</version>
</dependency>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
Expand Down
Loading