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 2018/05/12 00:05:11 UTC
[1/3] tinkerpop git commit: TINKERPOP-1961 Removed duplication of
images in binaries.
Repository: tinkerpop
Updated Branches:
refs/heads/master e425f1a6e -> 942494e0e
TINKERPOP-1961 Removed duplication of images in binaries.
The asciidoc plugin copies all files in the source directories of its execution. The asciidoc plugin was upgraded between 3.2.5 and 3.2.6 which introduced this new behavior.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/288b455a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/288b455a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/288b455a
Branch: refs/heads/master
Commit: 288b455a731bbc2f062b2cfe043f8c775dee9700
Parents: 3635ff6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed May 9 07:03:13 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 20:03:31 2018 -0400
----------------------------------------------------------------------
pom.xml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/288b455a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9737fef..9c4b507 100644
--- a/pom.xml
+++ b/pom.xml
@@ -811,9 +811,14 @@ limitations under the License.
<goal>process-asciidoc</goal>
</goals>
<configuration>
- <sourceDirectory>${asciidoc.input.dir}/</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${asciidoc.input.dir}/</directory>
+ <targetPath>${htmlsingle.output.dir}/</targetPath>
+ <excludes>${asciidoc.input.dir}/static/*.*</excludes>
+ </resource>
+ </resources>
<sourceDocumentName>index.asciidoc</sourceDocumentName>
- <outputDirectory>${htmlsingle.output.dir}/</outputDirectory>
<backend>html5</backend>
<doctype>article</doctype>
<attributes>
[3/3] tinkerpop git commit: Merge branch 'tp33'
Posted by sp...@apache.org.
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/942494e0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/942494e0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/942494e0
Branch: refs/heads/master
Commit: 942494e0e12ece02e7654ad42c81068c6366ea05
Parents: e425f1a eb79f39
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 11 20:04:55 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 20:04:55 2018 -0400
----------------------------------------------------------------------
pom.xml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/942494e0/pom.xml
----------------------------------------------------------------------
[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
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/eb79f398
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/eb79f398
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/eb79f398
Branch: refs/heads/master
Commit: eb79f398d10bd1294762b923d2bdc8d72959b7e9
Parents: 68d39dc 288b455
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 11 20:04:35 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 20:04:35 2018 -0400
----------------------------------------------------------------------
pom.xml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb79f398/pom.xml
----------------------------------------------------------------------