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 2018/02/16 04:55:59 UTC
[accumulo] branch 1.8 updated (36a0f25 -> d47c915)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 36a0f25 Merge branch '1.7' into 1.8
new 4e91215 ACCUMULO-4817 Update build plugins and parent POM
new d47c915 Merge branch '1.7' into 1.8
The 2 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:
.../org/apache/accumulo/core/util/HostAndPort.java | 2 -
.../iterators/FirstEntryInRowIteratorTest.java | 4 +-
docs/pom.xml | 2 +-
.../apache/accumulo/fate/util/UtilWaitThread.java | 2 -
maven-plugin/pom.xml | 3 ++
pom.xml | 61 ++++++++++------------
6 files changed, 33 insertions(+), 41 deletions(-)
--
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.
[accumulo] 01/01: Merge branch '1.7' into 1.8
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit d47c915f6d2dcac2a2edf4af1eb2768508b5da89
Merge: 36a0f25 4e91215
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Feb 15 22:05:05 2018 -0500
Merge branch '1.7' into 1.8
.../org/apache/accumulo/core/util/HostAndPort.java | 2 -
.../iterators/FirstEntryInRowIteratorTest.java | 4 +-
docs/pom.xml | 2 +-
.../apache/accumulo/fate/util/UtilWaitThread.java | 2 -
maven-plugin/pom.xml | 3 ++
pom.xml | 61 ++++++++++------------
6 files changed, 33 insertions(+), 41 deletions(-)
diff --cc core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
index 34b01bc,4b1cd80..71e734b
--- a/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/FirstEntryInRowIteratorTest.java
@@@ -22,7 -22,8 +22,8 @@@ import java.io.IOException
import java.util.Collections;
import java.util.TreeMap;
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.client.impl.BaseIteratorEnvironment;
+ import org.apache.accumulo.core.data.ByteSequence;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.PartialKey;
import org.apache.accumulo.core.data.Range;
diff --cc pom.xml
index c24862f,751ca6c..acdfd44
--- a/pom.xml
+++ b/pom.xml
@@@ -118,37 -114,34 +115,34 @@@
<properties>
<!-- used for filtering the java source with the current version -->
<accumulo.release.version>${project.version}</accumulo.release.version>
- <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
<!-- bouncycastle version for test dependencies -->
- <bouncycastle.version>1.54</bouncycastle.version>
+ <bouncycastle.version>1.59</bouncycastle.version>
+ <!-- Curator version -->
+ <curator.version>2.11.0</curator.version>
<!-- relative path for Eclipse format; should override in child modules if necessary -->
<eclipseFormatterStyle>${project.parent.basedir}/contrib/Eclipse-Accumulo-Codestyle.xml</eclipseFormatterStyle>
<!-- extra release args for testing -->
<extraReleaseArgs />
<failsafe.excludedGroups />
<failsafe.groups />
- <!-- findbugs-maven-plugin won't work on jdk8 or later; set to 3.0.0 or newer -->
- <findbugs.version>3.0.3</findbugs.version>
+ <findbugs.version>3.0.5</findbugs.version>
<!-- surefire/failsafe plugin option -->
<forkCount>1</forkCount>
- <!-- overwritten in hadoop profiles -->
- <hadoop.version>2.2.0</hadoop.version>
+ <hadoop.version>2.6.4</hadoop.version>
<htrace.version>3.1.0-incubating</htrace.version>
<httpclient.version>3.1</httpclient.version>
<it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
- <jetty.version>9.1.5.v20140505</jetty.version>
+ <!-- jetty 9.2 is the last version to support jdk less than 1.8 -->
+ <jetty.version>9.2.17.v20160517</jetty.version>
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
- <!-- the maven-release-plugin makes this recommendation, due to plugin bugs -->
- <maven.min-version>3.0.5</maven.min-version>
+ <maven.plugin-version>3.0.5</maven.plugin-version>
<!-- surefire/failsafe plugin option -->
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
- <powermock.version>1.6.5</powermock.version>
+ <powermock.version>1.6.6</powermock.version>
<!-- surefire/failsafe plugin option -->
<reuseForks>false</reuseForks>
- <sealJars>false</sealJars>
- <!-- overwritten in hadoop profiles -->
- <slf4j.version>1.7.5</slf4j.version>
+ <slf4j.version>1.7.21</slf4j.version>
<sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
<surefire.excludedGroups />
<surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
@@@ -776,8 -740,20 +767,8 @@@
<version>[${maven.compiler.target},)</version>
</requireJavaVersion>
<requireMavenVersion>
- <version>[${maven.min-version},)</version>
+ <version>[3.0.5,)</version>
</requireMavenVersion>
- <requireProperty>
- <property>hadoop.profile</property>
- <regex>(2)</regex>
- <regexMessage>You should specify the Hadoop profile by major Hadoop generation, i.e. 1 or 2, not by a version number.
- Use hadoop.version to use a particular Hadoop version within that generation. See README for more details.</regexMessage>
- </requireProperty>
- <requireProperty>
- <property>thrift.version</property>
- <regex>0[.]9[.]1</regex>
- <regexMessage>Thrift version must be 0.9.1; Any alteration requires a review of ACCUMULO-1691
- (See server/base/src/main/java/org/apache/accumulo/server/util/CustomNonBlockingServer.java)</regexMessage>
- </requireProperty>
</rules>
</configuration>
<dependencies>
--
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.