Merge pull request #14976 from alvin577austria/JAVA-23238

Java 23238 : Upgrade spring-cloud-security to JDK 17
This commit is contained in:
Kasra Madadipouya 2023-10-22 17:30:27 +02:00 committed by GitHub
commit 225f82e50b
6 changed files with 41 additions and 4 deletions

View File

@ -727,6 +727,7 @@
<module>spring-cloud-modules/spring-cloud-data-flow</module> <module>spring-cloud-modules/spring-cloud-data-flow</module>
<module>spring-cloud-modules/spring-cloud-eureka</module> <module>spring-cloud-modules/spring-cloud-eureka</module>
<module>spring-cloud-modules/spring-cloud-netflix-feign</module> <module>spring-cloud-modules/spring-cloud-netflix-feign</module>
<module>spring-cloud-modules/spring-cloud-security</module>
<module>spring-cloud-modules/spring-cloud-stream-starters</module> <module>spring-cloud-modules/spring-cloud-stream-starters</module>
<module>spring-cloud-modules/spring-cloud-zuul-eureka-integration</module> <module>spring-cloud-modules/spring-cloud-zuul-eureka-integration</module>
@ -1005,6 +1006,7 @@
<module>spring-cloud-modules/spring-cloud-data-flow</module> <module>spring-cloud-modules/spring-cloud-data-flow</module>
<module>spring-cloud-modules/spring-cloud-netflix-feign</module> <module>spring-cloud-modules/spring-cloud-netflix-feign</module>
<module>spring-cloud-modules/spring-cloud-stream-starters</module> <module>spring-cloud-modules/spring-cloud-stream-starters</module>
<module>spring-cloud-modules/spring-cloud-security</module>
<module>spring-cloud-modules/spring-cloud-zuul-eureka-integration</module> <module>spring-cloud-modules/spring-cloud-zuul-eureka-integration</module>
<module>spring-exceptions</module> <module>spring-exceptions</module>

View File

@ -39,7 +39,7 @@
<module>spring-cloud-archaius</module> <module>spring-cloud-archaius</module>
<module>spring-cloud-functions</module> <module>spring-cloud-functions</module>
<module>spring-cloud-vault</module> <module>spring-cloud-vault</module>
<module>spring-cloud-security</module> <!-- <module>spring-cloud-security</module>-->
<module>spring-cloud-task</module> <module>spring-cloud-task</module>
<module>spring-cloud-zuul</module> <module>spring-cloud-zuul</module>
<module>spring-cloud-zuul-fallback</module> <module>spring-cloud-zuul-fallback</module>

View File

@ -1,12 +1,13 @@
package com.baeldung.filters; package com.baeldung.filters;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.netflix.zuul.context.RequestContext;
import com.netflix.zuul.ZuulFilter;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.netflix.zuul.ZuulFilter;
import com.netflix.zuul.context.RequestContext;
public class SimpleFilter extends ZuulFilter { public class SimpleFilter extends ZuulFilter {
private static Logger log = LoggerFactory.getLogger(SimpleFilter.class); private static Logger log = LoggerFactory.getLogger(SimpleFilter.class);
@ -31,7 +32,8 @@ public class SimpleFilter extends ZuulFilter {
RequestContext ctx = RequestContext.getCurrentContext(); RequestContext ctx = RequestContext.getCurrentContext();
HttpServletRequest request = ctx.getRequest(); HttpServletRequest request = ctx.getRequest();
log.info(String.format("%s request to %s", request.getMethod(), request.getRequestURL().toString())); log.info(String.format("%s request to %s", request.getMethod(), request.getRequestURL()
.toString()));
return null; return null;
} }

View File

@ -33,6 +33,21 @@
<artifactId>spring-security-jwt</artifactId> <artifactId>spring-security-jwt</artifactId>
<version>${spring-jwt.version}</version> <version>${spring-jwt.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${jaxb-core.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-impl.version}</version>
</dependency>
</dependencies> </dependencies>
<build> <build>

View File

@ -35,6 +35,21 @@
<groupId>org.springframework.security.oauth.boot</groupId> <groupId>org.springframework.security.oauth.boot</groupId>
<artifactId>spring-security-oauth2-autoconfigure</artifactId> <artifactId>spring-security-oauth2-autoconfigure</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>${jaxb-core.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-impl.version}</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -34,6 +34,9 @@
<properties> <properties>
<spring-cloud-dependencies.version>2021.0.3</spring-cloud-dependencies.version> <spring-cloud-dependencies.version>2021.0.3</spring-cloud-dependencies.version>
<jaxb-core.version>2.3.0.1</jaxb-core.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<jaxb-impl.version>2.3.1</jaxb-impl.version>
</properties> </properties>
</project> </project>