Merge branch 'tp31' into tp32 Conflicts: pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9ea319d5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9ea319d5 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9ea319d5 Branch: refs/heads/TINKERPOP-1642 Commit: 9ea319d5d102432312f2044fc72e3668c1a8f7e2 Parents: 3fe223b cde8b31 Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Mar 9 13:01:03 2017 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Mar 9 13:01:03 2017 -0500 ---------------------------------------------------------------------- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9ea319d5/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 09aeede,23f31f2..de8cf87 --- a/pom.xml +++ b/pom.xml @@@ -134,18 -127,9 +134,18 @@@ limitations under the License </scm> <properties> <commons.configuration.version>1.10</commons.configuration.version> + <commons.lang.version>2.6</commons.lang.version> + <commons.lang3.version>3.3.1</commons.lang3.version> - <groovy.version>2.4.8</groovy.version> + <groovy.version>2.4.9</groovy.version> - <junit.version>4.12</junit.version> + <hadoop.version>2.7.2</hadoop.version> + <java.tuples.version>1.2</java.tuples.version> + <javadoc-plugin.version>2.10.1</javadoc-plugin.version> + <jcabi.version>1.1</jcabi.version> <metrics.version>3.0.2</metrics.version> + <netty.version>4.0.42.Final</netty.version> + <slf4j.version>1.7.21</slf4j.version> + <snakeyaml.version>1.15</snakeyaml.version> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <skipIntegrationTests>true</skipIntegrationTests>