Skip to content

Commit

Permalink
Merge pull request #56 from pavankjadda/development
Browse files Browse the repository at this point in the history
feat(core): upgrades spring boot to 3.2.2
  • Loading branch information
pavankjadda committed Feb 11, 2024
2 parents d7c9e90 + d7424af commit 25a929f
Show file tree
Hide file tree
Showing 55 changed files with 89 additions and 100 deletions.
38 changes: 14 additions & 24 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.7.1</version>
<version>3.2.2</version>
<relativePath/>
</parent>

<groupId>com.pj</groupId>
<artifactId>eShopping</artifactId>
<version>2.4.0</version>
<version>3.0.0</version>
<packaging>jar</packaging>

<name>eShopping</name>
Expand All @@ -24,21 +24,15 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<spring-boot.version>2.7.1</spring-boot.version>
<spring-cloud.version>2021.0.2</spring-cloud.version>
<spring-boot.version>3.2.2</spring-boot.version>
<spring-cloud.version>2023.0.0</spring-cloud.version>
<spring-cloud-aws.version>2.4.1</spring-cloud-aws.version>

<hibernate-envers.version>5.6.9.Final</hibernate-envers.version>
<hibernate-validator.version>7.0.4.Final</hibernate-validator.version>
<javax.interceptor-api.version>1.2.2</javax.interceptor-api.version>
<liquibase-maven-plugin.version>4.10.0</liquibase-maven-plugin.version>
<liquibase-hibernate5.version>4.10.0</liquibase-hibernate5.version>
<validation-api.version>2.0.1.Final</validation-api.version>
<javassist.version>3.26.0-GA</javassist.version>
<modelmapper.version>3.1.0</modelmapper.version>
<hibernate-envers.version>6.4.4.Final</hibernate-envers.version>
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
<modelmapper.version>3.2.0</modelmapper.version>
<logstash-logback-encoder.version>7.2</logstash-logback-encoder.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>


Expand Down Expand Up @@ -115,8 +109,9 @@
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.3.0</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand All @@ -125,18 +120,13 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>javax.interceptor</groupId>
<artifactId>javax.interceptor-api</artifactId>
<version>${javax.interceptor-api.version}</version>
<version>1.18.30</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.pj.eshopping.audit;

import jakarta.persistence.Column;
import jakarta.persistence.EntityListeners;
import jakarta.persistence.MappedSuperclass;
import lombok.Data;
import org.hibernate.envers.Audited;
import org.springframework.data.annotation.CreatedBy;
Expand All @@ -8,9 +11,6 @@
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import javax.persistence.Column;
import javax.persistence.EntityListeners;
import javax.persistence.MappedSuperclass;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/pj/eshopping/domain/cart/Cart.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import com.fasterxml.jackson.annotation.JsonManagedReference;
import com.pj.eshopping.audit.AbstractAuditingEntity;
import com.pj.eshopping.domain.user.UserProfile;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;
import java.util.ArrayList;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.pj.eshopping.audit.AbstractAuditingEntity;
import com.pj.eshopping.domain.user.*;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;

@EqualsAndHashCode(callSuper = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.pj.eshopping.audit.AbstractAuditingEntity;
import com.pj.eshopping.domain.product.Product;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;

@EqualsAndHashCode(callSuper = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.pj.eshopping.audit.AbstractAuditingEntity;
import com.pj.eshopping.domain.user.*;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;

@EqualsAndHashCode(callSuper = true)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/pj/eshopping/domain/cart/CartStatus.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.pj.eshopping.domain.cart;

import com.pj.eshopping.audit.AbstractAuditingEntity;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;

@EqualsAndHashCode(callSuper = true)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.pj.eshopping.domain.category;

import com.pj.eshopping.audit.AbstractAuditingEntity;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;
import java.io.Serializable;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.pj.eshopping.audit.AbstractAuditingEntity;
import com.pj.eshopping.domain.product.Product;
import jakarta.persistence.*;
import lombok.Data;

import javax.persistence.*;
import java.io.Serial;
import java.util.Objects;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.pj.eshopping.audit.AbstractAuditingEntity;
import com.pj.eshopping.domain.product.Product;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import com.pj.eshopping.domain.user.Country;
import com.pj.eshopping.domain.user.Region;
import com.pj.eshopping.domain.user.State;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;

@EqualsAndHashCode(callSuper = true)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.pj.eshopping.domain.manufacturer;

import com.pj.eshopping.audit.AbstractAuditingEntity;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;


Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/pj/eshopping/domain/order/Currency.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@


import com.pj.eshopping.audit.AbstractAuditingEntity;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;

@EqualsAndHashCode(callSuper = true)
@Entity
@Table(name = "currency")
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/pj/eshopping/domain/order/Order.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.pj.eshopping.audit.AbstractAuditingEntity;
import com.pj.eshopping.domain.user.UserProfile;
import jakarta.persistence.*;
import lombok.Data;

import javax.persistence.*;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.pj.eshopping.audit.AbstractAuditingEntity;
import com.pj.eshopping.domain.user.*;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;

@EqualsAndHashCode(callSuper = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.pj.eshopping.audit.AbstractAuditingEntity;
import com.pj.eshopping.domain.product.Product;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;
import java.util.Objects;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.pj.eshopping.audit.AbstractAuditingEntity;
import com.pj.eshopping.domain.user.*;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;

@EqualsAndHashCode(callSuper = true)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.pj.eshopping.domain.order;

import com.pj.eshopping.audit.AbstractAuditingEntity;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.pj.eshopping.domain.orderhistory;

import jakarta.persistence.*;
import lombok.Data;

import javax.persistence.*;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.pj.eshopping.domain.orderhistory;

import jakarta.persistence.*;
import lombok.Data;

import javax.persistence.*;
import java.io.Serializable;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.pj.eshopping.domain.orderhistory;

import jakarta.persistence.*;
import lombok.Data;

import javax.persistence.*;
import java.io.Serial;
import java.io.Serializable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.pj.eshopping.domain.orderhistory;

import jakarta.persistence.*;
import lombok.Data;

import javax.persistence.*;
import java.io.Serial;
import java.io.Serializable;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/pj/eshopping/domain/product/Photo.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.pj.eshopping.domain.product;

import com.pj.eshopping.audit.AbstractAuditingEntity;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;
import java.io.Serializable;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/pj/eshopping/domain/product/Price.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.pj.eshopping.audit.AbstractAuditingEntity;
import com.pj.eshopping.domain.order.Currency;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;

@EqualsAndHashCode(callSuper = true)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/pj/eshopping/domain/product/Product.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import com.pj.eshopping.domain.category.Category;
import com.pj.eshopping.domain.inventory.ProductInventory;
import com.pj.eshopping.domain.manufacturer.Manufacturer;
import jakarta.persistence.*;
import lombok.Data;

import javax.persistence.*;
import java.io.Serial;
import java.io.Serializable;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@


import com.pj.eshopping.audit.AbstractAuditingEntity;
import jakarta.persistence.*;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.persistence.*;
import java.io.Serial;

@EqualsAndHashCode(callSuper = true)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.pj.eshopping.domain.security;

import jakarta.persistence.*;
import lombok.Data;

import javax.persistence.*;
import java.io.Serial;
import java.time.LocalDateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.pj.eshopping.domain.security;

import jakarta.persistence.*;
import lombok.Data;

import javax.persistence.*;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
Expand Down
Loading

0 comments on commit 25a929f

Please sign in to comment.