Some more upgrade and clean up

Author: Nasruddin

api-gateway-service/pom.xml

@@ -3,6 +3,13 @@
 	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>
 
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.2.5.RELEASE</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
 	<groupId>com.assignment</groupId>
 	<artifactId>api-gateway-service</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
@@ -14,13 +21,6 @@
 		<spring-cloud.version>Hoxton.SR1</spring-cloud.version>
 	</properties>
 
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.5.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

api-gateway-service/src/main/java/com/assignment/apigatewayservice/security/JwtTokenAuthenticationFilter.java

@@ -1,6 +1,6 @@
 package com.assignment.apigatewayservice.security;
 
-import com.assignment.commonservice.JwtConfig;
+import com.javatab.commonservice.JwtConfig;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

api-gateway-service/src/main/java/com/assignment/apigatewayservice/security/SecurityTokenConfig.java

@@ -1,6 +1,6 @@
 package com.assignment.apigatewayservice.security;
 
-import com.assignment.commonservice.JwtConfig;
+import com.javatab.commonservice.JwtConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpMethod;

auth-service/pom.xml

@@ -3,6 +3,13 @@
 	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>
 
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.5.4</version>
+		<relativePath/> <!-- lookup parent from repository -->
+	</parent>
+
 	<groupId>com.assignment</groupId>
 	<artifactId>auth-service</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
@@ -11,15 +18,10 @@
 
 	<properties>
 		<java.version>11</java.version>
-		<spring-cloud.version>Hoxton.SR1</spring-cloud.version>
+		<spring-cloud.version>2020.0.3</spring-cloud.version>
 	</properties>
 
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.5.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
-	</parent>
+
 
 	<dependencies>
 		<dependency>

auth-service/src/main/java/com/assignment/authservice/security/JwtUsernameAndPasswordAuthenticationFilter.java

@@ -1,7 +1,7 @@
 package com.assignment.authservice.security;
 
 import com.assignment.authservice.model.LoggedInUserDetails;
-import com.assignment.commonservice.JwtConfig;
+import com.javatab.commonservice.JwtConfig;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
 import io.jsonwebtoken.Jwts;

auth-service/src/main/java/com/assignment/authservice/security/SecurityCredentialsConfig.java

@@ -1,6 +1,6 @@
 package com.assignment.authservice.security;
 
-import com.assignment.commonservice.JwtConfig;
+import com.javatab.commonservice.JwtConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpMethod;

common-service/pom.xml

@@ -5,18 +5,18 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.5.RELEASE</version>
+		<version>2.5.4</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>com.assignment</groupId>
+	<groupId>com.javatab</groupId>
 	<artifactId>common-service</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>common-service</name>
 	<description>Demo project for Spring Boot</description>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+		<spring-cloud.version>2020.0.3</spring-cloud.version>
 	</properties>
 
 	<dependencies>

common-service/src/main/java/com/assignment/commonservice/CommonServiceApplication.java renamed to common-service/src/main/java/com/javatab/commonservice/CommonServiceApplication.java

@@ -1,4 +1,4 @@
-package com.assignment.commonservice;
+package com.javatab.commonservice;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

common-service/src/main/java/com/assignment/commonservice/JwtConfig.java renamed to common-service/src/main/java/com/javatab/commonservice/JwtConfig.java

@@ -1,4 +1,4 @@
-package com.assignment.commonservice;
+package com.javatab.commonservice;
 
 import lombok.Getter;
 import lombok.Setter;

common-service/src/main/java/com/assignment/commonservice/UserRole.java renamed to common-service/src/main/java/com/javatab/commonservice/UserRole.java

@@ -1,4 +1,4 @@
-package com.assignment.commonservice;
+package com.javatab.commonservice;
 
 public enum UserRole {
     USER, ADMIN;