From ae27c5780335ff5979f9f8b02746241ae5059497 Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Mon, 10 May 2021 20:06:48 +0530 Subject: [PATCH] JAVA-5223: Fix formatting of POMs (Persistence Modules - Part 3) --- .../spring-data-jpa-query-2/pom.xml | 8 +++---- .../spring-data-jpa-query/pom.xml | 9 ++----- .../spring-data-jpa-repo-2/pom.xml | 11 ++++----- .../spring-data-jpa-repo/pom.xml | 14 +++-------- .../spring-data-keyvalue/pom.xml | 11 +++------ .../spring-data-mongodb/pom.xml | 11 +++------ persistence-modules/spring-data-neo4j/pom.xml | 7 +++--- persistence-modules/spring-data-redis/pom.xml | 11 +++------ persistence-modules/spring-data-solr/pom.xml | 4 ++-- .../spring-hibernate-3/pom.xml | 5 ++-- .../spring-hibernate-5/pom.xml | 24 ++++--------------- persistence-modules/spring-jdbc/pom.xml | 11 ++++----- persistence-modules/spring-jooq/pom.xml | 16 ++++--------- persistence-modules/spring-jpa-2/pom.xml | 12 +++------- persistence-modules/spring-jpa/pom.xml | 20 +++------------- persistence-modules/spring-mybatis/pom.xml | 24 ++++--------------- .../spring-persistence-simple/pom.xml | 9 ++++--- 17 files changed, 57 insertions(+), 150 deletions(-) diff --git a/persistence-modules/spring-data-jpa-query-2/pom.xml b/persistence-modules/spring-data-jpa-query-2/pom.xml index 282a1ff83a..96585d9325 100644 --- a/persistence-modules/spring-data-jpa-query-2/pom.xml +++ b/persistence-modules/spring-data-jpa-query-2/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-data-jpa-query-2 spring-data-jpa-query-2 @@ -22,17 +22,14 @@ org.springframework.security spring-security-core - com.h2database h2 - com.fasterxml.jackson.core jackson-databind - org.hibernate hibernate-envers @@ -90,4 +87,5 @@ 5.2.10.Final + \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-query/pom.xml b/persistence-modules/spring-data-jpa-query/pom.xml index 1576fd729d..c231afdd17 100644 --- a/persistence-modules/spring-data-jpa-query/pom.xml +++ b/persistence-modules/spring-data-jpa-query/pom.xml @@ -1,7 +1,7 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-data-jpa-query spring-data-jpa-query @@ -18,23 +18,19 @@ org.springframework.boot spring-boot-starter-data-jpa - com.h2database h2 - net.ttddyy datasource-proxy ${datasource-proxy.version} - com.fasterxml.jackson.core jackson-databind - org.springframework spring-oxm @@ -43,7 +39,6 @@ 1.4.1 - \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-repo-2/pom.xml b/persistence-modules/spring-data-jpa-repo-2/pom.xml index 3be1068d8c..b382e35e28 100644 --- a/persistence-modules/spring-data-jpa-repo-2/pom.xml +++ b/persistence-modules/spring-data-jpa-repo-2/pom.xml @@ -1,8 +1,10 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + spring-data-jpa-repo-2 + spring-data-jpa-repo-2 com.baeldung @@ -11,9 +13,6 @@ ../../parent-boot-2 - spring-data-jpa-repo-2 - spring-data-jpa-repo-2 - @@ -32,7 +31,6 @@ com.h2database h2 - com.google.guava @@ -43,6 +41,5 @@ 29.0-jre - \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-repo/pom.xml b/persistence-modules/spring-data-jpa-repo/pom.xml index 16a214fd7f..26fff365a1 100644 --- a/persistence-modules/spring-data-jpa-repo/pom.xml +++ b/persistence-modules/spring-data-jpa-repo/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-data-jpa-repo spring-data-jpa-repo @@ -17,39 +18,30 @@ org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-data-jpa - org.springframework.boot spring-boot-starter-data-jdbc - mysql mysql-connector-java - org.postgresql postgresql - com.h2database h2 - org.springframework spring-oxm - - - \ No newline at end of file diff --git a/persistence-modules/spring-data-keyvalue/pom.xml b/persistence-modules/spring-data-keyvalue/pom.xml index 3aaee2f00c..aa2696dd12 100644 --- a/persistence-modules/spring-data-keyvalue/pom.xml +++ b/persistence-modules/spring-data-keyvalue/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 spring-data-keyvalue spring-data-keyvalue @@ -16,19 +17,13 @@ org.springframework.boot spring-boot-starter - org.springframework.data spring-data-keyvalue - org.springframework.boot spring-boot-starter-test - - - - \ No newline at end of file diff --git a/persistence-modules/spring-data-mongodb/pom.xml b/persistence-modules/spring-data-mongodb/pom.xml index 448b635667..ef5a0f0550 100644 --- a/persistence-modules/spring-data-mongodb/pom.xml +++ b/persistence-modules/spring-data-mongodb/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-data-mongodb @@ -18,32 +19,27 @@ spring-data-mongodb ${org.springframework.data.version} - org.mongodb mongodb-driver-sync ${mongodb-driver.version} - org.mongodb mongodb-driver-reactivestreams ${mongodb-reactivestreams.version} - io.projectreactor reactor-core ${projectreactor.version} - io.projectreactor reactor-test ${projectreactor.version} test - org.springframework spring-core @@ -107,7 +103,6 @@ 4.1.0 3.2.0.RELEASE 4.0.5 - - + \ No newline at end of file diff --git a/persistence-modules/spring-data-neo4j/pom.xml b/persistence-modules/spring-data-neo4j/pom.xml index d827c32a3c..8c5030779b 100644 --- a/persistence-modules/spring-data-neo4j/pom.xml +++ b/persistence-modules/spring-data-neo4j/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-data-neo4j 1.0 @@ -97,4 +98,4 @@ 3.1.2 - + \ No newline at end of file diff --git a/persistence-modules/spring-data-redis/pom.xml b/persistence-modules/spring-data-redis/pom.xml index d271df31c7..5e17f27c06 100644 --- a/persistence-modules/spring-data-redis/pom.xml +++ b/persistence-modules/spring-data-redis/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-data-redis @@ -32,7 +33,6 @@ reactor-test test - org.springframework spring-test @@ -42,7 +42,6 @@ spring-boot-starter-test test - org.junit.jupiter junit-jupiter-api @@ -52,25 +51,21 @@ junit-platform-runner test - cglib cglib-nodep ${cglib.version} - redis.clients jedis jar - com.lordofthejars nosqlunit-redis ${nosqlunit.version} - com.github.kstyrc embedded-redis @@ -100,4 +95,4 @@ 0.6 - + \ No newline at end of file diff --git a/persistence-modules/spring-data-solr/pom.xml b/persistence-modules/spring-data-solr/pom.xml index 38b5bf8238..d7523e6de2 100644 --- a/persistence-modules/spring-data-solr/pom.xml +++ b/persistence-modules/spring-data-solr/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-data-solr @@ -45,7 +46,6 @@ 2.0.5.RELEASE - \ No newline at end of file diff --git a/persistence-modules/spring-hibernate-3/pom.xml b/persistence-modules/spring-hibernate-3/pom.xml index b28895f86d..9b143597c7 100644 --- a/persistence-modules/spring-hibernate-3/pom.xml +++ b/persistence-modules/spring-hibernate-3/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-hibernate-3 @@ -84,4 +85,4 @@ 19.0 - + \ No newline at end of file diff --git a/persistence-modules/spring-hibernate-5/pom.xml b/persistence-modules/spring-hibernate-5/pom.xml index 8a8b6c15e3..caa1598af4 100644 --- a/persistence-modules/spring-hibernate-5/pom.xml +++ b/persistence-modules/spring-hibernate-5/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-hibernate-5 0.1-SNAPSHOT @@ -13,9 +14,7 @@ - - org.springframework spring-context @@ -32,9 +31,7 @@ spring-aspects ${org.springframework.version} - - org.springframework spring-orm @@ -65,32 +62,25 @@ hibernate-search-orm ${hibernatesearch.version} - org.apache.tomcat tomcat-dbcp ${tomcat-dbcp.version} - - - com.google.guava guava ${guava.version} - - org.apache.commons commons-lang3 ${commons-lang3.version} test - org.springframework spring-test @@ -103,25 +93,21 @@ ${org.springframework.security.version} test - org.hsqldb hsqldb ${hsqldb.version} - mysql mysql-connector-java ${mysql-connector-java.version} - com.h2database h2 ${h2.version} - @@ -129,7 +115,6 @@ 5.0.2.RELEASE 1.10.6.RELEASE 4.2.1.RELEASE - 5.2.10.Final 5.8.2.Final @@ -137,9 +122,8 @@ 9.0.0.M26 1.1 2.3.4 - 21.0 - + \ No newline at end of file diff --git a/persistence-modules/spring-jdbc/pom.xml b/persistence-modules/spring-jdbc/pom.xml index 8a5786e1a5..28a858dd43 100644 --- a/persistence-modules/spring-jdbc/pom.xml +++ b/persistence-modules/spring-jdbc/pom.xml @@ -1,8 +1,10 @@ + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + spring-jdbc + spring-jdbc com.baeldung @@ -11,9 +13,6 @@ ../../parent-boot-2 - spring-jdbc - spring-jdbc - org.springframework.data @@ -34,6 +33,4 @@ - - \ No newline at end of file diff --git a/persistence-modules/spring-jooq/pom.xml b/persistence-modules/spring-jooq/pom.xml index 6b3d565175..4c195a6c92 100644 --- a/persistence-modules/spring-jooq/pom.xml +++ b/persistence-modules/spring-jooq/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-jooq spring-jooq @@ -32,14 +33,12 @@ jooq ${org.jooq.version} - com.h2database h2 ${h2.version} - org.springframework @@ -63,7 +62,6 @@ org.springframework.boot spring-boot-starter-test - org.springframework @@ -74,7 +72,6 @@ - org.apache.maven.plugins @@ -84,7 +81,6 @@ 0 - org.codehaus.mojo properties-maven-plugin @@ -103,7 +99,6 @@ - org.codehaus.mojo sql-maven-plugin @@ -133,7 +128,6 @@ - org.jooq jooq-codegen-maven @@ -164,11 +158,11 @@ - - + org.eclipse.m2e lifecycle-mapping diff --git a/persistence-modules/spring-jpa-2/pom.xml b/persistence-modules/spring-jpa-2/pom.xml index 52067f3e5e..16168036be 100644 --- a/persistence-modules/spring-jpa-2/pom.xml +++ b/persistence-modules/spring-jpa-2/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-jpa-2 0.1-SNAPSHOT @@ -25,7 +26,6 @@ spring-boot-starter-data-jpa ${spring-boot.version} - org.springframework spring-orm @@ -42,7 +42,6 @@ spring-context ${org.springframework.version} - org.hibernate @@ -59,14 +58,12 @@ tomcat-dbcp ${tomcat-dbcp.version} - com.google.guava guava ${guava.version} - org.springframework.boot @@ -79,17 +76,14 @@ ${org.springframework.version} test - 5.1.5.RELEASE 2.2.6.RELEASE - 9.0.0.M26 - 21.0 diff --git a/persistence-modules/spring-jpa/pom.xml b/persistence-modules/spring-jpa/pom.xml index e389886d8d..1dca2baa98 100644 --- a/persistence-modules/spring-jpa/pom.xml +++ b/persistence-modules/spring-jpa/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-jpa 0.1-SNAPSHOT @@ -36,9 +37,7 @@ spring-webmvc ${org.springframework.version} - - org.hibernate hibernate-core @@ -70,9 +69,7 @@ h2 ${h2.version} - - org.hibernate hibernate-validator @@ -83,7 +80,6 @@ javax.el-api ${javax.el-api.version} - javax.servlet @@ -96,9 +92,7 @@ provided ${javax.servlet.servlet-api.version} - - com.google.guava guava @@ -109,41 +103,33 @@ assertj-core ${assertj.version} - - org.apache.commons commons-lang3 ${commons-lang3.version} test - org.springframework spring-test ${org.springframework.version} test - 5.1.5.RELEASE 3.21.0-GA - 6.0.6 2.1.5.RELEASE - 2.5 - 6.0.15.Final 1.4.01 2.2.5 - 21.0 3.8.0 diff --git a/persistence-modules/spring-mybatis/pom.xml b/persistence-modules/spring-mybatis/pom.xml index 40d4d915ab..9247d59fe4 100644 --- a/persistence-modules/spring-mybatis/pom.xml +++ b/persistence-modules/spring-mybatis/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-mybatis 0.1-SNAPSHOT @@ -14,76 +15,61 @@ - - org.springframework spring-context ${org.springframework.version} - org.springframework spring-beans ${org.springframework.version} - - org.mybatis.spring.boot mybatis-spring-boot-starter ${mybatis-spring-boot-starter.version} - - com.h2database h2 ${h2.version} - org.springframework spring-jdbc ${org.springframework.version} - org.mybatis mybatis ${mybatis.version} - org.mybatis mybatis-spring ${spring-mybatis.version} - - org.springframework.boot spring-boot-starter-test - org.springframework spring-test ${org.springframework.version} test - org.assertj assertj-core ${assertj-core.version} test - @@ -99,15 +85,13 @@ 5.1.8.RELEASE - 2.0.2 3.5.2 2.1.0 1.4.197 - 3.8.0 - + \ No newline at end of file diff --git a/persistence-modules/spring-persistence-simple/pom.xml b/persistence-modules/spring-persistence-simple/pom.xml index 13898d01e7..437a439b99 100644 --- a/persistence-modules/spring-persistence-simple/pom.xml +++ b/persistence-modules/spring-persistence-simple/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-persistence-simple 0.1-SNAPSHOT @@ -24,7 +25,6 @@ spring-context ${org.springframework.version} - javax.persistence @@ -57,14 +57,12 @@ ${h2.version} test - com.github.h-thurow simple-jndi ${simple-jndi.version} - org.springframework @@ -100,4 +98,5 @@ 3.3.3 + \ No newline at end of file