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:56:01 UTC
[accumulo] branch master updated (072dc0c -> 6a2cbe9)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 072dc0c Fix broken javadoc
new 4e91215 ACCUMULO-4817 Update build plugins and parent POM
new d47c915 Merge branch '1.7' into 1.8
new 31ebe86 Merge branch '1.8'
new 6a2cbe9 Fix minor javadoc typo
The 4 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 --
.../apache/accumulo/fate/util/UtilWaitThread.java | 2 --
pom.xml | 37 ++++++++++------------
.../tserver/compaction/MajorCompactionRequest.java | 4 +--
4 files changed, 18 insertions(+), 27 deletions(-)
--
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.
[accumulo] 02/02: Fix minor javadoc typo
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 6a2cbe9d89b61df6db205384eeebbf9c6dee51f6
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Feb 15 23:54:46 2018 -0500
Fix minor javadoc typo
---
.../apache/accumulo/tserver/compaction/MajorCompactionRequest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
index f5f734e..d1ac98f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/MajorCompactionRequest.java
@@ -103,8 +103,8 @@ public class MajorCompactionRequest implements Cloneable {
*
* <p>
* This method can only be called from {@link CompactionStrategy#gatherInformation(MajorCompactionRequest)}. Unfortunately, {@code gatherInformation()} is not
- * called before {@link CompactionStrategy#shouldCompact(MajorCompactionRequest)}. Therefore {@code shouldCompact()) should just return true when a compactions strategy
- * wants to use summary information.
+ * called before {@link CompactionStrategy#shouldCompact(MajorCompactionRequest)}. Therefore {@code shouldCompact()} should just return true when a
+ * compactions strategy wants to use summary information.
*
* <p>
* When using summaries to make compaction decisions, its important to ensure that all summary data fits in the tablet server summary cache. The size of this
--
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.
[accumulo] 01/02: Merge branch '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 master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 31ebe86b99a8bb6ea52f354737598c54c16e69bc
Merge: 072dc0c d47c915
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Feb 15 23:20:28 2018 -0500
Merge branch '1.8'
.../org/apache/accumulo/core/util/HostAndPort.java | 2 --
.../apache/accumulo/fate/util/UtilWaitThread.java | 2 --
pom.xml | 37 ++++++++++------------
3 files changed, 16 insertions(+), 25 deletions(-)
diff --cc pom.xml
index dd82739,acdfd44..7845395
--- a/pom.xml
+++ b/pom.xml
@@@ -128,23 -129,19 +126,23 @@@
<!-- surefire/failsafe plugin option -->
<forkCount>1</forkCount>
<hadoop.version>2.6.4</hadoop.version>
+ <hk2.version>2.4.0-b27</hk2.version>
<htrace.version>3.1.0-incubating</htrace.version>
- <httpclient.version>3.1</httpclient.version>
+ <httpclient.version>4.3.1</httpclient.version>
<it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
- <!-- 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>
- <maven.plugin-version>3.0.5</maven.plugin-version>
+ <jackson.version>2.9.0</jackson.version>
+ <javax.el.version>2.2.4</javax.el.version>
+ <jersey.version>2.25.1</jersey.version>
+ <jetty.version>9.3.21.v20170918</jetty.version>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.plugin-version>3.2.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>
+ <servlet.api.version>3.1.0</servlet.api.version>
<slf4j.version>1.7.21</slf4j.version>
<sourceReleaseAssemblyDescriptor>source-release-tar</sourceReleaseAssemblyDescriptor>
<surefire.excludedGroups />
@@@ -801,7 -589,8 +799,7 @@@
<plugin>
<groupId>com.github.ekryd.sortpom</groupId>
<artifactId>sortpom-maven-plugin</artifactId>
- <version>2.5.0</version>
- <!-- version 2.4.0 is the last version which supports Java 7 -->
- <version>2.4.0</version>
++ <version>2.8.0</version>
<configuration>
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder>
<createBackupFile>false</createBackupFile>
@@@ -943,9 -726,14 +936,9 @@@
</configuration>
</plugin>
<plugin>
- <groupId>org.asciidoctor</groupId>
- <artifactId>asciidoctor-maven-plugin</artifactId>
- <version>1.5.6</version>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.10</version>
+ <version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
--
To stop receiving notification emails like this one, please contact
ctubbsii@apache.org.