Merge pull request DSpace#11813 from MMilosz/chore-remove-commons-configuration2-workaround

Remove obsolete `DSpaceConfigurationPropertySource` workaround (commons-configuration2)

Author: tdonohue

dspace-api/src/test/java/org/dspace/util/DSpaceConfigurationInitializer.java

@@ -8,7 +8,7 @@
 package org.dspace.util;
 
 import org.apache.commons.configuration2.Configuration;
-import org.dspace.servicemanager.config.DSpaceConfigurationPropertySource;
+import org.apache.commons.configuration2.spring.ConfigurationPropertySource;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.springframework.context.ApplicationContextInitializer;
@@ -38,8 +38,8 @@ public void initialize(final ConfigurableApplicationContext applicationContext)
         Configuration configuration = configurationService.getConfiguration();
 
         // Create an Apache Commons Configuration Property Source from our configuration
-        DSpaceConfigurationPropertySource apacheCommonsConfigPropertySource =
-            new DSpaceConfigurationPropertySource(configuration.getClass().getName(), configuration);
+        ConfigurationPropertySource apacheCommonsConfigPropertySource =
+            new ConfigurationPropertySource(configuration.getClass().getName(), configuration);
 
         // Prepend it to the Environment's list of PropertySources
         // NOTE: This is added *first* in the list so that settings in DSpace's

dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceConfigurationInitializer.java

@@ -8,7 +8,7 @@
 package org.dspace.app.rest.utils;
 
 import org.apache.commons.configuration2.Configuration;
-import org.dspace.servicemanager.config.DSpaceConfigurationPropertySource;
+import org.apache.commons.configuration2.spring.ConfigurationPropertySource;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.springframework.context.ApplicationContextInitializer;
@@ -34,8 +34,8 @@ public void initialize(final ConfigurableApplicationContext applicationContext)
         Configuration configuration = configurationService.getConfiguration();
 
         // Create an Apache Commons Configuration Property Source from our configuration
-        DSpaceConfigurationPropertySource apacheCommonsConfigPropertySource =
-            new DSpaceConfigurationPropertySource(configuration.getClass().getName(), configuration);
+        ConfigurationPropertySource apacheCommonsConfigPropertySource =
+            new ConfigurationPropertySource(configuration.getClass().getName(), configuration);
 
         // Prepend it to the Environment's list of PropertySources
         // NOTE: This is added *first* in the list so that settings in DSpace's ConfigurationService *override*

dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationPlaceholderConfigurer.java

@@ -8,6 +8,7 @@
 package org.dspace.servicemanager.config;
 
 import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.spring.ConfigurationPropertySource;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.env.MutablePropertySources;
 
@@ -26,8 +27,8 @@
 public class DSpaceConfigurationPlaceholderConfigurer extends PropertySourcesPlaceholderConfigurer {
 
     public DSpaceConfigurationPlaceholderConfigurer(Configuration configuration) {
-        DSpaceConfigurationPropertySource apacheCommonsConfigPropertySource =
-            new DSpaceConfigurationPropertySource(configuration.getClass().getName(), configuration);
+        ConfigurationPropertySource apacheCommonsConfigPropertySource =
+            new ConfigurationPropertySource(configuration.getClass().getName(), configuration);
         MutablePropertySources propertySources = new MutablePropertySources();
         propertySources.addLast(apacheCommonsConfigPropertySource);
         setPropertySources(propertySources);

dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationPropertySource.java

@@ -451,8 +451,6 @@
                     <!-- Add some default DSpace exclusions not covered by <useDefaultExcludes>
                          Individual Maven projects may choose to override these defaults. -->
                     <excludes>
-						<!-- temporary copy of a modified apache commons-configuration2 class, see https://issues.apache.org/jira/browse/CONFIGURATION-846 -->
-                        <exclude>**/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationPropertySource.java</exclude>
                         <exclude>**/src/test/resources/**</exclude>
                         <exclude>**/src/test/data/**</exclude>
                         <exclude>**/src/main/license/**</exclude>