accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] 01/02: Merge branch '1.8'
Date Fri, 16 Feb 2018 04:56:02 GMT
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 <ctubbsii@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.

Mime
View raw message