hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-3872] Move exlcusion of Spring's Velocity autoconfig to where the others are.

Browse Source
This commit is contained in:
Mark H. Wood
2019-06-24 17:15:41 -04:00
parent 17daf04f21
commit 03377c24bd
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-spring-rest/src/main/java/org/dspace/app/rest/Application.java
View File

@@ -48,7 +48,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
* @author Andrea Bollini (andrea.bollini at 4science.it) * @author Andrea Bollini (andrea.bollini at 4science.it)
* @author Tim Donohue * @author Tim Donohue
*/ */
@SpringBootApplication(exclude = VelocityAutoConfiguration.class) @SpringBootApplication
public class Application extends SpringBootServletInitializer { public class Application extends SpringBootServletInitializer {
private static final Logger log = LoggerFactory.getLogger(Application.class); private static final Logger log = LoggerFactory.getLogger(Application.class);

4
dspace-spring-rest/src/main/resources/application.properties
View File

@@ -85,12 +85,14 @@ server.error.include-stacktrace = always
# * HibernateJpaAutoConfiguration (Hibernate ORM) # * HibernateJpaAutoConfiguration (Hibernate ORM)
# * FlywayAutoConfiguration (Flyway migrations) # * FlywayAutoConfiguration (Flyway migrations)
# * SolrAutoConfiguration (Solr) # * SolrAutoConfiguration (Solr)
# * Velocity (email templating)
# #
# TODO: At some point we may want to investigate whether we can re-enable these and remove the custom DSpace init code # TODO: At some point we may want to investigate whether we can re-enable these and remove the custom DSpace init code
spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, \ spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, \
org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, \ org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, \
org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration, \ org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration, \
org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration, \
org.springframework.boot.autoconfigure.velocity.VelocityAutoConfiguration
######################### #########################
# Spring Boot Logging levels # Spring Boot Logging levels