Merge branch 'tp32'
Conflicts:
giraph-gremlin/pom.xml
gremlin-archetype/gremlin-archetype-dsl/pom.xml
gremlin-archetype/gremlin-archetype-server/pom.xml
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
gremlin-archetype/pom.xml
gremlin-console/bin/gremlin.sh
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-driver/pom.xml
gremlin-groovy-test/pom.xml
gremlin-groovy/pom.xml
gremlin-python/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
gremlin-tools/gremlin-benchmark/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
pom.xml
spark-gremlin/pom.xml
tinkergraph-gremlin/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/33717390
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/33717390
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/33717390
Branch: refs/heads/TINKERPOP-1682
Commit: 337173907258d62b82dd8d20223617c422359b37
Parents: 512ca3a 14ddffd
Author: Stephen Mallette <[email protected]>
Authored: Mon Jun 12 13:24:51 2017 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Mon Jun 12 13:24:51 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 71 ++++++++++++++++++--
.../upgrade/release-3.1.x-incubating.asciidoc | 4 +-
.../upgrade/release-3.2.x-incubating.asciidoc | 6 +-
pom.xml | 4 +-
4 files changed, 73 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33717390/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33717390/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/33717390/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index fef1ccb,a12b952..a8f29fa
--- a/pom.xml
+++ b/pom.xml
@@@ -336,79 -327,6 +336,79 @@@ limitations under the License
</dependency>
</dependencies>
</plugin>
+ <!-- Needed to figure out the version components when reading
revapi API check config below -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ <phase>validate</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.revapi</groupId>
+ <artifactId>revapi-maven-plugin</artifactId>
+ <version>0.8.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.revapi</groupId>
+ <artifactId>revapi-java</artifactId>
+ <version>0.13.0</version>
- </dependency>
++ </dependency>
+ </dependencies>
+ <configuration>
+ <skip>${revapi.skip}</skip>
+ <analysisConfiguration><![CDATA[
+ {
+ "revapi": {
+ "semver": {
+ "ignore": {
+ "enabled": true,
+ "versionIncreaseAllows": {
+ "major": "breaking",
+ "minor": "breaking",
+ "patch": "nonBreaking"
+ },
+ "passThroughDifferences":
["java.class.nonPublicPartOfAPI"]
+ }
+ }
+ }
+ }
+ ]]></analysisConfiguration>
+ <analysisConfigurationFiles>
+ <configurationFile>
+ <path>${project.basedir}/api-changes.json</path>
+ <roots>
+
<root>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}</root>
+ </roots>
+ </configurationFile>
+ <configurationFile>
+ <path>${project.basedir}/api-contents.json</path>
- </configurationFile>
++ </configurationFile>
+ </analysisConfigurationFiles>
+
<failOnMissingConfigurationFiles>false</failOnMissingConfigurationFiles>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- we never use this plugin - disabling helps with speeding up
other processing like when using -Dcoverage -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
