[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/09627139 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/09627139 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/09627139 Branch: refs/heads/tp33 Commit: 096271390837729b1b7069eca66211c9c2e713a2 Parents: 834be921 0eec0c5 Author: Stephen Mallette Authored: Wed Sep 19 13:31:49 2018 -0400 Committer: Stephen Mallette Committed: Wed Sep 19 13:31:49 2018 -0400 -- .../org/apache/tinkerpop/gremlin/server/Settings.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/09627139/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java --
[1/2] tinkerpop git commit: Fixed javadoc links CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 834be9217 -> 096271390
Fixed javadoc links CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0eec0c53
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0eec0c53
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0eec0c53
Branch: refs/heads/tp33
Commit: 0eec0c53a9759096d5ff594af7986f46c7c27e1a
Parents: a494516
Author: Stephen Mallette
Authored: Wed Sep 19 13:31:32 2018 -0400
Committer: Stephen Mallette
Committed: Wed Sep 19 13:31:32 2018 -0400
--
.../org/apache/tinkerpop/gremlin/server/Settings.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eec0c53/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
--
diff --git
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
index 4acfea0..a87362b 100644
---
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
+++
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
@@ -459,7 +459,7 @@ public class Settings {
/**
* The X.509 certificate chain file in PEM format.
*
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public String keyCertChainFile = null;
@@ -467,7 +467,7 @@ public class Settings {
/**
* The PKCS#8 private key file in PEM format.
*
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public String keyFile = null;
@@ -476,7 +476,7 @@ public class Settings {
* The password of the {@link #keyFile}, or {@code null} if it's not
* password-protected.
*
- * @deprecated As of release 3.2.10, replaced by {@link
keyStorePassword}
+ * @deprecated As of release 3.2.10, replaced by {@link
#keyStorePassword}
*/
@Deprecated
public String keyPassword = null;
@@ -486,7 +486,7 @@ public class Settings {
* file should contain an X.509 certificate chain in PEM format.
{@code null}
* uses the system default.
*
- * @deprecated As of release 3.2.10, replaced by {@link trustStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #trustStore}
*/
@Deprecated
public String trustCertChainFile = null;
@@ -513,7 +513,7 @@ public class Settings {
public String trustStorePassword;
/**
- * The format of the {@link keyStore}, either {@code JKS} or {@code
PKCS12}
+ * The format of the {@link #keyStore}, either {@code JKS} or {@code
PKCS12}
*/
public String keyStoreType;
[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/09627139 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/09627139 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/09627139 Branch: refs/heads/master Commit: 096271390837729b1b7069eca66211c9c2e713a2 Parents: 834be921 0eec0c5 Author: Stephen Mallette Authored: Wed Sep 19 13:31:49 2018 -0400 Committer: Stephen Mallette Committed: Wed Sep 19 13:31:49 2018 -0400 -- .../org/apache/tinkerpop/gremlin/server/Settings.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/09627139/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java --
tinkerpop git commit: Fixed javadoc links CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 a4945162f -> 0eec0c53a
Fixed javadoc links CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0eec0c53
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0eec0c53
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0eec0c53
Branch: refs/heads/tp32
Commit: 0eec0c53a9759096d5ff594af7986f46c7c27e1a
Parents: a494516
Author: Stephen Mallette
Authored: Wed Sep 19 13:31:32 2018 -0400
Committer: Stephen Mallette
Committed: Wed Sep 19 13:31:32 2018 -0400
--
.../org/apache/tinkerpop/gremlin/server/Settings.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eec0c53/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
--
diff --git
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
index 4acfea0..a87362b 100644
---
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
+++
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
@@ -459,7 +459,7 @@ public class Settings {
/**
* The X.509 certificate chain file in PEM format.
*
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public String keyCertChainFile = null;
@@ -467,7 +467,7 @@ public class Settings {
/**
* The PKCS#8 private key file in PEM format.
*
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public String keyFile = null;
@@ -476,7 +476,7 @@ public class Settings {
* The password of the {@link #keyFile}, or {@code null} if it's not
* password-protected.
*
- * @deprecated As of release 3.2.10, replaced by {@link
keyStorePassword}
+ * @deprecated As of release 3.2.10, replaced by {@link
#keyStorePassword}
*/
@Deprecated
public String keyPassword = null;
@@ -486,7 +486,7 @@ public class Settings {
* file should contain an X.509 certificate chain in PEM format.
{@code null}
* uses the system default.
*
- * @deprecated As of release 3.2.10, replaced by {@link trustStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #trustStore}
*/
@Deprecated
public String trustCertChainFile = null;
@@ -513,7 +513,7 @@ public class Settings {
public String trustStorePassword;
/**
- * The format of the {@link keyStore}, either {@code JKS} or {@code
PKCS12}
+ * The format of the {@link #keyStore}, either {@code JKS} or {@code
PKCS12}
*/
public String keyStoreType;
[3/3] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7fee0e74 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7fee0e74 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7fee0e74 Branch: refs/heads/master Commit: 7fee0e741e1b3ce8706761245a9e2f113fcef734 Parents: dd972d3 0962713 Author: Stephen Mallette Authored: Wed Sep 19 13:32:00 2018 -0400 Committer: Stephen Mallette Committed: Wed Sep 19 13:32:00 2018 -0400 -- .../org/apache/tinkerpop/gremlin/server/Settings.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7fee0e74/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java --
[1/3] tinkerpop git commit: Fixed javadoc links CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master dd972d39f -> 7fee0e741
Fixed javadoc links CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0eec0c53
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0eec0c53
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0eec0c53
Branch: refs/heads/master
Commit: 0eec0c53a9759096d5ff594af7986f46c7c27e1a
Parents: a494516
Author: Stephen Mallette
Authored: Wed Sep 19 13:31:32 2018 -0400
Committer: Stephen Mallette
Committed: Wed Sep 19 13:31:32 2018 -0400
--
.../org/apache/tinkerpop/gremlin/server/Settings.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eec0c53/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
--
diff --git
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
index 4acfea0..a87362b 100644
---
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
+++
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
@@ -459,7 +459,7 @@ public class Settings {
/**
* The X.509 certificate chain file in PEM format.
*
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public String keyCertChainFile = null;
@@ -467,7 +467,7 @@ public class Settings {
/**
* The PKCS#8 private key file in PEM format.
*
- * @deprecated As of release 3.2.10, replaced by {@link keyStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #keyStore}
*/
@Deprecated
public String keyFile = null;
@@ -476,7 +476,7 @@ public class Settings {
* The password of the {@link #keyFile}, or {@code null} if it's not
* password-protected.
*
- * @deprecated As of release 3.2.10, replaced by {@link
keyStorePassword}
+ * @deprecated As of release 3.2.10, replaced by {@link
#keyStorePassword}
*/
@Deprecated
public String keyPassword = null;
@@ -486,7 +486,7 @@ public class Settings {
* file should contain an X.509 certificate chain in PEM format.
{@code null}
* uses the system default.
*
- * @deprecated As of release 3.2.10, replaced by {@link trustStore}
+ * @deprecated As of release 3.2.10, replaced by {@link #trustStore}
*/
@Deprecated
public String trustCertChainFile = null;
@@ -513,7 +513,7 @@ public class Settings {
public String trustStorePassword;
/**
- * The format of the {@link keyStore}, either {@code JKS} or {@code
PKCS12}
+ * The format of the {@link #keyStore}, either {@code JKS} or {@code
PKCS12}
*/
public String keyStoreType;
tinkerpop git commit: TINKERPOP-2039 Bump to Groovy 2.5.2
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-2039 [created] 1e7aa13f5
TINKERPOP-2039 Bump to Groovy 2.5.2
Required some minor changes to the Console as the CliBuilder is no longer the
recommended approach for Groovy - had to use picocli classes instead. Still
couldn't make the command line parsing work exclusively under picocli - I think
we have somewhat nonstandard options in our command line.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1e7aa13f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1e7aa13f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1e7aa13f
Branch: refs/heads/TINKERPOP-2039
Commit: 1e7aa13f5350adca231cef0eb8f7e9d1823e3895
Parents: 46742da
Author: Stephen Mallette
Authored: Wed Sep 19 10:50:20 2018 -0400
Committer: Stephen Mallette
Committed: Wed Sep 19 10:50:20 2018 -0400
--
CHANGELOG.asciidoc | 1 +
gremlin-console/pom.xml | 5 ---
.../tinkerpop/gremlin/console/Console.groovy| 34 +++-
gremlin-dotnet/pom.xml | 2 +-
gremlin-javascript/pom.xml | 2 +-
gremlin-python/pom.xml | 2 +-
pom.xml | 2 +-
7 files changed, 23 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e7aa13f/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 2adc0dc..fe67f66 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -37,6 +37,7 @@ This release also includes changes from <>.
* Maintained order of annotations in metrics returned from `profile()`-step.
* Bumped to Netty 4.1.25.
* Bumped to Spark 2.3.1.
+* Bumped to Groovy 2.5.2.
* Deprecated two `submit()`-related methods on the Java driver `Client` class.
* Added `Client.submit()` overloads that accept per-request `RequestOptions`.
* Added sparql-gremlin.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e7aa13f/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 3b650ee..615af4e 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -41,11 +41,6 @@ limitations under the License.
httpclient
-commons-cli
-commons-cli
-1.2
-
-
org.apache.tinkerpop
gremlin-driver
${project.version}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1e7aa13f/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
--
diff --git
a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index d45b49a..1e05864 100644
---
a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++
b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -18,10 +18,11 @@
*/
package org.apache.tinkerpop.gremlin.console
+import groovy.cli.picocli.CliBuilder
+import groovy.cli.picocli.OptionAccessor
import jline.TerminalFactory
import jline.console.history.FileHistory
-import org.apache.commons.cli.Option
import org.apache.tinkerpop.gremlin.console.commands.GremlinSetCommand
import org.apache.tinkerpop.gremlin.console.commands.InstallCommand
import org.apache.tinkerpop.gremlin.console.commands.PluginCommand
@@ -43,8 +44,8 @@ import org.codehaus.groovy.tools.shell.Groovysh
import org.codehaus.groovy.tools.shell.IO
import org.codehaus.groovy.tools.shell.InteractiveShellRunner
import org.codehaus.groovy.tools.shell.commands.SetCommand
-import org.codehaus.groovy.tools.shell.util.HelpFormatter
import org.fusesource.jansi.Ansi
+import picocli.CommandLine
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
@@ -400,21 +401,22 @@ class Console {
IO io = new IO(System.in, System.out, System.err)
-final CliBuilder cli = new CliBuilder(usage: 'gremlin.sh [options]
[...]', formatter: new HelpFormatter(), stopAtNonOption: false)
+final CliBuilder cli = new CliBuilder()
+cli.stopAtNonOption = false
+cli.name = "gremlin.sh"
// note that the inclusion of -l is really a setting handled by
gremlin.sh and not by Console class itself.
// it is mainly listed here for informational purposes when the user
starts things up with -h
-cli.with {
-h(longOpt: 'help', "Display this help
[1/2] tinkerpop git commit: TINKERPOP-2032 bump jython-standalone 2.7.1
Repository: tinkerpop Updated Branches: refs/heads/tp32 67879780b -> a4945162f TINKERPOP-2032 bump jython-standalone 2.7.1 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f7774913 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f7774913 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f7774913 Branch: refs/heads/tp32 Commit: f77749132b2e535acd917a46fdd72defe5683d92 Parents: c029eef Author: Robert Dale Authored: Tue Sep 11 08:35:33 2018 -0400 Committer: Robert Dale Committed: Tue Sep 11 08:38:40 2018 -0400 -- CHANGELOG.asciidoc | 1 + gremlin-python/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7774913/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 158cc7a..8909e78 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima [[release-3-2-10]] === TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET) +* Bumped jython-standalone 2.7.1 * SSL security enhancements * Added Gremlin version to Gremlin Server startup logging output. * Fixed problem with Gremlin Server sometimes returning an additional message after a failure. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7774913/gremlin-python/pom.xml -- diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml index 13c3454..ccd85b5 100644 --- a/gremlin-python/pom.xml +++ b/gremlin-python/pom.xml @@ -34,7 +34,7 @@ limitations under the License. org.python jython-standalone -2.7.1b2 +2.7.1
[1/3] tinkerpop git commit: TINKERPOP-2032 bump jython-standalone 2.7.1
Repository: tinkerpop Updated Branches: refs/heads/tp33 9f0dbd850 -> 834be9217 TINKERPOP-2032 bump jython-standalone 2.7.1 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f7774913 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f7774913 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f7774913 Branch: refs/heads/tp33 Commit: f77749132b2e535acd917a46fdd72defe5683d92 Parents: c029eef Author: Robert Dale Authored: Tue Sep 11 08:35:33 2018 -0400 Committer: Robert Dale Committed: Tue Sep 11 08:38:40 2018 -0400 -- CHANGELOG.asciidoc | 1 + gremlin-python/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7774913/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 158cc7a..8909e78 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima [[release-3-2-10]] === TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET) +* Bumped jython-standalone 2.7.1 * SSL security enhancements * Added Gremlin version to Gremlin Server startup logging output. * Fixed problem with Gremlin Server sometimes returning an additional message after a failure. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7774913/gremlin-python/pom.xml -- diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml index 13c3454..ccd85b5 100644 --- a/gremlin-python/pom.xml +++ b/gremlin-python/pom.xml @@ -34,7 +34,7 @@ limitations under the License. org.python jython-standalone -2.7.1b2 +2.7.1
[3/4] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/834be921 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/834be921 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/834be921 Branch: refs/heads/master Commit: 834be921796ccc1aa5bcf7386c102d3ea896664a Parents: 9f0dbd8 a494516 Author: Robert Dale Authored: Wed Sep 19 08:44:00 2018 -0400 Committer: Robert Dale Committed: Wed Sep 19 08:44:00 2018 -0400 -- CHANGELOG.asciidoc | 1 + gremlin-python/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/834be921/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/834be921/gremlin-python/pom.xml --
[4/4] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/dd972d39 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dd972d39 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dd972d39 Branch: refs/heads/master Commit: dd972d39f8969df0f51c7b43798ce72b650008f7 Parents: 46742da 834be921 Author: Robert Dale Authored: Wed Sep 19 08:44:11 2018 -0400 Committer: Robert Dale Committed: Wed Sep 19 08:44:11 2018 -0400 -- CHANGELOG.asciidoc | 1 + gremlin-python/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dd972d39/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dd972d39/gremlin-python/pom.xml --
[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-2032' into tp32
Merge branch 'TINKERPOP-2032' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a4945162 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4945162 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4945162 Branch: refs/heads/tp32 Commit: a4945162fd969d6c47f69a138d60d266fb88564d Parents: 6787978 f777491 Author: Robert Dale Authored: Wed Sep 19 08:43:10 2018 -0400 Committer: Robert Dale Committed: Wed Sep 19 08:43:10 2018 -0400 -- CHANGELOG.asciidoc | 1 + gremlin-python/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4945162/CHANGELOG.asciidoc --
[2/3] tinkerpop git commit: Merge branch 'TINKERPOP-2032' into tp32
Merge branch 'TINKERPOP-2032' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a4945162 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4945162 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4945162 Branch: refs/heads/tp33 Commit: a4945162fd969d6c47f69a138d60d266fb88564d Parents: 6787978 f777491 Author: Robert Dale Authored: Wed Sep 19 08:43:10 2018 -0400 Committer: Robert Dale Committed: Wed Sep 19 08:43:10 2018 -0400 -- CHANGELOG.asciidoc | 1 + gremlin-python/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4945162/CHANGELOG.asciidoc --
[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/834be921 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/834be921 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/834be921 Branch: refs/heads/tp33 Commit: 834be921796ccc1aa5bcf7386c102d3ea896664a Parents: 9f0dbd8 a494516 Author: Robert Dale Authored: Wed Sep 19 08:44:00 2018 -0400 Committer: Robert Dale Committed: Wed Sep 19 08:44:00 2018 -0400 -- CHANGELOG.asciidoc | 1 + gremlin-python/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/834be921/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/834be921/gremlin-python/pom.xml --
[2/4] tinkerpop git commit: Merge branch 'TINKERPOP-2032' into tp32
Merge branch 'TINKERPOP-2032' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a4945162 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4945162 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4945162 Branch: refs/heads/master Commit: a4945162fd969d6c47f69a138d60d266fb88564d Parents: 6787978 f777491 Author: Robert Dale Authored: Wed Sep 19 08:43:10 2018 -0400 Committer: Robert Dale Committed: Wed Sep 19 08:43:10 2018 -0400 -- CHANGELOG.asciidoc | 1 + gremlin-python/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4945162/CHANGELOG.asciidoc --
[1/4] tinkerpop git commit: TINKERPOP-2032 bump jython-standalone 2.7.1
Repository: tinkerpop Updated Branches: refs/heads/master 46742dafd -> dd972d39f TINKERPOP-2032 bump jython-standalone 2.7.1 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f7774913 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f7774913 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f7774913 Branch: refs/heads/master Commit: f77749132b2e535acd917a46fdd72defe5683d92 Parents: c029eef Author: Robert Dale Authored: Tue Sep 11 08:35:33 2018 -0400 Committer: Robert Dale Committed: Tue Sep 11 08:38:40 2018 -0400 -- CHANGELOG.asciidoc | 1 + gremlin-python/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7774913/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 158cc7a..8909e78 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima [[release-3-2-10]] === TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET) +* Bumped jython-standalone 2.7.1 * SSL security enhancements * Added Gremlin version to Gremlin Server startup logging output. * Fixed problem with Gremlin Server sometimes returning an additional message after a failure. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7774913/gremlin-python/pom.xml -- diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml index 13c3454..ccd85b5 100644 --- a/gremlin-python/pom.xml +++ b/gremlin-python/pom.xml @@ -34,7 +34,7 @@ limitations under the License. org.python jython-standalone -2.7.1b2 +2.7.1
