You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/03/09 20:46:18 UTC

[11/18] incubator-tinkerpop git commit: Bump to commons-collections 3.2.2 TINKERPOP-1198 CTR

Bump to commons-collections 3.2.2 TINKERPOP-1198 CTR


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

Branch: refs/heads/master
Commit: 753038d1010f8bd5974924733579d3c0cfd9773e
Parents: b529398
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Mar 8 07:15:35 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Mar 8 07:15:35 2016 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc     | 1 +
 gremlin-core/pom.xml   | 1 -
 gremlin-server/pom.xml | 1 -
 pom.xml                | 8 ++++++--
 4 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/753038d1/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a39683a..aad3314 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
 TinkerPop 3.1.2 (NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Bump to commons-collections 3.2.2.
 * Fixed a compilation bug in `TraversalExplanation`.
 * Bumped to Netty 4.0.34.Final.
 * Added "interpreter mode" for the `ScriptEngine` and Gremlin Server which allows variables defined with `def` or a type to be recognized as "global".

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/753038d1/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index 16a0f89..c164750 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -95,7 +95,6 @@ limitations under the License.
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <version>3.2.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/753038d1/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 2c9c1f8..37d830d 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -44,7 +44,6 @@ limitations under the License.
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <version>3.2.1</version>
         </dependency>
         <!-- METRICS -->
         <dependency>

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/753038d1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f7bf141..acef6c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,6 @@ limitations under the License.
         <skipPerformanceTests>true</skipPerformanceTests>
         <slf4j.version>1.7.12</slf4j.version>
         <hadoop.version>2.7.1</hadoop.version>
-        <commons.configuration.version>1.10</commons.configuration.version>
         <java.tuples.version>1.2</java.tuples.version>
         <javadoc-plugin.version>2.10.1</javadoc-plugin.version>
 
@@ -477,7 +476,7 @@ limitations under the License.
             <dependency>
                 <groupId>commons-configuration</groupId>
                 <artifactId>commons-configuration</artifactId>
-                <version>${commons.configuration.version}</version>
+                <version>1.10</version>
                 <exclusions>
                     <!-- self-conflict -->
                     <exclusion>
@@ -487,6 +486,11 @@ limitations under the License.
                 </exclusions>
             </dependency>
             <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>3.2.2</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-core</artifactId>
                 <version>1.2.1</version>