[CONFIGURATION-728] Update Apache Commons Text from 1.5 to 1.6.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/configuration/trunk@1844056 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 57677cf..08a8f90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -282,7 +282,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.5</version>
+ <version>1.6</version>
</dependency>
<dependency>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4d741b6..52e2d45 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -81,6 +81,9 @@
<action dev="ggregory" type="fix" issue="CONFIGURATION-727">
org.apache.commons.configuration2.DatabaseConfiguration never closes result sets and statements.
</action>
+ <action dev="ggregory" type="update" issue="CONFIGURATION-728">
+ Update Apache Commons Text from 1.5 to 1.6.
+ </action>
</release>
<release version="2.3" date="2018-08-04"
diff --git a/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java b/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
index 3d2abab..9978f91 100644
--- a/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
+++ b/src/main/java/org/apache/commons/configuration2/interpol/ConfigurationInterpolator.java
@@ -108,7 +108,7 @@
static
{
- final Map<String, Lookup> lookups = new HashMap<>();
+ final Map<String, Lookup> lookups = new HashMap<>(DefaultLookups.values().length);
for (final DefaultLookups l : DefaultLookups.values())
{
lookups.put(l.getPrefix(), l.getLookup());
diff --git a/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java b/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java
index 0429b7c..d8520ca 100644
--- a/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java
+++ b/src/main/java/org/apache/commons/configuration2/interpol/DefaultLookups.java
@@ -64,68 +64,74 @@
*
* @since 2.4
*/
- BASE64_DECODER("base64Decoder", new StringLookupAdapter(StringLookupFactory.INSTANCE.base64StringLookup())),
+ BASE64_DECODER(StringLookupFactory.KEY_BASE64_DECODER,
+ new StringLookupAdapter(StringLookupFactory.INSTANCE.base64DecoderStringLookup())),
/**
* The lookup for Base64 decoding.
*
* @since 2.4
*/
- //BASE64_ENCODER("base64Encoder", new StringLookupAdapter(StringLookupFactory.INSTANCE.base64EncoderStringLookup())),
+ BASE64_ENCODER(StringLookupFactory.KEY_BASE64_ENCODER,
+ new StringLookupAdapter(StringLookupFactory.INSTANCE.base64EncoderStringLookup())),
/**
* The lookup for constants.
*
* @since 2.4
*/
- CONST("const", new StringLookupAdapter(StringLookupFactory.INSTANCE.constantStringLookup())),
+ CONST(StringLookupFactory.KEY_CONST, new StringLookupAdapter(StringLookupFactory.INSTANCE.constantStringLookup())),
/**
* The lookup for dates.
*
* @since 2.4
*/
- DATE("date", new StringLookupAdapter(StringLookupFactory.INSTANCE.dateStringLookup())),
+ DATE(StringLookupFactory.KEY_DATE, new StringLookupAdapter(StringLookupFactory.INSTANCE.dateStringLookup())),
/**
* The lookup for environment properties.
*/
- ENVIRONMENT("env", new StringLookupAdapter(StringLookupFactory.INSTANCE.environmentVariableStringLookup())),
+ ENVIRONMENT(StringLookupFactory.KEY_ENV,
+ new StringLookupAdapter(StringLookupFactory.INSTANCE.environmentVariableStringLookup())),
/**
* The lookup for files.
*
* @since 2.4
*/
- FILE("file", new StringLookupAdapter(StringLookupFactory.INSTANCE.fileStringLookup())),
+ FILE(StringLookupFactory.KEY_FILE, new StringLookupAdapter(StringLookupFactory.INSTANCE.fileStringLookup())),
/**
* The lookup for Java platform information.
*
* @since 2.4
*/
- JAVA("java", new StringLookupAdapter(StringLookupFactory.INSTANCE.javaPlatformStringLookup())),
+ JAVA(StringLookupFactory.KEY_JAVA,
+ new StringLookupAdapter(StringLookupFactory.INSTANCE.javaPlatformStringLookup())),
/**
* The lookup for localhost information.
*
* @since 2.4
*/
- LOCAL_HOST("localhost", new StringLookupAdapter(StringLookupFactory.INSTANCE.localHostStringLookup())),
+ LOCAL_HOST(StringLookupFactory.KEY_LOCALHOST,
+ new StringLookupAdapter(StringLookupFactory.INSTANCE.localHostStringLookup())),
/**
* The lookup for properties.
*
* @since 2.4
*/
- PROPERTIES("properties", new StringLookupAdapter(StringLookupFactory.INSTANCE.propertiesStringLookup())),
+ PROPERTIES(StringLookupFactory.KEY_PROPERTIES,
+ new StringLookupAdapter(StringLookupFactory.INSTANCE.propertiesStringLookup())),
/**
* The lookup for resource bundles.
*
* @since 2.4
*/
- RESOURCE_BUNDLE("resourceBundle",
+ RESOURCE_BUNDLE(StringLookupFactory.KEY_RESOURCE_BUNDLE,
new StringLookupAdapter(StringLookupFactory.INSTANCE.resourceBundleStringLookup())),
/**
@@ -133,40 +139,43 @@
*
* @since 2.4
*/
- SCRIPT("script", new StringLookupAdapter(StringLookupFactory.INSTANCE.scriptStringLookup())),
+ SCRIPT(StringLookupFactory.KEY_SCRIPT, new StringLookupAdapter(StringLookupFactory.INSTANCE.scriptStringLookup())),
/**
* The lookup for system properties.
*/
- SYSTEM_PROPERTIES("sys", new StringLookupAdapter(StringLookupFactory.INSTANCE.systemPropertyStringLookup())),
+ SYSTEM_PROPERTIES(StringLookupFactory.KEY_SYS,
+ new StringLookupAdapter(StringLookupFactory.INSTANCE.systemPropertyStringLookup())),
/**
* The lookup for URLs.
*
* @since 2.4
*/
- URL("url", new StringLookupAdapter(StringLookupFactory.INSTANCE.urlStringLookup())),
+ URL(StringLookupFactory.KEY_URL, new StringLookupAdapter(StringLookupFactory.INSTANCE.urlStringLookup())),
/**
* The lookup for URL decoding.
*
* @since 2.4
*/
- // URL_DECODE("urlDecoder", new StringLookupAdapter(StringLookupFactory.INSTANCE.urlDecoderStringLookup())),
+ URL_DECODER(StringLookupFactory.KEY_URL_DECODER,
+ new StringLookupAdapter(StringLookupFactory.INSTANCE.urlDecoderStringLookup())),
/**
* The lookup for URL decoding.
*
* @since 2.4
*/
- // URL_ENCODE("urlEncoder", new StringLookupAdapter(StringLookupFactory.INSTANCE.urlEncoderStringLookup())),
+ URL_ENCODER(StringLookupFactory.KEY_URL_ENCODER,
+ new StringLookupAdapter(StringLookupFactory.INSTANCE.urlEncoderStringLookup())),
/**
* The lookup for URL decoding.
*
* @since 2.4
*/
- XML("xml", new StringLookupAdapter(StringLookupFactory.INSTANCE.xmlStringLookup()));
+ XML(StringLookupFactory.KEY_XML, new StringLookupAdapter(StringLookupFactory.INSTANCE.xmlStringLookup()));
/** The associated lookup instance. */
private final Lookup lookup;
