diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2019-12-12 18:34:11 +0100 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2019-12-12 18:34:11 +0100 |
| commit | af5745356b2b6643526ff6d9ea93bfecb71b0eed (patch) | |
| tree | 5fcb008e2d2247ddeb865dcef53be9915cec8ef8 /archiva-modules/archiva-web/archiva-webapp | |
| parent | fce356b5938935871c6f3de4b4e65223827a604e (diff) | |
| download | archiva-af5745356b2b6643526ff6d9ea93bfecb71b0eed.tar.gz archiva-af5745356b2b6643526ff6d9ea93bfecb71b0eed.zip | |
Adapting to component registry changes. Updating to commons configuration 2.
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 4 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index a8629e875..628996f31 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -132,8 +132,8 @@ </dependency> <dependency> - <groupId>commons-configuration</groupId> - <artifactId>commons-configuration</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-configuration2</artifactId> <exclusions> <exclusion> <groupId>commons-beanutils</groupId> diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml index 3699f53ef..62bb38764 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml @@ -71,7 +71,7 @@ <!-- START SNIPPET: configuration-files-list --> <bean name="commons-configuration" class="org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry" init-method="initialize"> - <property name="properties"> + <property name="initialConfiguration"> <value> <![CDATA[ <configuration> |