From 29c6b0e014a2cafb72721f0e88eab47cb2b4ba35 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Mon, 28 Jan 2013 11:56:46 +0100
Subject: [PATCH] Fix compatibility of blueprints-core with java 5

---
 pom.xml                                       | 29 -----------------
 sonar-core/pom.xml                            | 32 +++++++++++++++++--
 .../java/org/sonar/core/graph/GraphUtil.java  | 27 ----------------
 .../org/sonar/core/graph/GraphUtilTest.java   | 18 -----------
 4 files changed, 30 insertions(+), 76 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1fb6b453aeb..600994e977b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -641,35 +641,6 @@
         <artifactId>asm-all</artifactId>
         <version>3.2</version>
       </dependency>
-      <dependency>
-        <groupId>com.tinkerpop.blueprints</groupId>
-        <artifactId>blueprints-core</artifactId>
-        <!--
-        Do not upgrade because of compatibility with Java 5.
-        See https://github.com/tinkerpop/blueprints/pull/352
-         -->
-        <version>2.0.0</version>
-        <exclusions>
-          <!-- we use our own GraphSON implementation based on json-simple -->
-          <exclusion>
-            <groupId>org.codehaus.jettison</groupId>
-            <artifactId>jettison</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-jaxrs</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <!--
-        Do not upgrade because of compatibility with Java 5.
-        See https://github.com/tinkerpop/pipes/pull/74
-         -->
-        <groupId>com.tinkerpop.gremlin</groupId>
-        <artifactId>gremlin-java</artifactId>
-        <version>2.0.0</version>
-      </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-classworlds</artifactId>
diff --git a/sonar-core/pom.xml b/sonar-core/pom.xml
index 14df0bb57fd..9e76b616a43 100644
--- a/sonar-core/pom.xml
+++ b/sonar-core/pom.xml
@@ -68,10 +68,15 @@
     <dependency>
       <groupId>com.tinkerpop.blueprints</groupId>
       <artifactId>blueprints-core</artifactId>
+      <version>2.2.0-java5</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/blueprints-core-2.2.0-java5.jar</systemPath>
     </dependency>
     <dependency>
-      <groupId>com.tinkerpop.gremlin</groupId>
-      <artifactId>gremlin-java</artifactId>
+      <!-- Temporary dependency as long as blueprints-core is system scope -->
+      <groupId>colt</groupId>
+      <artifactId>colt</artifactId>
+      <version>1.2.0</version>
     </dependency>
 
     <!-- logging -->
@@ -152,6 +157,29 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>jarjar-maven-plugin</artifactId>
+        <version>1.7</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>jarjar</goal>
+            </goals>
+            <configuration>
+              <includes>
+                <include>com.tinkerpop.blueprints:blueprints-core</include>
+              </includes>
+              <rules>
+                <keep>
+                  <pattern>*.**</pattern>
+                </keep>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
diff --git a/sonar-core/src/main/java/org/sonar/core/graph/GraphUtil.java b/sonar-core/src/main/java/org/sonar/core/graph/GraphUtil.java
index 303f589f09d..feea6d2ac80 100644
--- a/sonar-core/src/main/java/org/sonar/core/graph/GraphUtil.java
+++ b/sonar-core/src/main/java/org/sonar/core/graph/GraphUtil.java
@@ -20,21 +20,14 @@
 package org.sonar.core.graph;
 
 import com.google.common.base.Joiner;
-import com.google.common.collect.Lists;
 import com.tinkerpop.blueprints.Direction;
-import com.tinkerpop.blueprints.Edge;
 import com.tinkerpop.blueprints.Element;
 import com.tinkerpop.blueprints.Vertex;
-import com.tinkerpop.blueprints.impls.tg.TinkerGraph;
-import com.tinkerpop.blueprints.util.ElementHelper;
-import com.tinkerpop.gremlin.java.GremlinPipeline;
-import org.hibernate.engine.JoinSequence;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
 import java.util.Iterator;
-import java.util.List;
 
 public class GraphUtil {
 
@@ -79,24 +72,4 @@ public class GraphUtil {
     }
   }
 
-  public static void subGraph(GremlinPipeline path, TinkerGraph toGraph) {
-    List<Edge> edges = Lists.newArrayList();
-    if (path.hasNext()) {
-      for (Object element : (Iterable) path.next()) {
-        if (element instanceof Vertex) {
-          Vertex v = (Vertex) element;
-          Vertex toVertex = toGraph.addVertex(v.getId());
-          ElementHelper.copyProperties(v, toVertex);
-        } else if (element instanceof Edge) {
-          edges.add((Edge) element);
-        }
-      }
-      for (Edge edge : edges) {
-        Vertex from = edge.getVertex(Direction.IN);
-        Vertex to = edge.getVertex(Direction.OUT);
-        Edge copyEdge = toGraph.addEdge(edge.getId(), toGraph.getVertex(from.getId()), toGraph.getVertex(to.getId()), edge.getLabel());
-        ElementHelper.copyProperties(edge, copyEdge);
-      }
-    }
-  }
 }
diff --git a/sonar-core/src/test/java/org/sonar/core/graph/GraphUtilTest.java b/sonar-core/src/test/java/org/sonar/core/graph/GraphUtilTest.java
index 11f402f7a48..f45c6d0a65c 100644
--- a/sonar-core/src/test/java/org/sonar/core/graph/GraphUtilTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/graph/GraphUtilTest.java
@@ -22,7 +22,6 @@ package org.sonar.core.graph;
 import com.tinkerpop.blueprints.Direction;
 import com.tinkerpop.blueprints.Vertex;
 import com.tinkerpop.blueprints.impls.tg.TinkerGraph;
-import com.tinkerpop.gremlin.java.GremlinPipeline;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -63,21 +62,4 @@ public class GraphUtilTest {
 
     GraphUtil.singleAdjacent(a, Direction.OUT, "likes", "hates");
   }
-
-  @Test
-  public void subGraph() {
-    TinkerGraph graph = new TinkerGraph();
-    Vertex a = graph.addVertex("1");
-    Vertex b = graph.addVertex("2");
-    Vertex c = graph.addVertex("3");
-    graph.addEdge("4", a, b, "likes");
-    graph.addEdge("5", b, c, "has");
-
-    TinkerGraph subGraph = new TinkerGraph();
-    GremlinPipeline pipeline = new GremlinPipeline(a).outE("likes").inV().path();
-    GraphUtil.subGraph(pipeline, subGraph);
-
-    assertThat(subGraph.getVertices()).hasSize(2);
-    assertThat(subGraph.getEdges()).hasSize(1);
-  }
 }
-- 
2.39.5