Skip to content

Commit 050dea4

Browse files
sswguosswguo
authored
Merge pull request #123 from rnc/BR1
Update versions. Remove commons-lang:2.6.
2 parents 0c07865 + fb9e46a commit 050dea4

9 files changed

Lines changed: 88 additions & 20 deletions

File tree

‎common/pom.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,10 @@
2626

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

29+
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.commons</groupId>
32+
<artifactId>commons-lang3</artifactId>
33+
</dependency>
34+
</dependencies>
2935
</project>

‎common/src/main/java/org/commonjava/storage/pathmapped/util/PathMapUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.List;
2323
import java.util.UUID;
2424

25-
import static org.apache.commons.lang.StringUtils.isBlank;
25+
import static org.apache.commons.lang3.StringUtils.isBlank;
2626

2727
public class PathMapUtils
2828
{

‎pathdb/datastax/pom.xml‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,39 @@
2727
<artifactId>path-mapped-pathdb-datastax</artifactId>
2828

2929
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.commons</groupId>
32+
<artifactId>commons-lang3</artifactId>
33+
</dependency>
34+
<!-- Managing vulnerable versions of netty from cassandra to avoid CVE -->
35+
<dependency>
36+
<groupId>io.netty</groupId>
37+
<artifactId>netty-handler</artifactId>
38+
</dependency>
3039
<!--Datastax Java Driver-->
3140
<dependency>
32-
<groupId>com.datastax.cassandra</groupId>
41+
<groupId>org.apache.cassandra</groupId>
3342
<artifactId>cassandra-driver-core</artifactId>
34-
<version>${datastaxVersion}</version>
43+
<version>${cassandraVersion}</version>
44+
<exclusions>
45+
<exclusion>
46+
<groupId>io.netty</groupId>
47+
<artifactId>netty-handler</artifactId>
48+
</exclusion>
49+
</exclusions>
3550
</dependency>
3651
<dependency>
37-
<groupId>com.datastax.cassandra</groupId>
52+
<groupId>org.apache.cassandra</groupId>
3853
<artifactId>cassandra-driver-mapping</artifactId>
39-
<version>${datastaxVersion}</version>
54+
<version>${cassandraVersion}</version>
55+
</dependency>
56+
<!-- web-commons-bom:26 has guava 18. bom versions above that have 29 or 31. This
57+
conflicts with cassandra-unit which requires 21 or less. Also CassandraPathDB
58+
uses code that has been deprecated in later versions of guava -->
59+
<dependency>
60+
<groupId>com.google.guava</groupId>
61+
<artifactId>guava</artifactId>
62+
<version>21.0</version>
4063
</dependency>
4164
<dependency>
4265
<groupId>org.cassandraunit</groupId>

‎pathdb/datastax/src/main/java/org/commonjava/storage/pathmapped/pathdb/datastax/CassandraPathDB.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
import static com.datastax.driver.core.ConsistencyLevel.*;
5959
import static java.util.Collections.emptySet;
60-
import static org.apache.commons.lang.StringUtils.isNotBlank;
60+
import static org.apache.commons.lang3.StringUtils.isNotBlank;
6161
import static org.commonjava.storage.pathmapped.pathdb.datastax.util.CassandraPathDBUtils.getHoursInDay;
6262
import static org.commonjava.storage.pathmapped.spi.PathDB.FileType.*;
6363
import static org.commonjava.storage.pathmapped.util.PathMapUtils.ROOT_DIR;

‎pom.xml‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.commonjava</groupId>
2323
<artifactId>commonjava</artifactId>
24-
<version>19</version>
24+
<version>21</version>
2525
</parent>
2626

2727
<groupId>org.commonjava.util</groupId>
@@ -51,17 +51,25 @@
5151
<projectEmail>nos-devel@redhat.com</projectEmail>
5252
<javaVersion>11</javaVersion>
5353
<test-forkCount>1</test-forkCount>
54-
<datastaxVersion>3.7.2</datastaxVersion>
54+
<cassandraVersion>3.12.1</cassandraVersion>
5555
<cassandraUnitVersion>3.11.2.0</cassandraUnitVersion>
56-
<hibernateVersion>5.4.4.Final</hibernateVersion>
57-
<o11yphantVersion>1.4</o11yphantVersion>
58-
<h2Version>1.4.188</h2Version>
56+
<hibernateVersion>5.4.33.Final</hibernateVersion>
57+
<o11yphantVersion>1.9.2</o11yphantVersion>
58+
<h2Version>2.2.220</h2Version>
5959
<pmd.failOnViolation>false</pmd.failOnViolation>
6060
<aws.java.sdk.version>2.21.20</aws.java.sdk.version>
6161
</properties>
6262

6363
<dependencyManagement>
6464
<dependencies>
65+
<!-- Managing vulnerable versions of netty from cassandra to avoid CVE -->
66+
<dependency>
67+
<groupId>io.netty</groupId>
68+
<artifactId>netty-bom</artifactId>
69+
<version>4.1.118.Final</version>
70+
<type>pom</type>
71+
<scope>import</scope>
72+
</dependency>
6573
<dependency>
6674
<groupId>software.amazon.awssdk</groupId>
6775
<artifactId>bom</artifactId>
@@ -103,7 +111,7 @@
103111
<dependency>
104112
<groupId>org.commonjava.boms</groupId>
105113
<artifactId>web-commons-bom</artifactId>
106-
<version>24</version>
114+
<version>31</version>
107115
<type>pom</type>
108116
<scope>import</scope>
109117
</dependency>
@@ -124,10 +132,6 @@
124132
<groupId>commons-io</groupId>
125133
<artifactId>commons-io</artifactId>
126134
</dependency>
127-
<dependency>
128-
<groupId>commons-lang</groupId>
129-
<artifactId>commons-lang</artifactId>
130-
</dependency>
131135
<dependency>
132136
<groupId>commons-codec</groupId>
133137
<artifactId>commons-codec</artifactId>

‎storage/pom.xml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,37 @@
3535
<groupId>org.commonjava.util</groupId>
3636
<artifactId>o11yphant-metrics-api</artifactId>
3737
</dependency>
38+
<!-- Managing vulnerable versions of netty from AWS to avoid CVE -->
39+
<dependency>
40+
<groupId>io.netty</groupId>
41+
<artifactId>netty-codec-http</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>io.netty</groupId>
45+
<artifactId>netty-codec-http2</artifactId>
46+
</dependency>
47+
<dependency>
48+
<groupId>io.netty</groupId>
49+
<artifactId>netty-common</artifactId>
50+
</dependency>
51+
<dependency>
52+
<groupId>io.netty</groupId>
53+
<artifactId>netty-handler</artifactId>
54+
</dependency>
3855
<dependency>
3956
<groupId>software.amazon.awssdk</groupId>
4057
<artifactId>s3</artifactId>
58+
<exclusions>
59+
<exclusion>
60+
<groupId>io.netty</groupId>
61+
<artifactId>*</artifactId>
62+
</exclusion>
63+
</exclusions>
64+
65+
</dependency>
66+
<dependency>
67+
<groupId>org.apache.commons</groupId>
68+
<artifactId>commons-lang3</artifactId>
4169
</dependency>
4270

4371
<!--Test-->
@@ -51,6 +79,14 @@
5179
<artifactId>path-mapped-pathdb-jpa</artifactId>
5280
<scope>test</scope>
5381
</dependency>
82+
<!-- web-commons-bom:26 has guava 18. bom versions above that have 29 or 31. This
83+
conflicts with cassandra-unit which requires 21 or less -->
84+
<dependency>
85+
<groupId>com.google.guava</groupId>
86+
<artifactId>guava</artifactId>
87+
<version>21.0</version>
88+
<scope>test</scope>
89+
</dependency>
5490
<dependency>
5591
<groupId>org.cassandraunit</groupId>
5692
<artifactId>cassandra-unit</artifactId>

‎storage/src/main/java/org/commonjava/storage/pathmapped/core/PathDBOutputStream.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.slf4j.LoggerFactory;
3030

3131
import static java.util.Objects.isNull;
32-
import static org.apache.commons.lang.StringUtils.isNotBlank;
32+
import static org.apache.commons.lang3.StringUtils.isNotBlank;
3333

3434
/**
3535
* PathDB output stream that saves a record to datastore only on successful completion.

‎storage/src/main/java/org/commonjava/storage/pathmapped/core/PathMappedFileManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
import static java.util.Collections.emptyList;
4242
import static java.util.Collections.emptyMap;
43-
import static org.apache.commons.lang.StringUtils.isBlank;
43+
import static org.apache.commons.lang3.StringUtils.isBlank;
4444
import static org.commonjava.storage.pathmapped.util.PathMapUtils.ROOT_DIR;
4545

4646
public class PathMappedFileManager implements Closeable

‎storage/src/test/java/org/commonjava/storage/pathmapped/ErrorIOTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
package org.commonjava.storage.pathmapped;
1717

1818
import org.apache.commons.io.IOUtils;
19-
import org.apache.commons.lang.reflect.FieldUtils;
19+
import org.apache.commons.lang3.reflect.FieldUtils;
2020
import org.junit.Assert;
2121
import org.junit.Test;
2222

23-
import java.io.BufferedOutputStream;
2423
import java.io.IOException;
2524
import java.io.InputStream;
2625
import java.io.OutputStream;

0 commit comments

Comments
 (0)