You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2019/09/17 12:18:06 UTC
[commons-configuration] branch release updated (3ea04dd -> 8e3e85b)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch release
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git.
from 3ea04dd Bump to next development version
add ebe51bf Bump release numbers.
add 457fa57 Clean up.
add f5daf70 Fix tests which compare against the environment (#28)
add 96720ce Standardize on US spelling of "behavior".
add 3155433 Camel-case name.
add 3d997c9 Add element for the next release.
add 0768091 Name "Apache Commons" in page title.
add 6108d46 [CONFIGURATION-750] XMLPropertyListConfiguration cannot set arrays in the correct plist form.
add 2dffc1e Use HTTPS links to Apache.
add 8c06dd6 [CONFIGURATION-751] Update Apache Commons Text from 1.6 to 1.7.
add 2a34df1 Add Apache Commons Text lookups but don't override existing keys. This will allow future Apache Commons Text in future versions > 1.7 to kick in automatically. Currently the lookups are the same.
add de77ff7 Use HTTPS to access Apache resources.
add b455005 Replace SVN with GitBox URL.
add f3b9bb4 [CONFIGURATION-752] Update Apache Commons VFS from 2.3 to 2.4.
add 0b90200 Fix Javadoc for org.apache.commons.configuration2.PropertiesConfiguration.getIncludeOptional().
add 7a93bea Document "includeOptional" on the site.
add 29e616a Remove useless parens.
add 6bbd962 Fix the site's source repository link.
add 55d3122 Adding Power Support (#31)
add af66286 Sort members.
add 1931401 Sort members.
add 9bab62a Tests an interpolation that consists of a single undefined variable only with and without a default value.
add 03e1def Tests an interpolation that consists of a single undefined variable only with and without a default value.
add 6b2f23d Drop Oracle JDK 8, add OpenJDK 13.
add f766d10 [CONFIGURATION-752] Update Apache Commons VFS from 2.3 to 2.4.1.
add f0cf3df Remove useless parens.
add a0222b0 Remove useless parens.
add 6b671ea [CONFIGURATION-754] Update Apache Commons Text from 1.7 to 1.8.
add 96b3f4d [CONFIGURATION-754] Update Apache Commons Text from 1.7 to 1.8.
add 8858f93 Drop author tags of Apache Commons.
add 2f12936 Drop author tags of individuals.
add c876525 [CONFIGURATION-755][CVE-2014-0114] Update Apache Commons BeanUtils from 1.9.3 to 1.9.4.
add eaa3434 Use try-with-resources.
add d861304 Workaround OpenJDK 8 and 9 bug JDK-8177809.
add b284d1b Javadoc.
add acfc3ab Add support for GitHub Actions CI build.
add f236248 Fix syntax in user guide documentation #33
add 0685cef Fix syntax in user guide documentation #33.
add 0e29fbe [CONFIGURATION-757] Update org.yaml:snakeyaml from 1.24 to 1.25.
add 0432652 - Update tests from org.apache.commons:commons-dbcp2 2.6.0 to 2.7.0. - Update tests from org.apache.commons:commons-pool2 2.6.2 to 2.7.0.
add 23d73a4 [CONFIGURATION-758] Update commons-codec:commons-codec from 1.12 to 1.13.
add eaca4a3 Update tests from org.hsqldb:hsqldb 2.4.1 to 2.5.0.
add 2ec8f88 Update tests from com.sun.mail:mailapi 1.6.3 to 1.6.4.
add 72a29cc Adjust for different javadoc options between Java 8 and 11.
add 3f1069f [CONFIGURATION-759] Update Spring from 4.3.24.RELEASE to 4.3.25.RELEASE.
add 8b31196 [CONFIGURATION-756] Allow for custom behavior to handle errors loading included properties files. (#34)
add ab299c1 Build on pull_request.
add 6472d84 Don't need @SuppressWarnings("unchecked") anymore.
add e1ad77b Javadoc.
add a2586eb Better local var names.
add be4db73 Add comment about resource management.
add a396507 Javadoc.
add 94a964d Remove trailing white spaces on all lines.
add d3c40d7 [CONFIGURATION-760] Properties file using cyclical includes cause a StackOverflowError instead of detecting the misconfiguration. (#35)
add a749b0a Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-configuration
add 63386c8 Remove unnecessary parens in ternary expression tests.
add 1fc2c9c Remove unnecessary parens in ternary expression tests.
add a53f995 Use Objects.toString() instead of ternary expression.
add 5e007ee Update maven-checkstyle-plugin from 3.0.0 to 3.1.0.
add d59b561 Use current version of Checkstyle: 6.18 to 8.24.
add 88c71f5 Give lambdas more flexibility in formatting where { and } can be on the same line as aggreed on the dev ML.
add 63bb3e8 Convert to lambdas (no braces formatting restrictions.)
add 2872418 Be more quiet on the console during tests.
add 4a0e84e Prepare for 2.6.
add 1089a24 Prepare for 2.6.
add 7cab0cf [CONFIGURATION-756] Allow for custom behavior to handle errors loading included properties files.
add 1107466 Prepare for 2.6.
add 8fd927a Update POM version numbers for Apache Commons Configuration release 2.6
add 32d6be9 Prepare for 2.6.
add 8e3e85b Bump to next development version
No new revisions were added by this update.
Summary of changes:
.travis.yml => .github/workflows/maven.yml | 65 +-
.travis.yml | 7 +-
README.md | 4 +-
RELEASE-NOTES.txt | 107 +-
conf/checkstyle.xml | 9 +-
pom.xml | 1825 +++----
src/changes/changes.xml | 5098 ++++++++++----------
src/changes/release-notes.vm | 8 +-
.../configuration2/AbstractConfiguration.java | 29 +-
.../AbstractHierarchicalConfiguration.java | 4 +-
.../commons/configuration2/BaseConfiguration.java | 12 -
.../configuration2/BaseConfigurationXMLReader.java | 3 -
.../BaseHierarchicalConfiguration.java | 15 +-
.../configuration2/CombinedConfiguration.java | 4 +-
.../configuration2/CompositeConfiguration.java | 2 -
.../commons/configuration2/Configuration.java | 1 -
.../configuration2/ConfigurationComparator.java | 1 -
...nComparator.java => ConfigurationConsumer.java} | 24 +-
.../configuration2/ConfigurationConverter.java | 1 -
.../commons/configuration2/ConfigurationMap.java | 1 -
.../commons/configuration2/ConfigurationUtils.java | 15 +-
.../configuration2/ConfigurationXMLReader.java | 5 +-
.../commons/configuration2/DataConfiguration.java | 5 +-
.../configuration2/DatabaseConfiguration.java | 5 +-
.../configuration2/EnvironmentConfiguration.java | 1 -
.../HierarchicalConfigurationConverter.java | 2 -
.../HierarchicalConfigurationXMLReader.java | 2 +-
.../commons/configuration2/INIConfiguration.java | 5 +-
.../commons/configuration2/JNDIConfiguration.java | 1 -
.../commons/configuration2/MapConfiguration.java | 1 -
.../PatternSubtreeConfigurationWrapper.java | 3 -
.../configuration2/PrefixedKeysIterator.java | 2 -
.../configuration2/PropertiesConfiguration.java | 204 +-
.../PropertiesConfigurationLayout.java | 15 +-
.../StrictConfigurationComparator.java | 2 -
.../configuration2/SubnodeConfiguration.java | 2 +-
.../configuration2/SubsetConfiguration.java | 3 +-
.../configuration2/SystemConfiguration.java | 1 -
.../commons/configuration2/XMLConfiguration.java | 13 +-
.../configuration2/XMLPropertiesConfiguration.java | 16 +-
.../configuration2/beanutils/BeanDeclaration.java | 3 -
.../configuration2/beanutils/BeanFactory.java | 3 -
.../configuration2/beanutils/BeanHelper.java | 2 +-
.../beanutils/ConfigurationDynaBean.java | 3 +-
.../beanutils/ConfigurationDynaClass.java | 1 -
.../beanutils/DefaultBeanFactory.java | 2 +-
.../builder/BasicConfigurationBuilder.java | 2 +-
.../BuilderConfigurationWrapperFactory.java | 2 +-
.../builder/DefaultReloadingDetectorFactory.java | 2 +-
.../builder/FileBasedBuilderParametersImpl.java | 2 +-
.../builder/FileBasedConfigurationBuilder.java | 4 +-
.../builder/PropertiesBuilderParametersImpl.java | 15 +-
.../builder/PropertiesBuilderProperties.java | 14 +
.../ReloadingFileBasedConfigurationBuilder.java | 4 +-
.../combined/CombinedConfigurationBuilder.java | 35 +-
.../builder/combined/ConfigurationDeclaration.java | 2 +-
.../FileExtensionConfigurationBuilderProvider.java | 2 +-
.../combined/MultiFileConfigurationBuilder.java | 9 +-
.../builder/fluent/Configurations.java | 46 +-
.../configuration2/builder/fluent/Parameters.java | 2 +-
.../convert/AbstractListDelimiterHandler.java | 2 +-
.../convert/DefaultConversionHandler.java | 4 +-
.../convert/ListDelimiterHandler.java | 9 +-
.../configuration2/convert/PropertyConverter.java | 9 +-
.../configuration2/event/EventListenerList.java | 9 +-
.../configuration2/ex/ConfigurationException.java | 1 -
.../ex/ConfigurationRuntimeException.java | 1 -
.../configuration2/ex/ConversionException.java | 1 -
.../interpol/ConfigurationInterpolator.java | 33 +-
.../configuration2/interpol/ConstantLookup.java | 5 +-
.../configuration2/interpol/DefaultLookups.java | 7 +
.../configuration2/interpol/EnvironmentLookup.java | 3 -
.../configuration2/interpol/ExprLookup.java | 15 +-
.../configuration2/io/DefaultFileSystem.java | 4 -
.../commons/configuration2/io/FileHandler.java | 4 +-
.../commons/configuration2/io/FileLocator.java | 2 +-
.../configuration2/io/FileLocatorUtils.java | 8 +-
.../configuration2/io/FileOptionsProvider.java | 2 -
.../commons/configuration2/io/FileSystem.java | 4 +-
.../commons/configuration2/io/FileUtils.java | 6 +-
.../io/HomeDirectoryLocationStrategy.java | 2 +-
.../commons/configuration2/io/VFSFileSystem.java | 14 +-
.../plist/PropertyListConfiguration.java | 3 +-
.../plist/XMLPropertyListConfiguration.java | 42 +-
.../reloading/FileHandlerReloadingDetector.java | 6 +-
.../reloading/ManagedReloadingDetector.java | 1 -
.../reloading/ManagedReloadingDetectorMBean.java | 1 -
.../reloading/PeriodicReloadingTrigger.java | 11 +-
.../reloading/VFSFileHandlerReloadingDetector.java | 5 +-
.../configuration2/resolver/CatalogResolver.java | 84 +-
.../resolver/DefaultEntityResolver.java | 3 -
.../configuration2/resolver/EntityRegistry.java | 3 -
.../resolver/EntityResolverSupport.java | 2 -
.../spring/ConfigurationPropertiesFactoryBean.java | 4 +-
.../configuration2/sync/ReadWriteSynchronizer.java | 2 +-
.../tree/DefaultConfigurationKey.java | 7 +-
.../tree/DefaultExpressionEngine.java | 5 +-
.../configuration2/tree/InMemoryNodeModel.java | 228 +-
.../configuration2/tree/ModelTransaction.java | 20 +-
.../commons/configuration2/tree/NodeSelector.java | 2 +-
.../commons/configuration2/tree/NodeTracker.java | 6 +-
.../configuration2/tree/OverrideCombiner.java | 2 +-
.../configuration2/tree/ReferenceTracker.java | 2 +-
.../configuration2/tree/TrackedNodeModel.java | 2 +-
.../xpath/ConfigurationNodeIteratorAttribute.java | 2 +-
.../tree/xpath/ConfigurationNodeIteratorBase.java | 2 +-
.../tree/xpath/XPathExpressionEngine.java | 2 +-
.../configuration2/web/AppletConfiguration.java | 1 -
.../configuration2/web/BaseWebConfiguration.java | 3 -
.../configuration2/web/ServletConfiguration.java | 1 -
.../web/ServletContextConfiguration.java | 1 -
.../web/ServletFilterConfiguration.java | 1 -
.../web/ServletRequestConfiguration.java | 1 -
src/site/site.xml | 4 +-
src/site/xdoc/download_configuration.xml | 34 +-
src/site/xdoc/index.xml | 6 +-
src/site/xdoc/userguide/howto_basicfeatures.xml | 6 +-
src/site/xdoc/userguide/howto_combinedbuilder.xml | 4 +-
src/site/xdoc/userguide/howto_filebased.xml | 2 +-
src/site/xdoc/userguide/howto_hierarchical.xml | 2 +-
src/site/xdoc/userguide/howto_properties.xml | 37 +-
src/site/xdoc/userguide/howto_xml.xml | 8 +-
src/site/xdoc/userguide/upgradeto2_0.xml | 2 +-
.../xdoc/userguide_v1.10/howto_basicfeatures.xml | 4 +-
.../userguide_v1.10/howto_configurationbuilder.xml | 4 +-
.../xdoc/userguide_v1.10/howto_filesystems.xml | 2 +-
src/site/xdoc/userguide_v1.10/howto_xml.xml | 10 +-
.../configuration2/ConfigurationAssert.java | 1 -
.../DatabaseConfigurationTestHelper.java | 2 +-
.../configuration2/FileURLStreamHandler.java | 1 -
.../configuration2/InterpolationTestHelper.java | 14 +-
.../configuration2/MockInitialContextFactory.java | 6 +-
.../configuration2/TestAbstractConfiguration.java | 1 -
.../TestAbstractHierarchicalConfiguration.java | 2 +-
.../configuration2/TestConfigurationConverter.java | 14 +-
.../configuration2/TestConfigurationMap.java | 1 -
.../configuration2/TestConfigurationSet.java | 1 -
.../configuration2/TestDataConfiguration.java | 1 -
.../TestEnvironmentConfiguration.java | 4 -
...tEqualBehaviour.java => TestEqualBehavior.java} | 2 +-
.../TestHierarchicalXMLConfiguration.java | 2 -
.../configuration2/TestMapConfiguration.java | 1 -
.../TestPropertiesConfiguration.java | 166 +-
.../TestPropertiesConfigurationLayout.java | 10 +-
.../configuration2/TestSubnodeConfiguration.java | 10 +-
.../configuration2/TestSubsetConfiguration.java | 11 +-
.../configuration2/TestSystemConfiguration.java | 1 -
.../configuration2/TestXMLConfiguration.java | 2 +-
.../TestXMLPropertiesConfiguration.java | 13 +-
.../configuration2/beanutils/TestBeanHelper.java | 3 -
.../beanutils/TestConfigurationDynaBean.java | 1 -
.../TestConfigurationDynaBeanXMLConfig.java | 3 -
.../beanutils/TestDefaultBeanFactory.java | 3 -
.../beanutils/TestXMLBeanDeclaration.java | 3 -
.../TestBasicConfigurationBuilderEvents.java | 10 +-
.../builder/TestDefaultParametersManager.java | 18 +-
.../TestPropertiesBuilderParametersImpl.java | 43 +-
.../combined/TestCombinedConfigurationBuilder.java | 20 +-
.../combined/TestConfigurationDeclaration.java | 2 +-
...adingCombinedConfigurationBuilderFileBased.java | 27 +-
.../builder/fluent/TestConfigurations.java | 105 +-
.../builder/fluent/TestParameters.java | 29 +-
.../convert/TestDefaultListDelimiterHandler.java | 9 +-
.../convert/TestPropertyConverter.java | 1 -
.../event/TestEventListenerList.java | 7 +-
.../interpol/TestConfigurationInterpolator.java | 628 +--
.../interpol/TestConstantLookup.java | 94 +-
.../interpol/TestEnvironmentLookup.java | 17 +-
.../configuration2/interpol/TestExprLookup.java | 94 +-
.../interpol/TestInterpolatorSpecification.java | 198 +-
.../commons/configuration2/io/TestFileHandler.java | 8 +-
.../plist/TestPropertyListConfiguration.java | 3 +-
.../plist/TestPropertyListParser.java | 1 -
.../plist/TestXMLPropertyListConfiguration.java | 39 +-
.../reloading/TestManagedReloadingDetector.java | 1 -
.../reloading/TestPeriodicReloadingTrigger.java | 14 +-
.../reloading/TestReloadingController.java | 12 +-
.../TestVFSFileHandlerReloadingDetector.java | 17 +-
.../apache/commons/configuration2/test/HsqlDB.java | 1 -
.../configuration2/tree/NodeStructureHelper.java | 45 +-
.../tree/TestDefaultConfigurationKey.java | 1 -
.../tree/TestDefaultExpressionEngine.java | 4 -
.../configuration2/tree/TestInMemoryNodeModel.java | 34 +-
.../tree/TestInMemoryNodeModelTrackedNodes.java | 39 +-
.../tree/xpath/AbstractXPathTest.java | 4 +-
.../web/TestAppletConfiguration.java | 1 -
.../web/TestServletConfiguration.java | 1 -
.../web/TestServletContextConfiguration.java | 1 -
.../web/TestServletFilterConfiguration.java | 1 -
.../web/TestServletRequestConfiguration.java | 1 -
src/test/resources/catalog.xml | 2 +-
src/test/resources/catalog2.xml | 2 +-
...es => include-cyclical-back-to-root.properties} | 3 +-
...rties => include-cyclical-reference.properties} | 3 +-
...properties => include-cyclical-root.properties} | 3 +-
...properties => include-cyclical-step.properties} | 3 +-
... include-include-cyclical-reference.properties} | 3 +-
...erties => include-include-not-found.properties} | 3 +-
...roperties => include-load-exception.properties} | 3 +-
...ude.properties => include-not-found.properties} | 3 +-
src/test/resources/sample.xml | 4 +-
src/test/resources/sample.xsd | 4 +-
src/test/resources/sample_1001.xml | 4 +-
src/test/resources/testMultiConfiguration_2001.xml | 2 +-
src/test/resources/testMultiConfiguration_2002.xml | 2 +-
src/test/resources/testMultiConfiguration_3001.xml | 2 +-
src/test/resources/testMultiConfiguration_3002.xml | 2 +-
.../resources/testMultiConfiguration_default.xml | 2 +-
src/test/resources/testMultiDynamic_default.xml | 2 +-
src/test/resources/testMultiDynamic_default2.xml | 2 +-
210 files changed, 5251 insertions(+), 5015 deletions(-)
copy .travis.yml => .github/workflows/maven.yml (53%)
copy src/main/java/org/apache/commons/configuration2/{ConfigurationComparator.java => ConfigurationConsumer.java} (63%)
rename src/test/java/org/apache/commons/configuration2/{TestEqualBehaviour.java => TestEqualBehavior.java} (99%)
copy src/test/resources/{config/deep/deepinclude.properties => include-cyclical-back-to-root.properties} (91%)
copy src/test/resources/{config/deep/deepinclude.properties => include-cyclical-reference.properties} (90%)
copy src/test/resources/{config/deep/deepinclude.properties => include-cyclical-root.properties} (91%)
copy src/test/resources/{config/deep/deepinclude.properties => include-cyclical-step.properties} (90%)
copy src/test/resources/{config/deep/deepinclude.properties => include-include-cyclical-reference.properties} (90%)
copy src/test/resources/{config/deep/deepinclude.properties => include-include-not-found.properties} (93%)
copy src/test/resources/{config/deep/deepinclude.properties => include-load-exception.properties} (91%)
copy src/test/resources/{config/deep/deepinclude.properties => include-not-found.properties} (92%)