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 2017/02/16 18:56:57 UTC
[1/2] tinkerpop git commit: Added ability to inject maven variables
to javadoc
Repository: tinkerpop
Updated Branches:
refs/heads/master 768ade6bd -> cb67e8eb2
Added ability to inject maven variables to javadoc
This will make it possible to easily cross-reference javadoc to reference docs CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7d173c86
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7d173c86
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7d173c86
Branch: refs/heads/master
Commit: 7d173c86be7f6ad00eeb0a18d7b615d9f527ec48
Parents: b717615
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Feb 16 13:55:18 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Feb 16 13:55:18 2017 -0500
----------------------------------------------------------------------
.../traversal/dsl/graph/GraphTraversal.java | 1 +
pom.xml | 36 ++++++++++++++++++++
2 files changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7d173c86/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index abcb870..2e5858a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -262,6 +262,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
* Map any object to a fixed <code>E</code> value.
*
* @return the traversal with an appended {@link ConstantStep}.
+ * @see <a target="_blank" href="http://tinkerpop.apache.org/docs/${project.version}/reference/#constant-step">Reference Documentation - Constant Step</a>
*/
public default <E2> GraphTraversal<S, E2> constant(final E2 e) {
this.asAdmin().getBytecode().addStep(Symbols.constant, e);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7d173c86/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 00eaaab..802593e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1215,6 +1215,42 @@ limitations under the License.
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>apply-filters-to-javadoc</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/javadoc-temp</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/target/site/apidocs</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-java-doc-back</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/site/apidocs</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/target/javadoc-temp</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
[2/2] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cb67e8eb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cb67e8eb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cb67e8eb
Branch: refs/heads/master
Commit: cb67e8eb20ccb00a21a3f3d070882b1e923ad413
Parents: 768ade6 7d173c8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Feb 16 13:56:41 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Feb 16 13:56:41 2017 -0500
----------------------------------------------------------------------
.../traversal/dsl/graph/GraphTraversal.java | 1 +
pom.xml | 36 ++++++++++++++++++++
2 files changed, 37 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cb67e8eb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cb67e8eb/pom.xml
----------------------------------------------------------------------