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 2022/08/25 11:08:18 UTC
[tinkerpop] branch master updated (ff0f55272d -> 0b81029e6a)
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 ff0f55272d Merge branch '3.6-dev'
add 1af1b4b82d Adding CodeCov to Java Modules (#21)
new 8c41aff765 Merge branch '1787' into 3.5-dev
new 0a4a55c07c Merge branch '3.5-dev' into 3.6-dev
new 0b81029e6a Merge branch '3.6-dev'
The 3 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:
.github/workflows/build-test.yml | 6 +++++-
README.asciidoc | 2 +-
pom.xml | 11 +++++++++--
3 files changed, 15 insertions(+), 4 deletions(-)
[tinkerpop] 01/03: Merge branch '1787' into 3.5-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 8c41aff765027ffe4025396cb34336b9800e5164
Merge: 6f3f1aed45 1af1b4b82d
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Aug 25 07:04:16 2022 -0400
Merge branch '1787' into 3.5-dev
.github/workflows/build-test.yml | 6 +++++-
README.asciidoc | 2 +-
pom.xml | 11 +++++++++--
3 files changed, 15 insertions(+), 4 deletions(-)
[tinkerpop] 03/03: Merge branch '3.6-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 0b81029e6a4df2977799d7297be7c378a5ec3286
Merge: ff0f55272d 0a4a55c07c
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Aug 25 07:07:50 2022 -0400
Merge branch '3.6-dev'
.github/workflows/build-test.yml | 6 +++++-
README.asciidoc | 2 +-
pom.xml | 11 +++++++++--
3 files changed, 15 insertions(+), 4 deletions(-)
[tinkerpop] 02/03: Merge branch '3.5-dev' into 3.6-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 0a4a55c07c6625c2ff505a8cf4399afe23cac813
Merge: 279ced2c4a 8c41aff765
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Thu Aug 25 07:07:41 2022 -0400
Merge branch '3.5-dev' into 3.6-dev
.github/workflows/build-test.yml | 6 +++++-
README.asciidoc | 2 +-
pom.xml | 11 +++++++++--
3 files changed, 15 insertions(+), 4 deletions(-)
diff --cc pom.xml
index 3a891e67d4,59ae1b2250..e4e0b3977e
--- a/pom.xml
+++ b/pom.xml
@@@ -1946,10 -1920,7 +1953,10 @@@ limitations under the License
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Dlogback.configuration=${logback-test.properties}
- <argLine>@{surefireArgLine} -Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory} -Dis.testing=true ${suresafeArgs} -Djava.net.preferIPv4Stack=true
++ <argLine>@{surefireArgLine} -Dlogback.configuration=${logback-test.properties}
+ -Dlog4j.configuration=${log4j-test.properties}
+ -Dbuild.dir=${project.build.directory} -Dis.testing=true ${suresafeArgs}
+ -Djava.net.preferIPv4Stack=true
</argLine>
</configuration>
</plugin>
@@@ -1957,10 -1928,7 +1964,10 @@@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
- <argLine>-Dlogback.configuration=${logback-test.properties}
- <argLine>@{failsafeArgLine} -Dlog4j.configuration=${log4j-test.properties} -Dhost=localhost -Dport=8182 -Dbuild.dir=${project.build.directory} -Dis.testing=true ${suresafeArgs} -Djava.net.preferIPv4Stack=true
++ <argLine>@{failsafeArgLine} -Dlogback.configuration=${logback-test.properties}
+ -Dlog4j.configuration=${log4j-test.properties} -Dhost=localhost -Dport=8182
+ -Dbuild.dir=${project.build.directory} -Dis.testing=true ${suresafeArgs}
+ -Djava.net.preferIPv4Stack=true
</argLine>
</configuration>
</plugin>