Skip to content

Commit 3b75607

Browse files
authored
JAVA-3013: Updates to other components to address additional 4.x CVEs (#1595)
1 parent 6304cb7 commit 3b75607

File tree

7 files changed

+1292
-26
lines changed

7 files changed

+1292
-26
lines changed

core-shaded/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@
331331
<!--
332332
5) Don't import packages imported by shaded classes, if they are not used by the
333333
driver bundle.
334-
-->!com.google.protobuf.*, !com.jcraft.jzlib.*, !com.ning.compress.*, !lzma.sdk.*, !net.jpountz.xxhash.*, !org.bouncycastle.*, !org.conscrypt.*, !org.apache.commons.logging.*, !org.apache.log4j.*, !org.apache.logging.log4j.*, !org.eclipse.jetty.*, !org.jboss.marshalling.*, !sun.misc.*, !sun.security.*, !com.barchart.udt.*, !com.fasterxml.aalto.*, !com.sun.nio.sctp.*, !gnu.io.*, !org.xml.sax.*, !org.w3c.dom.*, *
334+
-->!com.google.protobuf.*, !com.jcraft.jzlib.*, !com.ning.compress.*, !lzma.sdk.*, !net.jpountz.xxhash.*, !org.bouncycastle.*, !org.conscrypt.*, !org.apache.commons.logging.*, !org.apache.log4j.*, !org.apache.logging.log4j.*, !org.eclipse.jetty.*, !org.jboss.marshalling.*, !sun.misc.*, !sun.security.*, !com.barchart.udt.*, !com.fasterxml.aalto.*, !com.sun.nio.sctp.*, !gnu.io.*, !org.xml.sax.*, !org.w3c.dom.*, !com.aayushatharva.brotli4j.*, !com.github.luben.zstd.*, *
335335
</Import-Package>
336336
<!--
337337
Export:

core/revapi.json

+1,278
Large diffs are not rendered by default.

core/src/main/java/com/datastax/dse/driver/internal/core/graph/DseGraphTraversal.java

-10
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,6 @@ public DseGraphTraversal(AsyncGraphResultSet firstPage) {
3333
this.graphNodeIterator = GraphResultSets.toSync(firstPage).iterator();
3434
}
3535

36-
@Override
37-
@SuppressWarnings("deprecation")
38-
public org.apache.tinkerpop.gremlin.process.remote.traversal.RemoteTraversalSideEffects
39-
getSideEffects() {
40-
// This was deprecated as part of TINKERPOP-2265
41-
// and is no longer being promoted as a feature.
42-
// return null but do not throw "NotSupportedException"
43-
return null;
44-
}
45-
4636
@Override
4737
public boolean hasNext() {
4838
return graphNodeIterator.hasNext();

integration-tests/src/test/java/com/datastax/dse/driver/api/core/graph/remote/ClassicGraphTraversalRemoteIT.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package com.datastax.dse.driver.api.core.graph.remote;
1717

18+
import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
19+
1820
import com.datastax.dse.driver.api.core.graph.DseGraph;
1921
import com.datastax.dse.driver.api.core.graph.GraphTestSupport;
2022
import com.datastax.dse.driver.api.core.graph.SampleGraphScripts;
@@ -24,9 +26,7 @@
2426
import com.datastax.oss.driver.api.testinfra.DseRequirement;
2527
import com.datastax.oss.driver.api.testinfra.ccm.CustomCcmRule;
2628
import com.datastax.oss.driver.api.testinfra.session.SessionRule;
27-
import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
2829
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
29-
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
3030
import org.junit.BeforeClass;
3131
import org.junit.ClassRule;
3232
import org.junit.rules.RuleChain;
@@ -70,14 +70,12 @@ protected boolean isGraphBinary() {
7070

7171
@Override
7272
protected GraphTraversalSource graphTraversalSource() {
73-
return AnonymousTraversalSource.traversal()
74-
.withRemote(DseGraph.remoteConnectionBuilder(session()).build());
73+
return traversal().withRemote(DseGraph.remoteConnectionBuilder(session()).build());
7574
}
7675

7776
@Override
7877
protected SocialTraversalSource socialTraversalSource() {
79-
return EmptyGraph.instance()
80-
.traversal(SocialTraversalSource.class)
78+
return traversal(SocialTraversalSource.class)
8179
.withRemote(DseGraph.remoteConnectionBuilder(session()).build());
8280
}
8381

integration-tests/src/test/java/com/datastax/dse/driver/api/core/graph/remote/CoreGraphTraversalRemoteIT.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616
package com.datastax.dse.driver.api.core.graph.remote;
1717

18+
import static org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource.traversal;
19+
1820
import com.datastax.dse.driver.api.core.graph.DseGraph;
1921
import com.datastax.dse.driver.api.core.graph.GraphTestSupport;
2022
import com.datastax.dse.driver.api.core.graph.SampleGraphScripts;
@@ -24,9 +26,7 @@
2426
import com.datastax.oss.driver.api.testinfra.DseRequirement;
2527
import com.datastax.oss.driver.api.testinfra.ccm.CustomCcmRule;
2628
import com.datastax.oss.driver.api.testinfra.session.SessionRule;
27-
import org.apache.tinkerpop.gremlin.process.traversal.AnonymousTraversalSource;
2829
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
29-
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
3030
import org.junit.BeforeClass;
3131
import org.junit.ClassRule;
3232
import org.junit.rules.RuleChain;
@@ -60,15 +60,14 @@ protected boolean isGraphBinary() {
6060

6161
@Override
6262
protected GraphTraversalSource graphTraversalSource() {
63-
return AnonymousTraversalSource.traversal()
63+
return traversal()
6464
.withRemote(DseGraph.remoteConnectionBuilder(session()).build())
6565
.with("allow-filtering");
6666
}
6767

6868
@Override
6969
protected SocialTraversalSource socialTraversalSource() {
70-
return EmptyGraph.instance()
71-
.traversal(SocialTraversalSource.class)
70+
return traversal(SocialTraversalSource.class)
7271
.withRemote(DseGraph.remoteConnectionBuilder(session()).build())
7372
.with("allow-filtering");
7473
}

manual/core/integration/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,7 @@ Here are the recommended TinkerPop versions for each driver version:
562562

563563
<table>
564564
<tr><th>Driver version</th><th>TinkerPop version</th></tr>
565+
<tr><td>4.14.1</td><td>3.5.3</td></tr>
565566
<tr><td>4.14.0</td><td>3.4.10</td></tr>
566567
<tr><td>4.13.0</td><td>3.4.10</td></tr>
567568
<tr><td>4.12.0</td><td>3.4.10</td></tr>

pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
When upgrading TinkerPop please upgrade the version matrix in
5454
manual/core/integration/README.md
5555
-->
56-
<tinkerpop.version>3.4.10</tinkerpop.version>
56+
<tinkerpop.version>3.5.3</tinkerpop.version>
5757
<slf4j.version>1.7.26</slf4j.version>
5858
<reactive-streams.version>1.0.3</reactive-streams.version>
5959
<json.version>20210307</json.version>
60-
<jackson.version>2.12.2</jackson.version>
61-
<jackson-databind.version>2.12.2</jackson-databind.version>
60+
<jackson.version>2.13.2</jackson.version>
61+
<jackson-databind.version>2.13.2.2</jackson-databind.version>
6262
<legacy-jackson.version>1.9.12</legacy-jackson.version>
6363
<!-- optional dependencies -->
6464
<snappy.version>1.1.7.3</snappy.version>
@@ -81,7 +81,7 @@
8181
<awaitility.version>4.0.3</awaitility.version>
8282
<apacheds.version>2.0.0-M19</apacheds.version>
8383
<surefire.version>2.22.2</surefire.version>
84-
<graalapi.version>21.0.0.2</graalapi.version>
84+
<graalapi.version>22.0.0.2</graalapi.version>
8585
<skipTests>false</skipTests>
8686
<skipUnitTests>${skipTests}</skipUnitTests>
8787
</properties>

0 commit comments

Comments
 (0)