accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] 01/01: Merge branch '2.0'
Date Sat, 15 Jun 2019 04:47:14 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 cd566a968b5d3a50884f3a3b6cf524a253675a96
Merge: ca5b62d 862f321
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Sat Jun 15 00:46:58 2019 -0400

    Merge branch '2.0'

 .../apache/accumulo/core/data/NamespaceIdTest.java | 57 +++++++++---------
 .../org/apache/accumulo/core/data/TableIdTest.java | 67 +++++++++++++---------
 pom.xml                                            |  4 +-
 .../classloader/vfs/AccumuloVFSClassLoader.java    |  7 ++-
 .../vfs/AccumuloVFSClassLoaderTest.java            |  2 +-
 5 files changed, 76 insertions(+), 61 deletions(-)

diff --cc pom.xml
index 0fbe492,a592801..10cf08a
--- a/pom.xml
+++ b/pom.xml
@@@ -132,14 -132,11 +132,14 @@@
      <jaxb.version>2.3.0</jaxb.version>
      <jersey.version>2.27</jersey.version>
      <jetty.version>9.4.17.v20190418</jetty.version>
 -    <maven.compiler.source>1.8</maven.compiler.source>
 -    <maven.compiler.target>1.8</maven.compiler.target>
 +    <maven.compiler.release>11</maven.compiler.release>
 +    <maven.compiler.source>11</maven.compiler.source>
 +    <maven.compiler.target>11</maven.compiler.target>
      <!-- surefire/failsafe plugin option -->
      <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
 +    <!-- temporary until other Java 11 issues are resolved -->
 +    <modernizer.skip>true</modernizer.skip>
-     <powermock.version>1.7.4</powermock.version>
+     <powermock.version>2.0.2</powermock.version>
      <!-- surefire/failsafe plugin option -->
      <reuseForks>false</reuseForks>
      <servlet.api.version>3.1.0</servlet.api.version>


Mime
View raw message