tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [2/7] tinkerpop git commit: Unify and clean up gmavenplus plugin configurations for GLVs CTR
Date Fri, 11 May 2018 20:56:48 GMT
Unify and clean up gmavenplus plugin configurations for GLVs CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8a03d50d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8a03d50d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8a03d50d

Branch: refs/heads/master
Commit: 8a03d50dedf31e587fb60e0f7735036a1484cfd4
Parents: d995972
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Thu May 10 15:13:59 2018 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Fri May 11 14:10:12 2018 -0400

----------------------------------------------------------------------
 gremlin-dotnet/pom.xml     |  5 ++---
 gremlin-javascript/pom.xml | 45 ++++++++---------------------------------
 gremlin-python/pom.xml     |  4 ++--
 pom.xml                    |  3 ++-
 4 files changed, 14 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a03d50d/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index fd2d428..fbc97d4 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -46,9 +46,8 @@ limitations under the License.
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.tinkerpop</groupId>
-                        <artifactId>gremlin-core</artifactId>
+                        <artifactId>gremlin-server</artifactId>
                         <version>${project.version}</version>
-                        <scope>runtime</scope>
                     </dependency>
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
@@ -60,7 +59,7 @@ limitations under the License.
                     <dependency>
                         <groupId>log4j</groupId>
                         <artifactId>log4j</artifactId>
-                        <version>1.2.17</version>
+                        <version>${log4j.version}</version>
                         <scope>runtime</scope>
                     </dependency>
                 </dependencies>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a03d50d/gremlin-javascript/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 0fe6bf4..f91b749 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -25,36 +25,6 @@ limitations under the License.
     </parent>
     <artifactId>gremlin-javascript</artifactId>
     <name>Apache TinkerPop :: Gremlin Javascript</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tinkerpop</groupId>
-            <artifactId>gremlin-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tinkerpop</groupId>
-            <artifactId>tinkergraph-gremlin</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tinkerpop</groupId>
-            <artifactId>gremlin-test</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tinkerpop</groupId>
-            <artifactId>gremlin-server</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
     <properties>
         <maven.test.skip>false</maven.test.skip>
         <skipTests>${maven.test.skip}</skipTests>
@@ -81,21 +51,22 @@ limitations under the License.
                 <artifactId>gmavenplus-plugin</artifactId>
                 <dependencies>
                     <dependency>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                        <version>1.2.17</version>
-                        <scope>runtime</scope>
-                    </dependency>
-                    <dependency>
                         <groupId>org.apache.tinkerpop</groupId>
                         <artifactId>gremlin-server</artifactId>
                         <version>${project.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                        <version>${log4j.version}</version>
                         <scope>runtime</scope>
                     </dependency>
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
-                        <artifactId>groovy-ant</artifactId>
+                        <artifactId>groovy-all</artifactId>
                         <version>${groovy.version}</version>
+                        <classifier>indy</classifier>
+                        <scope>runtime</scope>
                     </dependency>
                 </dependencies>
                 <executions>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a03d50d/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index c999877..a2ab516 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -455,14 +455,14 @@ limitations under the License.
                             <dependency>
                                 <groupId>org.codehaus.groovy</groupId>
                                 <artifactId>groovy-all</artifactId>
-                                <version>2.4.11</version>
+                                <version>${groovy.version}</version>
                                 <classifier>indy</classifier>
                                 <scope>runtime</scope>
                             </dependency>
                             <dependency>
                                 <groupId>log4j</groupId>
                                 <artifactId>log4j</artifactId>
-                                <version>1.2.17</version>
+                                <version>${log4j.version}</version>
                                 <scope>runtime</scope>
                             </dependency>
                         </dependencies>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a03d50d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6b24199..c724e0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,6 +146,7 @@ limitations under the License.
         <java.tuples.version>1.2</java.tuples.version>
         <javadoc-plugin.version>2.10.4</javadoc-plugin.version>
         <jcabi.version>1.1</jcabi.version>
+        <log4j.version>1.2.17</log4j.version>
         <metrics.version>3.0.2</metrics.version>
         <netty.version>4.0.56.Final</netty.version>
         <slf4j.version>1.7.21</slf4j.version>
@@ -659,7 +660,7 @@ limitations under the License.
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
-                <version>1.2.17</version>
+                <version>${log4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>junit</groupId>


Mime
View raw message