diff --git a/pom.xml b/pom.xml index 18de993b0..0bb4735b6 100644 --- a/pom.xml +++ b/pom.xml @@ -207,9 +207,9 @@ compile - commons-configuration - commons-configuration - 1.10 + org.apache.commons + commons-configuration2 + 2.14.0 compile diff --git a/src/main/java/gov/nasa/pds/validate/ValidateLauncher.java b/src/main/java/gov/nasa/pds/validate/ValidateLauncher.java index 00b802f72..b0eaa0822 100644 --- a/src/main/java/gov/nasa/pds/validate/ValidateLauncher.java +++ b/src/main/java/gov/nasa/pds/validate/ValidateLauncher.java @@ -72,10 +72,12 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.ParseException; import org.apache.commons.cli.UnrecognizedOptionException; -import org.apache.commons.configuration.AbstractConfiguration; -import org.apache.commons.configuration.Configuration; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; +import org.apache.commons.configuration2.Configuration; +import org.apache.commons.configuration2.PropertiesConfiguration; +import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; +import org.apache.commons.configuration2.builder.fluent.Parameters; +import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler; +import org.apache.commons.configuration2.ex.ConfigurationException; import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -706,8 +708,13 @@ private void copyFile(File source, File dest) throws IOException { */ public void query(File configuration) throws ConfigurationException { try { - AbstractConfiguration.setDefaultListDelimiter(','); - Configuration config = new PropertiesConfiguration(configuration); + Parameters params = new Parameters(); + FileBasedConfigurationBuilder builder = + new FileBasedConfigurationBuilder<>(PropertiesConfiguration.class) + .configure(params.properties() + .setFile(configuration) + .setListDelimiterHandler(new DefaultListDelimiterHandler(','))); + Configuration config = builder.getConfiguration(); Iterator keys = config.getKeys(); String unknowns = "";