From 8a6f7d8730e44c7491db65e6a1293a7072a26f68 Mon Sep 17 00:00:00 2001
From: Wesley Szamotula <wes.szamotula@wisc.edu>
Date: Tue, 7 Jul 2020 12:51:39 -0500
Subject: [PATCH] Cleanup security context before test runs
---
pom.xml | 29 +++++++++++++------
.../SwitchUserOnHeaderFilterTest.java | 2 +-
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9bca073..0b59a31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>edu.wisc.uwss</groupId>
<artifactId>uw-spring-security</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.1</version>
<packaging>pom</packaging>
<name>UW Spring Security Parent</name>
<description>Parent project for module to integrate Spring Security with UW authentication mechanism.</description>
@@ -16,22 +16,28 @@
<distributionManagement>
<repository>
- <id>code.doit-uw-releases</id>
- <url>https://code.doit.wisc.edu/maven/content/repositories/uw-releases/</url>
+ <id>maven-releases</id>
+ <url>https://ia-tools-nexus.doit.wisc.edu/repository/maven-releases/</url>
</repository>
<snapshotRepository>
- <id>code.doit-uw-snapshots</id>
- <url>https://code.doit.wisc.edu/maven/content/repositories/uw-snapshots/</url>
+ <id>maven-snapshots</id>
+ <url>https://ia-tools-nexus.doit.wisc.edu/repository/maven-snapshots/</url>
</snapshotRepository>
</distributionManagement>
+
<repositories>
<repository>
- <id>code.doit-uw-releases</id>
- <url>https://code.doit.wisc.edu/maven/content/repositories/uw-releases/</url>
+ <id>maven-private</id>
+ <url>https://ia-tools-nexus.doit.wisc.edu/repository/maven-private/</url>
+ </repository>
+ <repository>
+ <id>maven-public</id>
+ <url>https://ia-tools-nexus.doit.wisc.edu/repository/maven-public/</url>
</repository>
<repository>
- <id>code.doit-public-releases</id>
- <url>https://code.doit.wisc.edu/maven/content/repositories/public-releases</url>
+ <id>artifacts.doit.wisc.edu-maven-uw-open-releases-proxy</id>
+ <name>artifacts.doit.wisc.edu-maven-uw-open-releases-proxy</name>
+ <url>https://ia-tools-nexus.doit.wisc.edu/repository/artifacts.doit.wisc.edu-maven-uw-open-releases-proxy</url>
</repository>
</repositories>
@@ -238,6 +244,11 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M5</version>
+ </plugin>
</plugins>
</build>
<modules>
diff --git a/uw-spring-security-web/src/test/java/edu/wisc/uwss/impersonation/SwitchUserOnHeaderFilterTest.java b/uw-spring-security-web/src/test/java/edu/wisc/uwss/impersonation/SwitchUserOnHeaderFilterTest.java
index c54787c..428368a 100644
--- a/uw-spring-security-web/src/test/java/edu/wisc/uwss/impersonation/SwitchUserOnHeaderFilterTest.java
+++ b/uw-spring-security-web/src/test/java/edu/wisc/uwss/impersonation/SwitchUserOnHeaderFilterTest.java
@@ -31,7 +31,7 @@ public class SwitchUserOnHeaderFilterTest {
@Before
public void clearAuthentication() {
// guarantee we are not authenticated by clearing the context
- SecurityContextHolder.getContext().setAuthentication(null);
+ SecurityContextHolder.clearContext();
}
/**
* Confirm stable behavior for {@link SwitchUserOnHeaderFilter#requiresSwitchUser(javax.servlet.http.HttpServletRequest)}
--
GitLab