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 2015/03/12 13:26:19 UTC
[1/2] incubator-tinkerpop git commit: Fixed problem with javadoc
generation.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master a228c82dd -> 33b3cb7ab
Fixed problem with javadoc generation.
Had to add hadoop as a dependency to the javadoc plugin. Seems like all that exclusion work in hadoop prevented proper javadoc generation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/eeac2a03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/eeac2a03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/eeac2a03
Branch: refs/heads/master
Commit: eeac2a03aa5f1e96c5429290b26291bd8722b218
Parents: a228c82
Author: Stephen Mallette <sp...@apache.org>
Authored: Thu Mar 12 08:23:39 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Thu Mar 12 08:23:39 2015 -0400
----------------------------------------------------------------------
bin/publish-docs.sh | 23 ++++++++++++++++++-----
hadoop-gremlin/pom.xml | 2 +-
pom.xml | 36 ++++++++++++++++++++++++++++++++++++
3 files changed, 55 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/eeac2a03/bin/publish-docs.sh
----------------------------------------------------------------------
diff --git a/bin/publish-docs.sh b/bin/publish-docs.sh
index cc36644..f2ead86 100755
--- a/bin/publish-docs.sh
+++ b/bin/publish-docs.sh
@@ -19,8 +19,21 @@
# under the License.
#
-git checkout publish-docs
-git fetch origin
-git merge origin/master
-git push origin publish-docs
-git checkout master
+rm -rf target/svn
+mkdir target/svn
+svn co https://svn.apache.org/repos/asf/incubator/tinkerpop/site/ target/svn
+
+# TODO: how do we get the version number from the pom into this guy?
+# TODO: maybe this should be smart about checking for if directories exist before removing
+VERSION = "3.0.0-SNAPSHOT"
+svn rm target/svn/site/docs/$VERSION
+svn rm target/svn/site/javadocs/$VERSION
+svn commit .
+
+docs/preprocessor/preprocess.sh && mvn process-resources -Dasciidoc
+mvn process-resources -Djavadoc
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/eeac2a03/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 21970d8..7113464 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -44,7 +44,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>1.2.1</version>
+ <version>${hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>net.java.dev.jets3t</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/eeac2a03/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5711729..03dc6fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,6 +108,7 @@ limitations under the License.
<skipIntegrationTests>true</skipIntegrationTests>
<skipPerformanceTests>true</skipPerformanceTests>
<slf4j.version>1.7.7</slf4j.version>
+ <hadoop.version>1.2.1</hadoop.version>
<javadoc-plugin.version>2.10.1</javadoc-plugin.version>
<muteTestLogs>false</muteTestLogs>
</properties>
@@ -171,6 +172,13 @@ limitations under the License.
<phase>site</phase>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
+ <additionalDependencies>
+ <additionalDependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>1.2.1</version>
+ </additionalDependency>
+ </additionalDependencies>
</configuration>
</execution>
<execution>
@@ -393,6 +401,13 @@ limitations under the License.
<id>non-aggregate</id>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
+ <additionalDependencies>
+ <additionalDependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>1.2.1</version>
+ </additionalDependency>
+ </additionalDependencies>
</configuration>
<reports>
<report>javadoc</report>
@@ -402,6 +417,13 @@ limitations under the License.
<id>aggregate</id>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
+ <additionalDependencies>
+ <additionalDependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>1.2.1</version>
+ </additionalDependency>
+ </additionalDependencies>
</configuration>
<reports>
<report>aggregate</report>
@@ -720,6 +742,13 @@ limitations under the License.
hadoop-gremlin/src/main/java:gremlin-algorithm/src/main/java:gremlin-core/src/main/java:gremlin-driver/src/main/java:gremlin-groovy/src/main/java:gremlin-server/src/main/java:gremlin-test/src/main/java:neo4j-gremlin/src/main/java:tinkergraph-gremlin/src/main/java
</sourcepath>
<quiet>true</quiet>
+ <additionalDependencies>
+ <additionalDependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>1.2.1</version>
+ </additionalDependency>
+ </additionalDependencies>
</configuration>
</execution>
<execution>
@@ -755,6 +784,13 @@ limitations under the License.
<sourceFileInclude>org/apache/tinkerpop/gremlin/process/util/*.java</sourceFileInclude>
<sourceFileInclude>org/apache/tinkerpop/gremlin/driver/*.java</sourceFileInclude>
</sourceFileIncludes>
+ <additionalDependencies>
+ <additionalDependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>1.2.1</version>
+ </additionalDependency>
+ </additionalDependencies>
</configuration>
</execution>
</executions>
[2/2] incubator-tinkerpop git commit: Added some comments to remind
why addditionalDependencies were needed for javadoc.
Posted by sp...@apache.org.
Added some comments to remind why addditionalDependencies were needed for javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/33b3cb7a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/33b3cb7a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/33b3cb7a
Branch: refs/heads/master
Commit: 33b3cb7aba4e87c6bf670a2dcf41e153c1710aed
Parents: eeac2a0
Author: Stephen Mallette <sp...@apache.org>
Authored: Thu Mar 12 08:25:54 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Thu Mar 12 08:25:54 2015 -0400
----------------------------------------------------------------------
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/33b3cb7a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 03dc6fb..0aa0b64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,6 +173,7 @@ limitations under the License.
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
<additionalDependencies>
+ <!-- all that exclusion work in hadoop-gremlin seems to dump dependencies needed for javadoc -->
<additionalDependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
@@ -402,6 +403,7 @@ limitations under the License.
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
<additionalDependencies>
+ <!-- all that exclusion work in hadoop-gremlin seems to dump dependencies needed for javadoc -->
<additionalDependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
@@ -418,6 +420,7 @@ limitations under the License.
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
<additionalDependencies>
+ <!-- all that exclusion work in hadoop-gremlin seems to dump dependencies needed for javadoc -->
<additionalDependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
@@ -743,6 +746,7 @@ limitations under the License.
</sourcepath>
<quiet>true</quiet>
<additionalDependencies>
+ <!-- all that exclusion work in hadoop-gremlin seems to dump dependencies needed for javadoc -->
<additionalDependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
@@ -785,6 +789,7 @@ limitations under the License.
<sourceFileInclude>org/apache/tinkerpop/gremlin/driver/*.java</sourceFileInclude>
</sourceFileIncludes>
<additionalDependencies>
+ <!-- all that exclusion work in hadoop-gremlin seems to dump dependencies needed for javadoc -->
<additionalDependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>