Skip to content

Update versions. Remove commons-lang:2.6. #123

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
sswguo merged 1 commit into from
Oct 23, 2025
Merged

Update versions. Remove commons-lang:2.6. #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,10 @@

<artifactId>path-mapped-common</artifactId>

<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion common/src/main/java/org/commonjava/storage/pathmapped/util/PathMapUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.List;
import java.util.UUID;

import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isBlank;

public class PathMapUtils
{
Expand Down
31 changes: 27 additions & 4 deletions pathdb/datastax/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,39 @@
<artifactId>path-mapped-pathdb-datastax</artifactId>

<dependencies>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<!-- Managing vulnerable versions of netty from cassandra to avoid CVE -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</dependency>
<!--Datastax Java Driver-->
<dependency>
<groupId>com.datastax.cassandra</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<version>${datastaxVersion}</version>
<version>${cassandraVersion}</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.datastax.cassandra</groupId>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra-driver-mapping</artifactId>
<version>${datastaxVersion}</version>
<version>${cassandraVersion}</version>
</dependency>
<!-- web-commons-bom:26 has guava 18. bom versions above that have 29 or 31. This
conflicts with cassandra-unit which requires 21 or less. Also CassandraPathDB
uses code that has been deprecated in later versions of guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
Copy link
Contributor Author

@rnc rnc Oct 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sswguo Unless I override guava I get test and/or compilation failures.

Copy link
Member

@sswguo sswguo Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep this to make the test/compilation working.

</dependency>
<dependency>
<groupId>org.cassandraunit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion ...stax/src/main/java/org/commonjava/storage/pathmapped/pathdb/datastax/CassandraPathDB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@

import static com.datastax.driver.core.ConsistencyLevel.*;
import static java.util.Collections.emptySet;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;
import static org.commonjava.storage.pathmapped.pathdb.datastax.util.CassandraPathDBUtils.getHoursInDay;
import static org.commonjava.storage.pathmapped.spi.PathDB.FileType.*;
import static org.commonjava.storage.pathmapped.util.PathMapUtils.ROOT_DIR;
Expand Down
24 changes: 14 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.commonjava</groupId>
<artifactId>commonjava</artifactId>
<version>19</version>
<version>21</version>
</parent>

<groupId>org.commonjava.util</groupId>
Expand Down Expand Up @@ -51,17 +51,25 @@
<projectEmail>nos-devel@redhat.com</projectEmail>
<javaVersion>11</javaVersion>
<test-forkCount>1</test-forkCount>
<datastaxVersion>3.7.2</datastaxVersion>
<cassandraVersion>3.12.1</cassandraVersion>
<cassandraUnitVersion>3.11.2.0</cassandraUnitVersion>
<hibernateVersion>5.4.4.Final</hibernateVersion>
<o11yphantVersion>1.4</o11yphantVersion>
<h2Version>1.4.188</h2Version>
<hibernateVersion>5.4.33.Final</hibernateVersion>
<o11yphantVersion>1.9.2</o11yphantVersion>
<h2Version>2.2.220</h2Version>
<pmd.failOnViolation>false</pmd.failOnViolation>
<aws.java.sdk.version>2.21.20</aws.java.sdk.version>
</properties>

<dependencyManagement>
<dependencies>
<!-- Managing vulnerable versions of netty from cassandra to avoid CVE -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>4.1.118.Final</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bom</artifactId>
Expand Down Expand Up @@ -103,7 +111,7 @@
<dependency>
<groupId>org.commonjava.boms</groupId>
<artifactId>web-commons-bom</artifactId>
<version>24</version>
<version>31</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -124,10 +132,6 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand Down
36 changes: 36 additions & 0 deletions storage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,37 @@
<groupId>org.commonjava.util</groupId>
<artifactId>o11yphant-metrics-api</artifactId>
</dependency>
<!-- Managing vulnerable versions of netty from AWS to avoid CVE -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3</artifactId>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>

</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>

<!--Test-->
Expand All @@ -51,6 +79,14 @@
<artifactId>path-mapped-pathdb-jpa</artifactId>
<scope>test</scope>
</dependency>
<!-- web-commons-bom:26 has guava 18. bom versions above that have 29 or 31. This
conflicts with cassandra-unit which requires 21 or less -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.cassandraunit</groupId>
<artifactId>cassandra-unit</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion storage/src/main/java/org/commonjava/storage/pathmapped/core/PathDBOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.slf4j.LoggerFactory;

import static java.util.Objects.isNull;
import static org.apache.commons.lang.StringUtils.isNotBlank;
import static org.apache.commons.lang3.StringUtils.isNotBlank;

/**
* PathDB output stream that saves a record to datastore only on successful completion.
Expand Down
2 changes: 1 addition & 1 deletion storage/src/main/java/org/commonjava/storage/pathmapped/core/PathMappedFileManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

import static java.util.Collections.emptyList;
import static java.util.Collections.emptyMap;
import static org.apache.commons.lang.StringUtils.isBlank;
import static org.apache.commons.lang3.StringUtils.isBlank;
import static org.commonjava.storage.pathmapped.util.PathMapUtils.ROOT_DIR;

public class PathMappedFileManager implements Closeable
Expand Down
3 changes: 1 addition & 2 deletions storage/src/test/java/org/commonjava/storage/pathmapped/ErrorIOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@
package org.commonjava.storage.pathmapped;

import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.reflect.FieldUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.junit.Assert;
import org.junit.Test;

import java.io.BufferedOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
Expand Down