You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2020/08/31 11:38:00 UTC

[tinkerpop] branch master updated (da54af0 -> 11001d7)

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


    from da54af0  Merge branch '3.4-dev'
     add 565e573  Added neo4j/tx tests to travis Gremlin Server build
     new 9ccac59  Merge branch '3.4-dev'
     add b922f89  Skip unit tests since they get run on standard builds in Travis
     new 11001d7  Merge branch '3.4-dev'

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


[tinkerpop] 02/02: Merge branch '3.4-dev'

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 11001d7d911a3e680ac92b3112036e6126061a02
Merge: 9ccac59 b922f89
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Aug 31 07:37:43 2020 -0400

    Merge branch '3.4-dev'

 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)



[tinkerpop] 01/02: Merge branch '3.4-dev'

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 9ccac59590f98bab3d64873537c3ccb6e8492fd5
Merge: da54af0 565e573
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Aug 31 07:30:30 2020 -0400

    Merge branch '3.4-dev'

 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc .travis.yml
index 324cec0,ff73431..aa7259e
--- a/.travis.yml
+++ b/.travis.yml
@@@ -49,13 -49,8 +49,13 @@@ jobs
      - script: "mvn clean install -q -DskipTests && mvn verify -pl :gremlin-javascript"
        name: "javascript"
      - script:
 -      - "mvn clean install -q -DskipTests"
 -      - "mvn verify -pl :gremlin-server -DskipTests -DskipIntegrationTests=false -DincludeNeo4j"
 +        - "mvn -version"
 +        - "mvn clean install -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
 +      jdk: openjdk8
 +      name: "mvn clean install - jdk8"
 +    - script:
 +        - "mvn clean install -q -DskipTests"
-         - "mvn verify -pl :gremlin-server -DskipTests -DskipIntegrationTests=false"
++        - "mvn verify -pl :gremlin-server -DskipTests -DskipIntegrationTests=false -DincludeNeo4j"
        name: "gremlin server"
      - script:
          - "mvn clean install -q -DskipTests"