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

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


The following commit(s) were added to refs/heads/1.9 by this push:
     new 06d8029  Update commons-configuration to latest 1.x (#659)
06d8029 is described below

commit 06d80292d869edc495bf691c0d43be52dc0dcdca
Author: Sean Busbey <sean.bus...@gmail.com>
AuthorDate: Tue Sep 25 12:08:15 2018 -0500

    Update commons-configuration to latest 1.x (#659)
    
    * Update to configuration-commons 1.10
    * Add deprecation notice for newly inherited method on ClientConfiguration
---
 .../org/apache/accumulo/core/client/ClientConfiguration.java   | 10 ++++++++++
 pom.xml                                                        |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java 
b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index 5f2be86..250bcd4 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -657,6 +657,16 @@ public class ClientConfiguration extends 
CompositeConfiguration {
   }
 
   /**
+   * @deprecated since 1.9.2; will be removed in 2.0.0 to eliminate commons 
config leakage into
+   *             Accumulo API
+   */
+  @Deprecated
+  @Override
+  public void addConfiguration(Configuration config, boolean asInMemory) {
+    super.addConfiguration(config, asInMemory);
+  }
+
+  /**
    * @deprecated since 1.9.0; will be removed in 2.0.0 to eliminate commons 
config leakage into
    *             Accumulo API
    */
diff --git a/pom.xml b/pom.xml
index d86f89a..2bf3e26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,7 +198,7 @@
       <dependency>
         <groupId>commons-configuration</groupId>
         <artifactId>commons-configuration</artifactId>
-        <version>1.6</version>
+        <version>1.10</version>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>

Reply via email to