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/07/15 14:58:05 UTC

[2/7] incubator-tinkerpop git commit: Javadoc warns/errors on "successful" generation no longer occur.

Javadoc warns/errors on "successful" generation no longer occur.

Also fixed some typos in the core API for class names.  Can't believe that was never noticed.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/9f280201
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9f280201
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9f280201

Branch: refs/heads/tp30
Commit: 9f2802012809b1d4d99eb9f07c4c1876ea8ea064
Parents: be3aa54
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jul 13 09:56:50 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jul 13 09:56:50 2015 -0400

----------------------------------------------------------------------
 gremlin-core/pom.xml |  1 +
 pom.xml              | 74 +++++++++++++++++------------------------------
 2 files changed, 27 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9f280201/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index fe56b30..08fcf16 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -33,6 +33,7 @@ limitations under the License.
         <dependency>
             <groupId>commons-configuration</groupId>
             <artifactId>commons-configuration</artifactId>
+            <version>1.10</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9f280201/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2fbe013..d50c663 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,14 +200,10 @@ limitations under the License.
                         <phase>site</phase>
                         <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>
-                                    <version>1.2.1</version>
-                                </additionalDependency>
-                            </additionalDependencies>
+                            <includeDependencySources>true</includeDependencySources>
+                            <dependencySourceIncludes>
+                                <dependencySourceInclude>org.apache.tinkerpop:*</dependencySourceInclude>
+                            </dependencySourceIncludes>
                         </configuration>
                     </execution>
                     <execution>
@@ -437,14 +433,10 @@ limitations under the License.
                         <id>non-aggregate</id>
                         <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>
-                                    <version>1.2.1</version>
-                                </additionalDependency>
-                            </additionalDependencies>
+                            <includeDependencySources>true</includeDependencySources>
+                            <dependencySourceIncludes>
+                                <dependencySourceInclude>org.apache.tinkerpop:*</dependencySourceInclude>
+                            </dependencySourceIncludes>
                         </configuration>
                         <reports>
                             <report>javadoc</report>
@@ -454,14 +446,10 @@ limitations under the License.
                         <id>aggregate</id>
                         <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>
-                                    <version>1.2.1</version>
-                                </additionalDependency>
-                            </additionalDependencies>
+                            <includeDependencySources>true</includeDependencySources>
+                            <dependencySourceIncludes>
+                                <dependencySourceInclude>org.apache.tinkerpop:*</dependencySourceInclude>
+                            </dependencySourceIncludes>
                         </configuration>
                         <reports>
                             <report>aggregate</report>
@@ -761,18 +749,13 @@ limitations under the License.
                                 <configuration>
                                     <destDir>full</destDir>
                                     <additionalparam>-Xdoclint:none</additionalparam>
-                                    <sourcepath>
-                                        hadoop-gremlin/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:tinkergraph-gremlin/src/main/java
-                                    </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>
-                                            <version>1.2.1</version>
-                                        </additionalDependency>
-                                    </additionalDependencies>
+                                    <includeDependencySources>true</includeDependencySources>
+                                    <dependencySourceIncludes>
+                                        <dependencySourceInclude>org.apache.tinkerpop:*</dependencySourceInclude>
+                                    </dependencySourceIncludes>
+                                    <detectLinks>false</detectLinks>
+                                    <detectOfflineLinks>false</detectOfflineLinks>
                                 </configuration>
                             </execution>
                             <execution>
@@ -785,9 +768,6 @@ limitations under the License.
                                 <configuration>
                                     <destDir>core</destDir>
                                     <additionalparam>-Xdoclint:none</additionalparam>
-                                    <sourcepath>
-                                        gremlin-core/src/main/java:gremlin-driver/src/main/java
-                                    </sourcepath>
                                     <quiet>true</quiet>
                                     <sourceFileIncludes>
                                         <!-- structure -->
@@ -806,13 +786,13 @@ limitations under the License.
                                             org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONReader.java
                                         </sourceFileInclude>
                                         <sourceFileInclude>
-                                            org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWrtier.java
+                                            org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONWriter.java
                                         </sourceFileInclude>
                                         <sourceFileInclude>
                                             org/apache/tinkerpop/gremlin/structure/io/gryo/GryoReader.java
                                         </sourceFileInclude>
                                         <sourceFileInclude>
-                                            org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWrtier.java
+                                            org/apache/tinkerpop/gremlin/structure/io/gryo/GryoWriter.java
                                         </sourceFileInclude>
                                         <!-- process -->
                                         <sourceFileInclude>org/apache/tinkerpop/gremlin/process/*.java
@@ -839,14 +819,12 @@ 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>
-                                            <version>1.2.1</version>
-                                        </additionalDependency>
-                                    </additionalDependencies>
+                                    <includeDependencySources>true</includeDependencySources>
+                                    <dependencySourceIncludes>
+                                        <dependencySourceInclude>org.apache.tinkerpop:*</dependencySourceInclude>
+                                    </dependencySourceIncludes>
+                                    <detectLinks>false</detectLinks>
+                                    <detectOfflineLinks>false</detectOfflineLinks>
                                 </configuration>
                             </execution>
                         </executions>