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 2019/06/13 17:54:30 UTC

[tinkerpop] branch master updated (aa300b6 -> 87c0527)

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


    from aa300b6  Merge branch 'tp34'
     new df93fb2  Downgrade docker maven plugin given a maven incompatibility.
     new c8ba4e8  Merge branch 'tp33' into tp34
     new 87c0527  Merge branch 'tp34'

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


[tinkerpop] 03/03: Merge branch 'tp34'

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 87c0527dc1042560d9114aff7dca9aea550645a6
Merge: aa300b6 c8ba4e8
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Thu Jun 13 13:54:16 2019 -0400

    Merge branch 'tp34'

 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)



[tinkerpop] 02/03: Merge branch 'tp33' into tp34

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit c8ba4e8ca65e594c0e7dcf5d398fd7a7a518f8f1
Merge: 887e9fb df93fb2
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Thu Jun 13 13:54:10 2019 -0400

    Merge branch 'tp33' into tp34

 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)



[tinkerpop] 01/03: Downgrade docker maven plugin given a maven incompatibility.

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit df93fb29cda846a086d3daa9144c7816219e9d74
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Thu Jun 13 13:52:40 2019 -0400

    Downgrade docker maven plugin given a maven incompatibility.
    
    The install command doesn't seem to want to work for creating images and I'd assume that deploy is also messed up. We'd need to ok a newer version of maven to allow upgrade past this version of the plugin. CTR
---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 89290a8..2fe7f83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -535,10 +535,12 @@ limitations under the License.
                     <artifactId>maven-jar-plugin</artifactId>
                     <version>3.0.2</version>
                 </plugin>
+                <!-- can't upgrade past 1.4.6 until we enforce maven 3.5.2 or better
+                     https://github.com/spotify/dockerfile-maven/issues/252 -->
                 <plugin>
                     <groupId>com.spotify</groupId>
                     <artifactId>dockerfile-maven-plugin</artifactId>
-                    <version>1.4.10</version>
+                    <version>1.4.6</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>