[JAVA-8684] Clean up pom files and use JUnit 5

ma7as · May 2, 2022 · c03b6a2 · c03b6a2
1 parent 8fdbd92
commit c03b6a2
Show file tree

Hide file tree

Showing 7 changed files with 87 additions and 38 deletions.
diff --git a/oauth-rest/oauth-authorization-server/pom.xml b/oauth-rest/oauth-authorization-server/pom.xml
@@ -3,7 +3,6 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.baeldung</groupId>
     <artifactId>oauth-authorization-server</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -18,7 +17,6 @@
     <dependencies>
 
         <!-- web -->
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

diff --git a/oauth-rest/oauth-resource-server/pom.xml b/oauth-rest/oauth-resource-server/pom.xml
@@ -3,16 +3,14 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.baeldung</groupId>
     <artifactId>oauth-resource-server</artifactId>
     <version>0.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.4</version>
-        <relativePath /> <!-- lookup parent from repository -->
+        <groupId>com.baeldung</groupId>
+        <artifactId>oauth-rest</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/oauth-rest/oauth-ui-authorization-code-angular-zuul/src/main/resources/package-lock.json b/oauth-rest/oauth-ui-authorization-code-angular-zuul/src/main/resources/package-lock.json
diff --git a/...ui-authorization-code-angular-zuul/src/test/java/com/baeldung/test/UiIntegrationTest.java b/...ui-authorization-code-angular-zuul/src/test/java/com/baeldung/test/UiIntegrationTest.java
@@ -1,19 +1,18 @@
 package com.baeldung.test;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import com.baeldung.config.UiApplication;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import com.baeldung.config.UiApplication;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringRunner.class)
+@ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = UiApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT)
 public class UiIntegrationTest {
 
     @Test
-    public void whenLoadApplication_thenSuccess() {
+    void whenLoadApplication_thenSuccess() {
 
     }
 }
diff --git a/oauth-rest/oauth-ui-authorization-code-angular/pom.xml b/oauth-rest/oauth-ui-authorization-code-angular/pom.xml
@@ -5,13 +5,12 @@
 	<artifactId>oauth-ui-authorization-code-angular</artifactId>
 
 	<name>oauth-ui-authorization-code-angular</name>
-	<packaging>war</packaging>
+	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>com.baeldung</groupId>
-		<artifactId>spring-security-oauth</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../../</relativePath>
+		<artifactId>oauth-rest</artifactId>
+		<version>0.1.0-SNAPSHOT</version>
 	</parent>
 
 	<build>

diff --git a/oauth-rest/oauth-ui-authorization-code-angular/src/main/resources/package-lock.json b/oauth-rest/oauth-ui-authorization-code-angular/src/main/resources/package-lock.json
diff --git a/oauth-rest/pom.xml b/oauth-rest/pom.xml
@@ -8,21 +8,12 @@
     <version>0.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.junit.vintage</groupId>
-                <artifactId>junit-vintage-engine</artifactId>
-                <scope>test</scope>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.hamcrest</groupId>
-                        <artifactId>hamcrest-core</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.6.7</version>
+        <relativePath /> <!-- lookup parent from repository -->
+    </parent>
 
     <modules>
         <module>oauth-authorization-server</module>
@@ -31,4 +22,4 @@
         <module>oauth-ui-authorization-code-angular-zuul</module>
     </modules>
 
-</project>
+</project>