You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2019/07/29 19:13:05 UTC

[accumulo] branch 2.0 updated (0bb3f89 -> 5a6481f)

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

ctubbsii pushed a change to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git.


    from 0bb3f89  Merge branch '1.9' into 2.0
     add fd4d478  Updates to support Java 11 on 1.9 branch (#1295)
     new 5a6481f  Merge branch '1.9' into 2.0

The 1 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 ++++
 test/src/main/java/org/apache/accumulo/test/ShellServerIT.java | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)


[accumulo] 01/01: Merge branch '1.9' into 2.0

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

ctubbsii pushed a commit to branch 2.0
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 5a6481f7c15253bfc19a0ded5a96cb02ce9edb7e
Merge: 0bb3f89 fd4d478
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Mon Jul 29 15:08:16 2019 -0400

    Merge branch '1.9' into 2.0

 pom.xml                                                        | 4 ++++
 test/src/main/java/org/apache/accumulo/test/ShellServerIT.java | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc pom.xml
index c08d56c,ff3f20b..bc9d69b
--- a/pom.xml
+++ b/pom.xml
@@@ -1353,6 -1100,10 +1353,10 @@@
            <name>m2e.version</name>
          </property>
        </activation>
+       <properties>
 -        <!-- enforces Java 7 compiler compliance, even when Eclipse uses JDK 9 or later -->
 -        <maven.compiler.release>7</maven.compiler.release>
++        <!-- enforces Java 8 compiler compliance, even when Eclipse uses JDK 9 or later -->
++        <maven.compiler.release>8</maven.compiler.release>
+       </properties>
        <build>
          <pluginManagement>
            <plugins>