Prep work for spring boot test

- Added enforcer plugin
- Fix some version conflicts
- Moved custom initializer to spring.factories
- Bump spring boot version

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
This commit is contained in:
Andrew DeMaria
2017-08-20 20:15:24 -06:00
parent 753d76e0fe
commit 7d4ca2ffe2
7 changed files with 54 additions and 24 deletions
@@ -1,8 +1,7 @@
package org.airsonic.player.boot;
package org.airsonic.player;
import net.sf.ehcache.constructs.web.ShutdownListener;
import org.airsonic.player.filter.*;
import org.airsonic.player.spring.CustomPropertySourceConfigurer;
import org.directwebremoting.servlet.DwrServlet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -180,7 +179,7 @@ public class Application extends SpringBootServletInitializer implements Embedde
// Customize the application or call application.sources(...) to add sources
// Since our example is itself a @Configuration class (via @SpringBootApplication)
// we actually don't need to override this method.
return application.sources(Application.class).web(true).initializers(new CustomPropertySourceConfigurer());
return application.sources(Application.class).web(true);
}
@Override
@@ -1,4 +1,4 @@
package org.airsonic.player.boot;
package org.airsonic.player;
import org.apache.catalina.Container;
import org.apache.catalina.Wrapper;
@@ -1,3 +1,6 @@
org.springframework.context.ApplicationListener=\
org.airsonic.player.spring.LoggingFileOverrideListener,\
org.airsonic.player.security.LoginFailureListener
org.springframework.context.ApplicationContextInitializer=\
org.airsonic.player.spring.CustomPropertySourceConfigurer