XNAT-2429 Fixed issue where initializer still loaded plugins into

application context, moving it back into root. Updated
gradle-git-version plugin.

build.gradle

@@ -41,7 +41,7 @@ buildscript {
     dependencies {
         classpath "com.bmuschko:gradle-cargo-plugin:2.2.2"
         classpath "com.bmuschko:gradle-tomcat-plugin:2.2.4"
-        classpath "gradle.plugin.com.palantir.gradle.gitversion:gradle-git-version:0.5.1"
+        classpath "gradle.plugin.com.palantir.gradle.gitversion:gradle-git-version:0.5.2"
     }
 }
 

src/main/java/org/nrg/xnat/initialization/XnatWebAppInitializer.java

@@ -69,15 +69,15 @@ public class XnatWebAppInitializer extends AbstractAnnotationConfigDispatcherSer
 
     @Override
     protected Class<?>[] getRootConfigClasses() {
-        return new Class<?>[]{RootConfig.class};
+        final List<Class<?>> configClasses = new ArrayList<>();
+        configClasses.add(RootConfig.class);
+        configClasses.addAll(getPluginConfigs());
+        return configClasses.toArray(new Class[configClasses.size()]);
     }
 
     @Override
     protected Class<?>[] getServletConfigClasses() {
-        final List<Class<?>> configClasses = new ArrayList<>();
-        // configClasses.add(ApplicationConfig.class);
-        configClasses.addAll(getPluginConfigs());
-        return configClasses.toArray(new Class[configClasses.size()]);
+        return new Class[0];
     }
 
     @Override
@@ -117,6 +117,9 @@ public class XnatWebAppInitializer extends AbstractAnnotationConfigDispatcherSer
         final List<Class<?>> configs = new ArrayList<>();
         try {
             for (final XnatPluginBean plugin : XnatPluginBean.findAllXnatPluginBeans()) {
+                if (_log.isInfoEnabled()) {
+                    _log.info("Found plugin {} {}: {}", plugin.getId(), plugin.getName(), plugin.getDescription());
+                }
                 configs.add(Class.forName(plugin.getPluginClass()));
             }
         } catch (IOException e) {
@@ -125,6 +128,10 @@ public class XnatWebAppInitializer extends AbstractAnnotationConfigDispatcherSer
             _log.error("Did not find a class specified in a plugin definition.", e);
         }
 
+        if (_log.isInfoEnabled()) {
+            _log.info("Found a total of {} plugins", configs.size());
+        }
+
         return configs;
     }