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 2016/09/14 18:15:31 UTC
[1/6] tinkerpop git commit: Removed the second jython execution from
gremlin-python build
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1449 [created] 079cc20d9
Removed the second jython execution from gremlin-python build
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fdd70e5e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fdd70e5e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fdd70e5e
Branch: refs/heads/TINKERPOP-1449
Commit: fdd70e5edfb0743114a1825b025e3c0e1124d098
Parents: d4d8297
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 14 11:35:56 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 14 11:35:56 2016 -0400
----------------------------------------------------------------------
gremlin-python/pom.xml | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fdd70e5e/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index b1a9453..50c823d 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -78,7 +78,7 @@
</dependency>
</dependencies>
<properties>
- <!-- provide a way to convert maven.test.skip value to skipTests for use in skipping python tests -->
+ <!-- provides a way to convert maven.test.skip value to skipTests for use in skipping python tests -->
<maven.test.skip>false</maven.test.skip>
<skipTests>${maven.test.skip}</skipTests>
<gremlin.server.dir>${project.parent.basedir}/gremlin-server</gremlin.server.dir>
@@ -285,13 +285,13 @@
<build>
<plugins>
<!-- excludes python related tests that require python itself installed on the system - run with the
- python profile if python is present -->
+ python profile if glVPython is present -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <python.home>${project.build.testOutputDirectory}</python.home>
+ <python.home>${project.build.outputDirectory}</python.home>
</systemPropertyVariables>
<excludes>
<exclude>**/jsr223/Python*Test.java</exclude>
@@ -320,7 +320,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <python.home>${project.build.testOutputDirectory}</python.home>
+ <python.home>${project.build.outputDirectory}</python.home>
</systemPropertyVariables>
</configuration>
</plugin>
@@ -331,19 +331,11 @@
<version>1.4</version>
<executions>
<execution>
- <phase>package</phase>
- <goals>
- <goal>jython</goal>
- </goals>
- </execution>
- <execution>
- <id>pythonDependencies</id>
- <phase>generate-test-resources</phase>
+ <phase>compile</phase>
<goals>
<goal>jython</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<libraries>
<param>aenum==1.4.5</param>
<param>tornado==4.4.1</param>
@@ -431,7 +423,7 @@
<exec executable="env/bin/python" dir="${project.build.directory}/python"
failonerror="true">
<env key="PYTHONPATH" value=""/>
- <arg line="setup.py build --build-lib ${project.build.testOutputDirectory}/Lib"/>
+ <arg line="setup.py build --build-lib ${project.build.outputDirectory}/Lib"/>
</exec>
</target>
</configuration>
[3/6] tinkerpop git commit: Updated changelog about -DglvPython
Posted by sp...@apache.org.
Updated changelog about -DglvPython
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2fbeb596
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2fbeb596
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2fbeb596
Branch: refs/heads/TINKERPOP-1449
Commit: 2fbeb596d7fe72bccaf2d5a3e5eac0344882a3b1
Parents: e0d7c90
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 14 12:01:37 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 14 12:01:37 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2fbeb596/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 24ed601..ab2f8df 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@ TinkerPop 3.2.3 (Release Date: NOT OFFICIALLY RELEASED YET)
* Fixed a `JavaTranslator` bug where `Bytecode` instructions were being mutated during translation.
* Added `Path` to Gremlin-Python with respective GraphSON 2.0 deserializer.
+* New build options for `gremlin-python` where `-DglvPython` is no longer required.
* Added missing `InetAddress` to GraphSON extension module.
[[release-3-2-2]]
[6/6] tinkerpop git commit: Udpated dev docs related to release given
changes to gremlin-python build
Posted by sp...@apache.org.
Udpated dev docs related to release given changes to gremlin-python build
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/079cc20d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/079cc20d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/079cc20d
Branch: refs/heads/TINKERPOP-1449
Commit: 079cc20d9604c7bcbf21496a6fc042374f86b282
Parents: 9b4c788
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 14 14:14:20 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 14 14:14:20 2016 -0400
----------------------------------------------------------------------
.../dev/developer/development-environment.asciidoc | 2 ++
docs/src/dev/developer/release.asciidoc | 16 ++++++++++------
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/079cc20d/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 632100c..ade4288 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -14,6 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
////
+[[development-environment]]
Development Environment
=======================
@@ -21,6 +22,7 @@ TinkerPop is fairly large body of code spread across many modules and covering m
this complexity, it remains relatively straightforward a project to build. This following subsections explain how to
configure a development environment for TinkerPop.
+[[system-configuration]]
System Configuration
--------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/079cc20d/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index e1007e0..f4d29ff 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -32,6 +32,10 @@ from a previous version or from recent `SNAPSHOT`. When using one generated for
commands end up being set to the version that is being released, making cut and paste of those commands less labor
intensive and error prone.
+IMPORTANT: The following instructions assume that the release manager's <<development-environment,environment> is setup
+properly for release and includes a `.glv` file in `gremlin-python` as described in the <<python-environment,Python Environment>>
+section, so that the `gremlin-python` module builds in full.
+
Pre-flight Check
----------------
@@ -46,7 +50,7 @@ and communicating with other members of the community.
under release is protected. Tweaks to documentation and other odds and ends related to release are still allowed
during this period.
. At some point during the week:
-.. Run the full integration test suite: `mvn clean install -DskipIntegrationTests=false -DincludeNeo4j -DglvPython`
+.. Run the full integration test suite: `mvn clean install -DskipIntegrationTests=false -DincludeNeo4j`
.. Deploy a final SNAPSHOT to the snapshot repository.
.. Review LICENSE and NOTICE files to make sure that no <<dependencies,changes are needed>>.
.. Review javadoc filters on the "Core API" docs to be sure nothing needs to change.
@@ -70,7 +74,7 @@ A release candidate is an unofficial release that is represented by a tagged ver
offered in cases where there is significant change in a particular version and the potential for upgrades and problems
might be high.
-. `mvn clean install -DincludeNeo4j -DglvPython`
+. `mvn clean install -DincludeNeo4j`
.. `mvn verify -DskipIntegrationTests=false -DincludeNeo4j`
.. `mvn verify -DskipPerformanceTests=false`
. `bin/publish-docs.sh <username>` - note that under a release candidate the documentation is published as SNAPSHOT
@@ -147,14 +151,14 @@ Release & Promote
-----------------
. Login to link:https://repository.apache.org/[Apache Nexus] and release the previously closed repository.
-. Deploy to link:https://pypi.python.org/pypi[pypi] with `mvn clean install -DskipTests -DglvPython -Dpypi`. It is likely necessary
-that this build will occur from the tag for the release, so be sure to checkout the tag first before executing this step.
+. Deploy to link:https://pypi.python.org/pypi[pypi]
+.. This build will likely occur from the tag for the release, so be sure to checkout the tag first before executing this step.
+.. `mvn clean install -DskipTests`
+.. `mvn deploy -pl gremlin-python -DskipTests -Dpypi`
. `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop dev; svn up dev/xx.yy.zz`
. `svn co --depth empty https://dist.apache.org/repos/dist/release/tinkerpop release; mkdir release/xx.yy.zz`
. Copy release files from `dev/xx.yy.zz` to `release/xx.yy.zz`.
. `cd release; svn add xx.yy.zz/; svn ci -m "TinkerPop xx.yy.zz release"`
-. Deploy `gremlin-python` to pypi with `mvn deploy -pl gremlin-python -Dpypi -DskipTests` (note that `gremlin-python`
-should be built with `-DglvPython` first without skipping tests so that the distribution will be present)
. Update homepage with references to latest distribution and to other internal links elsewhere on the page.
. Wait for Apache Sonatype to sync the artifacts to Maven Central at (link:http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/[http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/]).
. Wait for zip distributions to to sync to the Apache mirrors (i.e ensure the download links work from a mirror).
[2/6] tinkerpop git commit: Drop -DglvPython as a requirement for
building gremlin-python.
Posted by sp...@apache.org.
Drop -DglvPython as a requirement for building gremlin-python.
Now you can just add .glv file to the root of gremlin-python to let Maven know that your environment is python-enabled.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e0d7c90d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e0d7c90d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e0d7c90d
Branch: refs/heads/TINKERPOP-1449
Commit: e0d7c90d4391e24ae18fdb2cc6a57c978039b29f
Parents: fdd70e5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 14 11:59:07 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 14 11:59:07 2016 -0400
----------------------------------------------------------------------
.gitignore | 1 +
docs/src/dev/developer/development-environment.asciidoc | 11 ++++++++++-
gremlin-python/pom.xml | 8 ++++----
pom.xml | 1 +
4 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d7c90d/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9d83c5a..33fb239 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ benchmarks/
__pycache__/
*.py[cdo]
__version__.py
+.glv
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d7c90d/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 117f792..632100c 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -65,6 +65,16 @@ As of TinkerPop 3.2.2, the build optionally requires link:https://www.python.org
Java tests that require Python code will be skipped. Developers should also install link:https://pypi.python.org/pypi/pip[pip]
and link:https://virtualenv.pypa.io/en/stable/[virtualenv].
+Once the Python environment is established, the full building and testing of `gremlin-python` may commence. It can be
+done manually from the command line with:
+
+[source,text]
+mvn clean install -Pglv-python
+
+which enables the "glv-python" Maven profile or in a more automated fashion simply add a `.glv` file to the root of the
+`gremlin-python` module which will signify to Maven that the environment is Python-ready. The `.glv` file need not have
+any contents and is ignored by Git. A standard `mvn clean install` will then build `gremlin-python` in full.
+
[[release-environment]]
Release Environment
~~~~~~~~~~~~~~~~~~~
@@ -117,7 +127,6 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test
** Clean the `.groovy/grapes/org.apache.tinkerpop` directory on build: `mvn clean install -DcleanGrapes`
** Turn off "heavy" logging in the "process" tests: `mvn clean install -DargLine="-DmuteTestLogs=true"`
** The test suite for `neo4j-gremlin` is disabled by default - to turn it on: `mvn clean install -DincludeNeo4j`
-** Build and execute with native Python tests (see <<python-environment,Python Environment>>: `mvn clean install -DglvPython`
* Regenerate test data (only necessary given changes to IO classes): `mvn clean install -Dio` from `tinkergraph-gremlin` directory
** If there are changes to the Gryo format, it may be necessary to generate the Grateful Dead dataset from GraphSON (see `IoDataGenerationTest.shouldWriteGratefulDead`)
* Check license headers are present: `mvn apache-rat:check`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d7c90d/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 50c823d..3695c0d 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -275,7 +275,7 @@
</build>
<profiles>
- <!-- This default profile works around the issue where the glvPython profile which is expected to run all tests
+ <!-- This default profile works around the issue where the glv-python profile which is expected to run all tests
can't override the exclusions defined below. -->
<profile>
<id>glv-python-standard</id>
@@ -307,9 +307,9 @@
<id>glv-python</id>
<activation>
<activeByDefault>false</activeByDefault>
- <property>
- <name>glvPython</name>
- </property>
+ <file>
+ <exists>.glv</exists>
+ </file>
</activation>
<build>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0d7c90d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fd620e7..e37746c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,6 +293,7 @@ limitations under the License.
<exclude>**/src/main/static/**</exclude>
<exclude>**/_bsp/**</exclude>
<exclude>DEPENDENCIES</exclude>
+ <exclude>.glv</exclude>
</excludes>
<licenses>
<license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>
[5/6] tinkerpop git commit: Centrally manage gmavenplus plugin and
bump to 1.5
Posted by sp...@apache.org.
Centrally manage gmavenplus plugin and bump to 1.5
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9b4c7884
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9b4c7884
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9b4c7884
Branch: refs/heads/TINKERPOP-1449
Commit: 9b4c7884dc5c3e09086113b3720f07e1501951c4
Parents: 2106b10
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 14 13:45:41 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 14 13:45:41 2016 -0400
----------------------------------------------------------------------
giraph-gremlin/pom.xml | 18 ------------------
gremlin-console/pom.xml | 18 ------------------
gremlin-groovy-test/pom.xml | 18 ------------------
gremlin-groovy/pom.xml | 18 ------------------
gremlin-python/pom.xml | 22 ++--------------------
hadoop-gremlin/pom.xml | 18 ------------------
neo4j-gremlin/pom.xml | 18 ------------------
pom.xml | 25 ++++++++++++++++++++++++-
spark-gremlin/pom.xml | 18 ------------------
9 files changed, 26 insertions(+), 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9b4c7884/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 47b1adc..528b2ad 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -228,24 +228,6 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>addSources</goal>
- <goal>addTestSources</goal>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>testGenerateStubs</goal>
- <goal>testCompile</goal>
- <goal>removeStubs</goal>
- <goal>removeTestStubs</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <invokeDynamic>true</invokeDynamic>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9b4c7884/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 7662a6b..aae5e41 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -206,24 +206,6 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>addSources</goal>
- <goal>addTestSources</goal>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>testGenerateStubs</goal>
- <goal>testCompile</goal>
- <goal>removeStubs</goal>
- <goal>removeTestStubs</goal>
- </goals>
- <configuration>
- <invokeDynamic>true</invokeDynamic>
- </configuration>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9b4c7884/gremlin-groovy-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/pom.xml b/gremlin-groovy-test/pom.xml
index 2bb8502..614591e 100644
--- a/gremlin-groovy-test/pom.xml
+++ b/gremlin-groovy-test/pom.xml
@@ -50,24 +50,6 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>addSources</goal>
- <goal>addTestSources</goal>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>testGenerateStubs</goal>
- <goal>testCompile</goal>
- <goal>removeStubs</goal>
- <goal>removeTestStubs</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <invokeDynamic>true</invokeDynamic>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9b4c7884/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 5518be8..171770f 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -113,24 +113,6 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>addSources</goal>
- <goal>addTestSources</goal>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>testGenerateStubs</goal>
- <goal>testCompile</goal>
- <goal>removeStubs</goal>
- <goal>removeTestStubs</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <invokeDynamic>true</invokeDynamic>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9b4c7884/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index b2ba875..76afe60 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -124,24 +124,6 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>addSources</goal>
- <goal>addTestSources</goal>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>testGenerateStubs</goal>
- <goal>testCompile</goal>
- <goal>removeStubs</goal>
- <goal>removeTestStubs</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <invokeDynamic>true</invokeDynamic>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -458,7 +440,8 @@
<!--
use pytest to execute native python tests - output of xunit output is configured in setup.cfg.
- had to use the ant plugin - maven-exec-plugin
+ this has to be an integration-test because we need gremlin-server running and the standard
+ test phase doesn't have a pre/post event like integration-test does.
-->
<execution>
<id>native-python-test</id>
@@ -482,7 +465,6 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>1.2</version>
<dependencies>
<dependency>
<groupId>org.codehaus.groovy</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9b4c7884/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 542fd96..74f91b1 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -223,24 +223,6 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>addSources</goal>
- <goal>addTestSources</goal>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>testGenerateStubs</goal>
- <goal>testCompile</goal>
- <goal>removeStubs</goal>
- <goal>removeTestStubs</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <invokeDynamic>true</invokeDynamic>
- </configuration>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9b4c7884/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index d3e5082..109f372 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -94,24 +94,6 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>addSources</goal>
- <goal>addTestSources</goal>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>testGenerateStubs</goal>
- <goal>testCompile</goal>
- <goal>removeStubs</goal>
- <goal>removeTestStubs</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <invokeDynamic>true</invokeDynamic>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9b4c7884/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e37746c..7a4c230 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,7 +293,7 @@ limitations under the License.
<exclude>**/src/main/static/**</exclude>
<exclude>**/_bsp/**</exclude>
<exclude>DEPENDENCIES</exclude>
- <exclude>.glv</exclude>
+ <exclude>**/.glv</exclude>
</excludes>
<licenses>
<license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>
@@ -433,6 +433,29 @@ limitations under the License.
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.gmavenplus</groupId>
+ <artifactId>gmavenplus-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>addSources</goal>
+ <goal>addTestSources</goal>
+ <goal>generateStubs</goal>
+ <goal>compile</goal>
+ <goal>testGenerateStubs</goal>
+ <goal>testCompile</goal>
+ <goal>removeStubs</goal>
+ <goal>removeTestStubs</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <targetBytecode>1.8</targetBytecode>
+ <invokeDynamic>true</invokeDynamic>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9b4c7884/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index e018b21..7f4137e 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -362,24 +362,6 @@
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>addSources</goal>
- <goal>addTestSources</goal>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>testGenerateStubs</goal>
- <goal>testCompile</goal>
- <goal>removeStubs</goal>
- <goal>removeTestStubs</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <invokeDynamic>true</invokeDynamic>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
[4/6] tinkerpop git commit: Allow -DskipTests to still produce a
valid build of gremlin-python
Posted by sp...@apache.org.
Allow -DskipTests to still produce a valid build of gremlin-python
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2106b10e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2106b10e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2106b10e
Branch: refs/heads/TINKERPOP-1449
Commit: 2106b10e74008481b19bba98635f65dda99800bf
Parents: 2fbeb59
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 14 12:16:13 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 14 12:16:13 2016 -0400
----------------------------------------------------------------------
gremlin-python/pom.xml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2106b10e/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 3695c0d..b2ba875 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -324,14 +324,13 @@
</systemPropertyVariables>
</configuration>
</plugin>
- <!-- required for the jython tests -->
<plugin>
<groupId>net.sf.mavenjython</groupId>
<artifactId>jython-compile-maven-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
- <phase>compile</phase>
+ <phase>process-resources</phase>
<goals>
<goal>jython</goal>
</goals>
@@ -413,12 +412,11 @@
</execution>
<execution>
<id>native-python-build</id>
- <phase>generate-test-resources</phase>
+ <phase>compile</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
- <skip>${skipTests}</skip>
<target>
<exec executable="env/bin/python" dir="${project.build.directory}/python"
failonerror="true">