Disable Solr autoconfiguration in Spring Boot. Minor config cleanup

This commit is contained in:
Tim Donohue
2018-10-24 09:23:09 -05:00
committed by Mark H. Wood
parent ece64480a0
commit 5e78f408f3

View File

@@ -86,26 +86,23 @@ server.context-parameters.dspace.dir=${dspace.dir}
# Error handling settings
# Always include the fullstacktrace in error pages
# (Our Error page hides this stacktrace so it only is visible in HTML source)
# Can be set to "never" if you don't want it.
server.error.include-stacktrace = always
######################
# Spring Boot Autoconfigure
#
# DISABLE a few autoconfiguration scripts, as DSpace configures these already
# DISABLE a few autoconfiguration scripts, as DSpace initializes/configures these already
# * DataSourceAutoConfiguration (DB connection / datasource)
# * FlywayAutoConfiguration (Flyway migrations)
# * HibernateJpaAutoConfiguration (Hibernate)
# * SolrAutoConfiguration (Solr)
#
# TODO: If we go with Spring boot, we should investigate whether it's worth
# re-enabling these and removing the custom DSpace initialization code
#spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, \
# org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration, \
# org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration
# 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, \
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
#########################
# Spring Boot Logging levels