From 9867c73aedb969f7b159915e57fb5800cce63a58 Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Tue, 29 Oct 2019 09:32:43 +0100 Subject: [PATCH] WIP: Spring-Upgrade auf 2.2.0 --- pom.xml | 11 +++++++++-- .../errors/FacebookErrorsOAuth2AutoConfiguration.java | 5 ++++- .../FacebookErrorsSpringSocialAutoConfiguration.java | 5 ++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c5088ff..3a8720d 100644 --- a/pom.xml +++ b/pom.xml @@ -58,12 +58,18 @@ https://oss.sonatype.org/content/repositories/snapshots/ + 2.0.3.RELEASE + + + org.springframework.security + spring-security-oauth2-client + org.springframework spring-webmvc @@ -74,8 +80,9 @@ true - org.springframework.security - spring-security-oauth2-client + org.springframework.social + spring-social-facebook + ${spring-social-facebook.version} true diff --git a/src/main/java/de/juplo/facebook/errors/FacebookErrorsOAuth2AutoConfiguration.java b/src/main/java/de/juplo/facebook/errors/FacebookErrorsOAuth2AutoConfiguration.java index c1647fc..082b0d6 100644 --- a/src/main/java/de/juplo/facebook/errors/FacebookErrorsOAuth2AutoConfiguration.java +++ b/src/main/java/de/juplo/facebook/errors/FacebookErrorsOAuth2AutoConfiguration.java @@ -7,9 +7,12 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; +import org.springframework.boot.autoconfigure.security.oauth2.OAuth2AutoConfiguration; +import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.oauth2.client.OAuth2RestTemplate; +import org.springframework.security.oauth2.client.http.OAuth2ErrorHandler; /** diff --git a/src/main/java/de/juplo/facebook/errors/FacebookErrorsSpringSocialAutoConfiguration.java b/src/main/java/de/juplo/facebook/errors/FacebookErrorsSpringSocialAutoConfiguration.java index 0e542c1..49a3101 100644 --- a/src/main/java/de/juplo/facebook/errors/FacebookErrorsSpringSocialAutoConfiguration.java +++ b/src/main/java/de/juplo/facebook/errors/FacebookErrorsSpringSocialAutoConfiguration.java @@ -12,9 +12,12 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; +import org.springframework.boot.autoconfigure.social.FacebookAutoConfiguration; +import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.social.facebook.api.Facebook; +import org.springframework.social.facebook.api.impl.FacebookTemplate; import org.springframework.web.client.ResponseErrorHandler; import org.springframework.web.client.RestTemplate; -- 2.20.1