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.

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

Jump to bottom

ARD-15114 upgrade tinkerpop 3.x.x to 3.5.4 due to security issues w/ databind #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+112 −112
Open

ARD-15114 upgrade tinkerpop 3.x.x to 3.5.4 due to security issues w/ databind #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20286d1
ARD-15114 upgrade tinkerpop 3.x.x to 3.5.4 due to security issues w/ …
holyjak Jan 13, 2023
713527a
Try to fix tests - but too many changes, would need to write from scr…
holyjak Jan 13, 2023
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
17 changes: 7 additions & 10 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
(defproject ardoq/ogre "3.0.0.0-beta2"
(defproject com.ardoq/ogre "3.0.0.0-beta2"
:description "Clojure dialect of the Gremlin graph processing language"
:url "https://github.com/clojurewerkz/ogre"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:aot :all
:dependencies [[org.clojure/clojure "1.8.0"]
[potemkin "0.4.3"]
[org.apache.tinkerpop/gremlin-core "3.2.3"]
[org.apache.tinkerpop/gremlin-test "3.2.3" :scope "test"]
[org.apache.tinkerpop/tinkergraph-gremlin "3.2.3" :scope "test"]
[org.apache.tinkerpop/gremlin-core "3.5.4"]
[org.apache.tinkerpop/gremlin-test "3.5.4" :scope "test"]
[org.apache.tinkerpop/tinkergraph-gremlin "3.5.4" :scope "test"]
[org.slf4j/slf4j-log4j12 "1.7.21" :scope "test"]]
:source-paths ["src/clojure"]
:profiles {:dev { :global-vars {*assert* true}
Expand All @@ -19,12 +19,9 @@
:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
:master {:dependencies [[org.clojure/clojure "1.9.0-master-SNAPSHOT"]]}}
:aliases {"all" ["with-profile" "dev:dev,master:dev,1.7"]}
:repositories {"sonatype" {:url "http://oss.sonatype.org/content/repositories/releases"
:snapshots false
:releases {:checksum :fail :update :always}}
"sonatype-snapshots" {:url "http://oss.sonatype.org/content/repositories/snapshots"
:snapshots true
:releases {:checksum :fail :update :always}}}
;; As of TinkerPop 3.5.4, org.apache.tinkerpop.gremlin.process.traversal.dsl.GremlinDslProcessor
;; specifies RELEASE_8
:javac-options ["-target" "8" "-source" "8"]
:plugins [[lein-junit "1.1.8"]]
:junit ["test/java"]
:test-paths ["test/clojure"]
Expand Down
197 changes: 100 additions & 97 deletions test/java/org/clojurewerkz/ogre/gremlin/process/OgreTinkerPopCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1452,49 +1452,51 @@ public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_VX1X_outE_

}

public static class MapKeysTestTraversals extends MapKeysTest {
private static final String NS = "clojurewerkz.ogre.suite.map-keys-test";
static {
require.invoke(Clojure.read(NS));
}
@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_mapKeys() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_mapKeys").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys").invoke(g);
}

}

public static class MapValuesTestTraversals extends MapValuesTest {
private static final String NS = "clojurewerkz.ogre.suite.map-values-test";
static {
require.invoke(Clojure.read(NS));
}
@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_mapValues() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_mapValues").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues").invoke(g);
}

}
// // MapKeysTest removed between tinkerpop 3.2 and 3.5.4
// public static class MapKeysTestTraversals extends MapKeysTest {
// private static final String NS = "clojurewerkz.ogre.suite.map-keys-test";
// static {
// require.invoke(Clojure.read(NS));
// }
// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_mapKeys() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_mapKeys").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys").invoke(g);
// }

// }

// // MapValuesTest removed between tinkerpop 3.2 and 3.5.4
// public static class MapValuesTestTraversals extends MapValuesTest {
// private static final String NS = "clojurewerkz.ogre.suite.map-values-test";
// static {
// require.invoke(Clojure.read(NS));
// }
// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_mapValues() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_mapValues").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues").invoke(g);
// }

// }

public static class MaxTestTraversals extends MaxTest {
private static final String NS = "clojurewerkz.ogre.suite.max-test";
Expand Down Expand Up @@ -2495,60 +2497,61 @@ public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_group_by

}

public static class GroupTestV3d0Traversals extends GroupTestV3d0 {
private static final String NS = "clojurewerkz.ogre.suite.group-test-v3d0";
static {
require.invoke(Clojure.read(NS));
}
@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byX1X_byXcountXlocalXX_capXaX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byX1X_byXcountXlocalXX_capXaX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byX1X_byXcountXlocalXX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byX1X_byXcountXlocalXX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_group_byXnameX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_group_byXnameX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_groupXaX_byXnameX_capXaX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_groupXaX_byXnameX_capXaX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX").invoke(g);
}

@Override
@SuppressWarnings("unchecked")
public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_group_byXoutE_countX_byXnameX() {
return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_group_byXoutE_countX_byXnameX").invoke(g);
}

}
// // GroupTestV3d0 removed between tinkerpop 3.2 and 3.5.4
// public static class GroupTestV3d0Traversals extends GroupTestV3d0 {
// private static final String NS = "clojurewerkz.ogre.suite.group-test-v3d0";
// static {
// require.invoke(Clojure.read(NS));
// }
// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byX1X_byXcountXlocalXX_capXaX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_repeatXbothXfollowedByXX_timesX2X_groupXaX_byXsongTypeX_byX1X_byXcountXlocalXX_capXaX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byX1X_byXcountXlocalXX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byX1X_byXcountXlocalXX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_group_byXnameX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_group_byXnameX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_groupXaX_byXnameX_capXaX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_groupXaX_byXnameX_capXaX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX").invoke(g);
// }

// @Override
// @SuppressWarnings("unchecked")
// public org.apache.tinkerpop.gremlin.process.traversal.Traversal get_g_V_group_byXoutE_countX_byXnameX() {
// return (org.apache.tinkerpop.gremlin.process.traversal.Traversal) Clojure.var(NS, "get_g_V_group_byXoutE_countX_byXnameX").invoke(g);
// }

// }

public static class GroupCountTestTraversals extends GroupCountTest {
private static final String NS = "clojurewerkz.ogre.suite.group-count-test";
Expand Down
10 changes: 5 additions & 5 deletions test/java/org/clojurewerkz/ogre/gremlin/process/TinkerGraphProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerProperty;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertex;
import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerVertexProperty;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration2.Configuration;
import org.junit.Ignore;

import java.io.File;
Expand Down Expand Up @@ -51,11 +51,11 @@ public Map<String, Object> getBaseConfiguration(final String graphName, final Cl
final String idMaker = (idManager.equals(TinkerGraph.DefaultIdManager.ANY) ? selectIdMakerFromTest(test, testMethodName) : idManager).name();
return new HashMap<String, Object>() {{
put(Graph.GRAPH, TinkerGraph.class.getName());
put(TinkerGraph.CONFIG_VERTEX_ID, idMaker);
put(TinkerGraph.CONFIG_EDGE_ID, idMaker);
put(TinkerGraph.CONFIG_VERTEX_PROPERTY_ID, idMaker);
put(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER, idMaker);
put(TinkerGraph.GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER, idMaker);
put(TinkerGraph.GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER, idMaker);
if (requiresListCardinalityAsDefault(loadGraphWith, test, testMethodName))
put(TinkerGraph.CONFIG_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name());
put(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY, VertexProperty.Cardinality.list.name());
}};
}

Expand Down