Skip to content

Commit bd9e387

Browse files
jzheauxrwinch
jzheaux
authored and
rwinch
committed
JDK 10 Compatibility
Upgrading dependencies and reconfiguring PowerMock Issue: gh-5860
1 parent 5250769 commit bd9e387

8 files changed

+60
-34
lines changed

‎config/src/test/java/org/springframework/security/config/SecurityNamespaceHandlerTests.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,31 @@
1515
*/
1616
package org.springframework.security.config;
1717

18-
import static org.assertj.core.api.Assertions.*;
19-
import static org.mockito.Matchers.*;
20-
import static org.powermock.api.mockito.PowerMockito.*;
21-
2218
import org.apache.commons.logging.Log;
2319
import org.junit.Rule;
2420
import org.junit.Test;
2521
import org.junit.rules.ExpectedException;
2622
import org.junit.runner.RunWith;
23+
import org.powermock.core.classloader.annotations.PowerMockIgnore;
2724
import org.powermock.core.classloader.annotations.PrepareForTest;
2825
import org.powermock.modules.junit4.PowerMockRunner;
26+
2927
import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
3028
import org.springframework.messaging.Message;
3129
import org.springframework.security.config.util.InMemoryXmlApplicationContext;
3230
import org.springframework.test.util.ReflectionTestUtils;
3331
import org.springframework.util.ClassUtils;
3432

33+
import static org.assertj.core.api.Assertions.assertThat;
34+
import static org.assertj.core.api.Assertions.fail;
35+
import static org.mockito.Matchers.any;
36+
import static org.mockito.Matchers.eq;
37+
import static org.powermock.api.mockito.PowerMockito.doThrow;
38+
import static org.powermock.api.mockito.PowerMockito.mock;
39+
import static org.powermock.api.mockito.PowerMockito.spy;
40+
import static org.powermock.api.mockito.PowerMockito.verifyStatic;
41+
import static org.powermock.api.mockito.PowerMockito.verifyZeroInteractions;
42+
3543
/**
3644
*
3745
* @author Luke Taylor
@@ -40,6 +48,7 @@
4048
*/
4149
@RunWith(PowerMockRunner.class)
4250
@PrepareForTest({ ClassUtils.class })
51+
@PowerMockIgnore({ "org.w3c.dom.*", "org.xml.sax.*", "org.apache.xerces.*", "javax.xml.parsers.*" })
4352
public class SecurityNamespaceHandlerTests {
4453
@Rule
4554
public ExpectedException thrown = ExpectedException.none();

‎config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterPowermockTests.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@
1515
*/
1616
package org.springframework.security.config.annotation.web;
1717

18-
import static org.assertj.core.api.Assertions.assertThat;
19-
import static org.powermock.api.mockito.PowerMockito.*;
20-
2118
import java.util.Arrays;
2219

2320
import org.junit.After;
2421
import org.junit.Test;
2522
import org.junit.runner.RunWith;
23+
import org.powermock.core.classloader.annotations.PowerMockIgnore;
2624
import org.powermock.core.classloader.annotations.PrepareForTest;
2725
import org.powermock.modules.junit4.PowerMockRunner;
26+
2827
import org.springframework.core.io.support.SpringFactoriesLoader;
2928
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
3029
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
@@ -33,13 +32,18 @@
3332
import org.springframework.web.context.ConfigurableWebApplicationContext;
3433
import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
3534

35+
import static org.assertj.core.api.Assertions.assertThat;
36+
import static org.powermock.api.mockito.PowerMockito.spy;
37+
import static org.powermock.api.mockito.PowerMockito.when;
38+
3639
/**
3740
*
3841
* @author Rob Winch
3942
*
4043
*/
4144
@RunWith(PowerMockRunner.class)
4245
@PrepareForTest({ SpringFactoriesLoader.class })
46+
@PowerMockIgnore({ "org.w3c.dom.*", "org.xml.sax.*", "org.apache.xerces.*", "javax.xml.parsers.*" })
4347
public class WebSecurityConfigurerAdapterPowermockTests {
4448
ConfigurableWebApplicationContext context;
4549

‎config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterTests.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,22 @@
1515
*/
1616
package org.springframework.security.config.annotation.web;
1717

18+
import java.io.IOException;
19+
import java.util.ArrayList;
20+
import java.util.List;
21+
import javax.servlet.FilterChain;
22+
import javax.servlet.ServletException;
23+
import javax.servlet.http.HttpServletRequest;
24+
import javax.servlet.http.HttpServletResponse;
25+
1826
import org.junit.Rule;
1927
import org.junit.Test;
2028
import org.junit.runner.RunWith;
2129
import org.mockito.ArgumentCaptor;
30+
import org.powermock.core.classloader.annotations.PowerMockIgnore;
2231
import org.powermock.core.classloader.annotations.PrepareForTest;
2332
import org.powermock.modules.junit4.PowerMockRunner;
33+
2434
import org.springframework.beans.factory.annotation.Autowired;
2535
import org.springframework.context.ApplicationContext;
2636
import org.springframework.context.ApplicationListener;
@@ -48,14 +58,6 @@
4858
import org.springframework.web.context.request.async.WebAsyncUtils;
4959
import org.springframework.web.filter.OncePerRequestFilter;
5060

51-
import javax.servlet.FilterChain;
52-
import javax.servlet.ServletException;
53-
import javax.servlet.http.HttpServletRequest;
54-
import javax.servlet.http.HttpServletResponse;
55-
import java.io.IOException;
56-
import java.util.ArrayList;
57-
import java.util.List;
58-
5961
import static org.assertj.core.api.Assertions.assertThat;
6062
import static org.assertj.core.api.ThrowableAssert.catchThrowable;
6163
import static org.mockito.ArgumentMatchers.any;
@@ -75,6 +77,7 @@
7577
*/
7678
@PrepareForTest({WebAsyncManager.class})
7779
@RunWith(PowerMockRunner.class)
80+
@PowerMockIgnore({ "org.w3c.dom.*", "org.xml.sax.*", "org.apache.xerces.*", "javax.xml.parsers.*", "javax.xml.transform.*" })
7881
public class WebSecurityConfigurerAdapterTests {
7982
@Rule
8083
public final SpringTestRule spring = new SpringTestRule();

‎config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerServlet31Tests.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,7 @@
1515
*/
1616
package org.springframework.security.config.annotation.web.configurers;
1717

18-
import static org.mockito.Matchers.any;
19-
import static org.mockito.Matchers.same;
20-
import static org.powermock.api.mockito.PowerMockito.mock;
21-
import static org.powermock.api.mockito.PowerMockito.spy;
22-
import static org.powermock.api.mockito.PowerMockito.verifyStatic;
23-
import static org.powermock.api.mockito.PowerMockito.when;
24-
2518
import java.lang.reflect.Method;
26-
2719
import javax.servlet.Filter;
2820
import javax.servlet.http.HttpServletRequest;
2921

@@ -32,8 +24,10 @@
3224
import org.junit.Test;
3325
import org.junit.runner.RunWith;
3426
import org.mockito.Mock;
27+
import org.powermock.core.classloader.annotations.PowerMockIgnore;
3528
import org.powermock.core.classloader.annotations.PrepareForTest;
3629
import org.powermock.modules.junit4.PowerMockRunner;
30+
3731
import org.springframework.context.ConfigurableApplicationContext;
3832
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
3933
import org.springframework.mock.web.MockFilterChain;
@@ -52,12 +46,20 @@
5246
import org.springframework.security.web.csrf.HttpSessionCsrfTokenRepository;
5347
import org.springframework.util.ReflectionUtils;
5448

49+
import static org.mockito.Matchers.any;
50+
import static org.mockito.Matchers.same;
51+
import static org.powermock.api.mockito.PowerMockito.mock;
52+
import static org.powermock.api.mockito.PowerMockito.spy;
53+
import static org.powermock.api.mockito.PowerMockito.verifyStatic;
54+
import static org.powermock.api.mockito.PowerMockito.when;
55+
5556
/**
5657
*
5758
* @author Rob Winch
5859
*/
5960
@RunWith(PowerMockRunner.class)
6061
@PrepareForTest({ ReflectionUtils.class, Method.class })
62+
@PowerMockIgnore({ "org.w3c.dom.*", "org.xml.sax.*", "org.apache.xerces.*", "javax.xml.parsers.*" })
6163
public class SessionManagementConfigurerServlet31Tests {
6264
@Mock
6365
Method method;

‎config/src/test/java/org/springframework/security/config/http/SessionManagementConfigServlet31Tests.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,7 @@
1515
*/
1616
package org.springframework.security.config.http;
1717

18-
import static org.mockito.Matchers.any;
19-
import static org.mockito.Matchers.same;
20-
import static org.powermock.api.mockito.PowerMockito.mock;
21-
import static org.powermock.api.mockito.PowerMockito.spy;
22-
import static org.powermock.api.mockito.PowerMockito.verifyStatic;
23-
import static org.powermock.api.mockito.PowerMockito.when;
24-
2518
import java.lang.reflect.Method;
26-
2719
import javax.servlet.Filter;
2820
import javax.servlet.http.HttpServletRequest;
2921

@@ -32,27 +24,35 @@
3224
import org.junit.Test;
3325
import org.junit.runner.RunWith;
3426
import org.mockito.Mock;
27+
import org.powermock.core.classloader.annotations.PowerMockIgnore;
3528
import org.powermock.core.classloader.annotations.PrepareForTest;
3629
import org.powermock.modules.junit4.PowerMockRunner;
30+
3731
import org.springframework.context.ConfigurableApplicationContext;
3832
import org.springframework.mock.web.MockFilterChain;
3933
import org.springframework.mock.web.MockHttpServletRequest;
4034
import org.springframework.mock.web.MockHttpServletResponse;
41-
42-
4335
import org.springframework.security.config.util.InMemoryXmlApplicationContext;
4436
import org.springframework.security.core.Authentication;
4537
import org.springframework.security.core.context.SecurityContextImpl;
4638
import org.springframework.security.web.context.HttpRequestResponseHolder;
4739
import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
4840
import org.springframework.util.ReflectionUtils;
4941

42+
import static org.mockito.Matchers.any;
43+
import static org.mockito.Matchers.same;
44+
import static org.powermock.api.mockito.PowerMockito.mock;
45+
import static org.powermock.api.mockito.PowerMockito.spy;
46+
import static org.powermock.api.mockito.PowerMockito.verifyStatic;
47+
import static org.powermock.api.mockito.PowerMockito.when;
48+
5049
/**
5150
* @author Rob Winch
5251
*
5352
*/
5453
@RunWith(PowerMockRunner.class)
5554
@PrepareForTest({ ReflectionUtils.class, Method.class })
55+
@PowerMockIgnore({ "org.w3c.dom.*", "org.xml.sax.*", "org.apache.xerces.*", "javax.xml.parsers.*" })
5656
public class SessionManagementConfigServlet31Tests {
5757
private static final String XML_AUTHENTICATION_MANAGER = "<authentication-manager>"
5858
+ " <authentication-provider>" + " <user-service>"

‎gradle/dependency-management.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ dependencyManagement {
182182
dependency 'org.mockito:mockito-core:2.22.0'
183183
dependency 'org.objenesis:objenesis:2.6'
184184
dependency 'org.openid4java:openid4java-nodeps:0.9.6'
185-
dependency 'org.ow2.asm:asm:6.0'
185+
dependency 'org.ow2.asm:asm:6.2.1'
186186
dependency 'org.reactivestreams:reactive-streams:1.0.1'
187187
dependency 'org.seleniumhq.selenium:htmlunit-driver:2.33.0'
188188
dependency 'org.seleniumhq.selenium:selenium-java:3.14.0'

‎samples/javaconfig/form/spring-security-samples-javaconfig-form.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ dependencies {
2727
compile 'org.springframework:spring-webmvc'
2828
compile slf4jDependencies
2929

30+
compile 'javax.xml.bind:jaxb-api'
31+
compile 'com.sun.xml.bind:jaxb-core'
32+
compile 'com.sun.xml.bind:jaxb-impl'
33+
3034
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
3135
providedCompile 'javax.servlet:javax.servlet-api'
3236

‎samples/javaconfig/jdbc/spring-security-samples-javaconfig-jdbc.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ dependencies {
2828
compile 'org.hibernate:hibernate-validator'
2929
compile slf4jDependencies
3030

31+
compile 'javax.xml.bind:jaxb-api'
32+
compile 'com.sun.xml.bind:jaxb-core'
33+
compile 'com.sun.xml.bind:jaxb-impl'
34+
3135
providedCompile 'javax.servlet.jsp:javax.servlet.jsp-api'
3236
providedCompile 'javax.servlet:javax.servlet-api'
3337

0 commit comments

Comments
 (0)