Clean up pom.xml

WE2-860

Signed-off-by: Mart Somermaa <[email protected]>

Author: mrts

example/pom.xml

@@ -5,21 +5,21 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.9</version>
+		<version>3.2.4</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>org.webeid.example</groupId>
+	<groupId>eu.webeid.example</groupId>
 	<artifactId>web-eid-springboot-example</artifactId>
 	<version>3.0.0-SNAPSHOT</version>
 	<name>web-eid-springboot-example</name>
-	<description>Example Spring Boot project that demonstrates how to use Web eID for authentication and digital
+	<description>Example Spring Boot application that demonstrates how to use Web eID for authentication and digital
 		signing
 	</description>
 
 	<properties>
 		<java.version>17</java.version>
-		<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
-		<webeid.version>3.0.0</webeid.version>
+		<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+		<webeid.version>3.0.1</webeid.version>
 		<digidoc4j.version>5.3.0</digidoc4j.version>
 		<jmockit.version>1.44</jmockit.version>
 	</properties>
@@ -31,20 +31,12 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
+			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-config</artifactId>
-		</dependency>
 
 		<dependency>
 			<groupId>org.digidoc4j</groupId>
@@ -57,22 +49,10 @@
 			<version>${webeid.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.junit.vintage</groupId>
-					<artifactId>junit-vintage-engine</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.security</groupId>

example/src/main/java/eu/webeid/example/web/WelcomeController.java

@@ -29,8 +29,8 @@
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import jakarta.validation.constraints.NotNull;
 import java.security.Principal;
+import java.util.Objects;
 
 import static eu.webeid.example.security.AuthTokenDTOAuthenticationProvider.ROLE_USER;
 
@@ -40,7 +40,8 @@ public class WelcomeController {
 
     @PreAuthorize("hasAuthority('" + ROLE_USER + "')")
     @GetMapping("welcome")
-    public String welcome(Model model, @NotNull Principal principal) {
+    public String welcome(Model model, Principal principal) {
+        Objects.requireNonNull(principal);
         LOG.info("Showing welcome page, logged in as principal={}", principal.getName());
         model.addAttribute("principalName", principal.getName());
         return "welcome";