fix build, update boot version

insamniac · Oct 17, 2020 · b0ee3bb · b0ee3bb
1 parent dcbc808
commit b0ee3bb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/oauth-legacy/oauth-ui-password-angularjs-legacy/pom.xml b/oauth-legacy/oauth-ui-password-angularjs-legacy/pom.xml
@@ -8,11 +8,11 @@
 	<packaging>war</packaging>
 
 	<parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.6.RELEASE</version>
-        <relativePath />
-    </parent>
+		<groupId>com.baeldung</groupId>
+		<artifactId>spring-security-oauth</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+		<relativePath>../../</relativePath>
+	</parent>
 
 	<dependencies>
 
@@ -31,7 +31,7 @@
 			<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
             <version>${netflix-zuul.version}</version>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
@@ -84,7 +84,6 @@
 			<plugin>
 				<groupId>org.codehaus.cargo</groupId>
 				<artifactId>cargo-maven2-plugin</artifactId>
-				<version>${cargo-maven2-plugin.version}</version>
 				<configuration>
 					<wait>true</wait>
 					<container>
@@ -104,7 +103,6 @@
 	</build>
 	<properties>
 		<netflix-zuul.version>2.1.1.RELEASE</netflix-zuul.version>
-		<commons-io.version>2.6</commons-io.version>
 	</properties>
 
 </project>
diff --git a/.../oauth-ui-password-angularjs-legacy/src/main/java/com/baeldung/config/SameSiteConfig.java b/.../oauth-ui-password-angularjs-legacy/src/main/java/com/baeldung/config/SameSiteConfig.java
@@ -7,6 +7,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+
 @Configuration
 public class SameSiteConfig implements WebMvcConfigurer {
     @Bean

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/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.3.RELEASE</version>
+		<version>2.1.17.RELEASE</version>
 		<relativePath></relativePath>
 	</parent>
 
@@ -71,8 +71,6 @@
 		<!-- Maven plugins -->
 		<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
 		<maven-war-plugin.version>3.2.2</maven-war-plugin.version>
-		<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
-        <cargo-maven2-plugin.version>1.7.3</cargo-maven2-plugin.version>
 	</properties>