aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2023-12-06 13:47:09 +0300
committerGravatar Vitaly Takmazov2023-12-06 13:47:51 +0300
commit151039990178401973f7cc745590a3fe14740ba6 (patch)
treef0517dcf7c0796b44bdb9e0375f8672eb074596a
parentdff2f505ec0946e3487dbaee0ef11cd113b28af6 (diff)
Move autoconfiguration exclusions to the default configuration
-rw-r--r--src/main/java/com/juick/API.java5
-rw-r--r--src/main/resources/application.properties1
2 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/com/juick/API.java b/src/main/java/com/juick/API.java
index 755e4fc4..bc82bb21 100644
--- a/src/main/java/com/juick/API.java
+++ b/src/main/java/com/juick/API.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2008-2020, Juick
+ * Copyright (C) 2008-2023, Juick
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
@@ -18,14 +18,11 @@
package com.juick;
import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.mail.MailSenderAutoConfiguration;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.ComponentScan;
@SpringBootApplication
-@EnableAutoConfiguration(exclude = { MailSenderAutoConfiguration.class })
@EnableCaching
@ComponentScan(basePackages = {"com.juick.config", "com.juick.service", "com.juick.www"})
public class API {
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e2aaa103..0ce5b76a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,4 +1,5 @@
logging.level.root=INFO
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.JndiDataSourceAutoConfiguration,org.springframework.boot.autoconfigure.mail.MailSenderAutoConfiguration
server.servlet.session.tracking-modes=cookie
spring.mvc.pathmatch.matching-strategy=ant-path-matcher
spring.jackson.default-property-inclusion=non-default