diff --git a/README.md b/README.md index 8aff33f2..059e59d8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Spring Boot Shopping Cart Web App +# Spring Boot Shopping Cart Web App edited by Burlap ## About diff --git a/feature/file.txt b/feature/file.txt new file mode 100644 index 00000000..b65ddd9a --- /dev/null +++ b/feature/file.txt @@ -0,0 +1 @@ +Hi team this for multi branch diff --git a/file1.txt b/file1.txt new file mode 100644 index 00000000..1e42ebf4 --- /dev/null +++ b/file1.txt @@ -0,0 +1 @@ +Hi Everyone diff --git a/pom.xml b/pom.xml index fd17150e..747f76d7 100644 --- a/pom.xml +++ b/pom.xml @@ -14,47 +14,33 @@ org.springframework.boot spring-boot-starter-parent - 1.5.3.RELEASE - + 2.7.15 + UTF-8 UTF-8 - 1.8 - 0.8.6 - jacoco - reuseReports - ${project.basedir}/../target/jacoco.exec - java + 17 - + org.springframework.boot spring-boot-starter-data-jpa - org.springframework.boot - spring-boot-starter-data-rest - - - - - org.springframework.data - spring-data-rest-hal-browser + spring-boot-starter-web - org.springframework.boot spring-boot-starter-security - org.springframework.boot spring-boot-starter-thymeleaf @@ -62,104 +48,74 @@ org.thymeleaf.extras - thymeleaf-extras-springsecurity4 - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-devtools - runtime + thymeleaf-extras-springsecurity5 - + com.h2database h2 runtime - mysql mysql-connector-java + 8.0.33 runtime - + org.springframework.boot - spring-boot-starter-test - test + spring-boot-devtools + runtime - - - org.webjars - bootstrap - 3.3.7 - - - org.jacoco - jacoco-maven-plugin - 0.8.6 - - + - org.webjars - jquery - 2.1.4 + org.springframework.boot + spring-boot-starter-test + test + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 17 + + + org.springframework.boot spring-boot-maven-plugin - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - package - - report - - - - + + org.apache.maven.plugins + maven-enforcer-plugin + 3.0.0 + + + enforce-java + + enforce + + + + + 17 + + + + + + - - - - maven-releases - maven-releases - http://3.108.254.192:8081/repository/maven-releases/ - - - maven-snapshots - maven-snapshots - http://3.108.254.192:8081/repository/maven-snapshots/ - - - -