From c4cac4d3818871f9d80ba4a481626c5dcf9216cb Mon Sep 17 00:00:00 2001 From: sampadawagde Date: Mon, 10 May 2021 20:06:19 +0530 Subject: [PATCH] JAVA-5223: Fix formatting of POMs (Persistence Modules - Part 2) --- persistence-modules/jooq/pom.xml | 6 +- .../jpa-hibernate-cascade-type/pom.xml | 4 +- persistence-modules/liquibase/pom.xml | 5 +- persistence-modules/orientdb/pom.xml | 7 ++- .../persistence-libraries/pom.xml | 7 ++- persistence-modules/pom.xml | 13 ++--- persistence-modules/querydsl/pom.xml | 17 +----- persistence-modules/r2dbc/pom.xml | 13 ++--- persistence-modules/redis/pom.xml | 12 ++-- persistence-modules/sirix/pom.xml | 6 +- persistence-modules/solr/pom.xml | 3 +- persistence-modules/spring-boot-mysql/pom.xml | 8 +-- .../spring-boot-persistence-2/pom.xml | 17 +----- .../spring-boot-persistence-h2/pom.xml | 7 +-- .../spring-boot-persistence-mongodb/pom.xml | 6 +- .../spring-boot-persistence/pom.xml | 2 +- .../spring-data-cassandra-reactive/pom.xml | 5 +- .../spring-data-cassandra/pom.xml | 7 ++- .../spring-data-cosmosdb/pom.xml | 15 ++--- .../spring-data-couchbase-2/pom.xml | 9 +-- .../spring-data-dynamodb/pom.xml | 7 ++- .../spring-data-eclipselink/pom.xml | 7 ++- .../spring-data-elasticsearch/pom.xml | 12 ++-- .../spring-data-gemfire/pom.xml | 7 +-- persistence-modules/spring-data-geode/pom.xml | 6 +- persistence-modules/spring-data-jdbc/pom.xml | 56 +++++++++---------- .../spring-data-jpa-annotations/pom.xml | 9 +-- .../spring-data-jpa-crud/pom.xml | 7 +-- .../spring-data-jpa-enterprise/pom.xml | 22 +++----- .../spring-data-jpa-filtering/pom.xml | 9 +-- 30 files changed, 129 insertions(+), 182 deletions(-) diff --git a/persistence-modules/jooq/pom.xml b/persistence-modules/jooq/pom.xml index 2dababb02d..f4751f412a 100644 --- a/persistence-modules/jooq/pom.xml +++ b/persistence-modules/jooq/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 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 jooq 0.0.1-SNAPSHOT @@ -49,4 +49,4 @@ 1.4.200 - + \ No newline at end of file diff --git a/persistence-modules/jpa-hibernate-cascade-type/pom.xml b/persistence-modules/jpa-hibernate-cascade-type/pom.xml index e8117290b0..467fe11bc3 100644 --- a/persistence-modules/jpa-hibernate-cascade-type/pom.xml +++ b/persistence-modules/jpa-hibernate-cascade-type/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 jpa-hibernate-cascade-type diff --git a/persistence-modules/liquibase/pom.xml b/persistence-modules/liquibase/pom.xml index af1af2259e..2fc5803037 100644 --- a/persistence-modules/liquibase/pom.xml +++ b/persistence-modules/liquibase/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 liquibase liquibase diff --git a/persistence-modules/orientdb/pom.xml b/persistence-modules/orientdb/pom.xml index 5b28fb01b0..1468f5b611 100644 --- a/persistence-modules/orientdb/pom.xml +++ b/persistence-modules/orientdb/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 orientdb 0.0.1-SNAPSHOT @@ -42,4 +43,4 @@ 2.6.0 - + \ No newline at end of file diff --git a/persistence-modules/persistence-libraries/pom.xml b/persistence-modules/persistence-libraries/pom.xml index 42f3a33a40..a3f0ccb728 100644 --- a/persistence-modules/persistence-libraries/pom.xml +++ b/persistence-modules/persistence-libraries/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 persistence-libraries 1.0-SNAPSHOT @@ -31,4 +32,4 @@ 1.6.0 - + \ No newline at end of file diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml index 32423a42dd..5e0cd59d18 100644 --- a/persistence-modules/pom.xml +++ b/persistence-modules/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 persistence-modules persistence-modules @@ -65,7 +66,6 @@ spring-data-elasticsearch spring-data-gemfire spring-data-geode - spring-data-jpa-annotations spring-data-jpa-crud spring-data-jpa-enterprise @@ -74,16 +74,14 @@ spring-data-jpa-query-2 spring-data-jpa-repo spring-data-jpa-repo-2 - spring-data-jdbc - spring-data-keyvalue spring-data-mongodb spring-data-neo4j spring-data-redis spring-data-solr spring-hibernate-3 - spring-hibernate-5 + spring-hibernate-5 spring-jpa spring-jpa-2 spring-jdbc @@ -101,4 +99,5 @@ 5.6.2 4.13 - + + \ No newline at end of file diff --git a/persistence-modules/querydsl/pom.xml b/persistence-modules/querydsl/pom.xml index a611c309b6..c4b01d787c 100644 --- a/persistence-modules/querydsl/pom.xml +++ b/persistence-modules/querydsl/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 querydsl 0.1-SNAPSHOT @@ -20,14 +21,12 @@ querydsl-jpa ${querydsl.version} - com.querydsl querydsl-apt ${querydsl.version} provided - org.hibernate @@ -35,14 +34,12 @@ ${hibernate.version} compile - org.hibernate.javax.persistence hibernate-jpa-2.1-api ${hibernate-jpa.version} compile - commons-dbcp commons-dbcp @@ -50,7 +47,6 @@ jar compile - commons-pool commons-pool @@ -58,14 +54,12 @@ jar compile - org.hsqldb hsqldb ${hsqldb.version} - org.springframework @@ -78,13 +72,11 @@ - org.springframework spring-webmvc ${spring.version} - org.springframework spring-orm @@ -92,13 +84,11 @@ jar compile - org.springframework spring-aop ${spring.version} - org.springframework spring-test @@ -121,7 +111,6 @@ -proc:none - com.mysema.maven diff --git a/persistence-modules/r2dbc/pom.xml b/persistence-modules/r2dbc/pom.xml index 01f1b351cd..ae4ca4d91d 100644 --- a/persistence-modules/r2dbc/pom.xml +++ b/persistence-modules/r2dbc/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 com.baeldung.examples.r2dbc r2dbc @@ -14,7 +14,7 @@ parent-boot-2 0.0.1-SNAPSHOT ../../parent-boot-2 - + @@ -25,7 +25,6 @@ org.springframework.boot spring-boot-starter-validation - org.springframework.boot spring-boot-starter-test @@ -36,15 +35,12 @@ reactor-test test - - io.r2dbc r2dbc-h2 ${r2dbc-h2.version} - org.springframework.boot spring-boot-configuration-processor @@ -68,7 +64,6 @@ 0.8.1.RELEASE 1.4.200 - - + \ No newline at end of file diff --git a/persistence-modules/redis/pom.xml b/persistence-modules/redis/pom.xml index fa82bebc64..c407482788 100644 --- a/persistence-modules/redis/pom.xml +++ b/persistence-modules/redis/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 redis 0.1-SNAPSHOT @@ -19,17 +20,14 @@ org.springframework.boot spring-boot-starter - org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-data-redis - redis.clients jedis @@ -56,7 +54,7 @@ - + 0.6 3.13.1 3.3.0 @@ -64,4 +62,4 @@ - + \ No newline at end of file diff --git a/persistence-modules/sirix/pom.xml b/persistence-modules/sirix/pom.xml index da9695081c..85379dc566 100644 --- a/persistence-modules/sirix/pom.xml +++ b/persistence-modules/sirix/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/maven-v4_0_0.xsd"> 4.0.0 io.sirix sirix @@ -53,4 +53,4 @@ 6.1 - + \ No newline at end of file diff --git a/persistence-modules/solr/pom.xml b/persistence-modules/solr/pom.xml index fd993e0c67..de0bd5a4a2 100644 --- a/persistence-modules/solr/pom.xml +++ b/persistence-modules/solr/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 solr diff --git a/persistence-modules/spring-boot-mysql/pom.xml b/persistence-modules/spring-boot-mysql/pom.xml index 834d1d1e64..ed3f7d9279 100644 --- a/persistence-modules/spring-boot-mysql/pom.xml +++ b/persistence-modules/spring-boot-mysql/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-boot-mysql 0.1.0 @@ -39,7 +40,6 @@ 8.0.12 - - + \ No newline at end of file diff --git a/persistence-modules/spring-boot-persistence-2/pom.xml b/persistence-modules/spring-boot-persistence-2/pom.xml index ca6ec93340..b51ab17659 100644 --- a/persistence-modules/spring-boot-persistence-2/pom.xml +++ b/persistence-modules/spring-boot-persistence-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 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung.boot.persistence spring-boot-persistence-2 @@ -31,13 +31,11 @@ pom import - org.jdbi jdbi3-spring4 ${jdbi.version} - org.jdbi jdbi3-sqlobject @@ -51,22 +49,18 @@ org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-data-jpa - org.jdbi jdbi3-spring4 - org.jdbi jdbi3-sqlobject - org.springframework.boot spring-boot-devtools @@ -93,23 +87,19 @@ spring-boot-starter-test test - com.mchange c3p0 ${c3p0.version} - org.apache.commons commons-dbcp2 - org.apache.tomcat tomcat-jdbc - mysql mysql-connector-java @@ -126,7 +116,6 @@ org.hsqldb hsqldb - com.oracle.database.jdbc ojdbc8 @@ -160,4 +149,4 @@ 19.6.0.0 - + \ No newline at end of file diff --git a/persistence-modules/spring-boot-persistence-h2/pom.xml b/persistence-modules/spring-boot-persistence-h2/pom.xml index c06c35cfee..023e20837b 100644 --- a/persistence-modules/spring-boot-persistence-h2/pom.xml +++ b/persistence-modules/spring-boot-persistence-h2/pom.xml @@ -1,7 +1,7 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung.h2db spring-boot-persistence-h2 @@ -46,7 +46,6 @@ com.baeldung.h2db.demo.server.SpringBootApp 1.0.4 - - + \ No newline at end of file diff --git a/persistence-modules/spring-boot-persistence-mongodb/pom.xml b/persistence-modules/spring-boot-persistence-mongodb/pom.xml index 5167483aa3..724fa38f7e 100644 --- a/persistence-modules/spring-boot-persistence-mongodb/pom.xml +++ b/persistence-modules/spring-boot-persistence-mongodb/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-boot-persistence-mongodb spring-boot-persistence-mongodb @@ -36,6 +36,4 @@ - - \ No newline at end of file diff --git a/persistence-modules/spring-boot-persistence/pom.xml b/persistence-modules/spring-boot-persistence/pom.xml index 9e44a7b9c1..deac0c2a57 100644 --- a/persistence-modules/spring-boot-persistence/pom.xml +++ b/persistence-modules/spring-boot-persistence/pom.xml @@ -78,4 +78,4 @@ 2.0.1.Final - + \ No newline at end of file diff --git a/persistence-modules/spring-data-cassandra-reactive/pom.xml b/persistence-modules/spring-data-cassandra-reactive/pom.xml index f2f71bceac..630e13583b 100644 --- a/persistence-modules/spring-data-cassandra-reactive/pom.xml +++ b/persistence-modules/spring-data-cassandra-reactive/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-data-cassandra-reactive @@ -56,4 +57,4 @@ - + \ No newline at end of file diff --git a/persistence-modules/spring-data-cassandra/pom.xml b/persistence-modules/spring-data-cassandra/pom.xml index 9de1cbf20e..e43e3821ae 100644 --- a/persistence-modules/spring-data-cassandra/pom.xml +++ b/persistence-modules/spring-data-cassandra/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-data-cassandra spring-data-cassandra @@ -107,4 +108,4 @@ - + \ No newline at end of file diff --git a/persistence-modules/spring-data-cosmosdb/pom.xml b/persistence-modules/spring-data-cosmosdb/pom.xml index 2eb6a6b038..30dc4f999c 100644 --- a/persistence-modules/spring-data-cosmosdb/pom.xml +++ b/persistence-modules/spring-data-cosmosdb/pom.xml @@ -6,17 +6,14 @@ spring-data-cosmosdb spring-data-cosmosdb tutorial for spring-data-cosmosdb + com.baeldung parent-boot-2 0.0.1-SNAPSHOT ../../parent-boot-2 - - - 2.3.0 - - + org.springframework.boot @@ -37,7 +34,7 @@ lombok - + @@ -47,4 +44,8 @@ - + + 2.3.0 + + + \ No newline at end of file diff --git a/persistence-modules/spring-data-couchbase-2/pom.xml b/persistence-modules/spring-data-couchbase-2/pom.xml index 0a20a3ff0e..c860f809fd 100644 --- a/persistence-modules/spring-data-couchbase-2/pom.xml +++ b/persistence-modules/spring-data-couchbase-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 com.baeldung spring-data-couchbase-2 @@ -38,20 +38,17 @@ spring-data-couchbase ${spring-data-couchbase.version} - org.hibernate hibernate-validator ${hibernate-validator.version} - joda-time joda-time ${joda-time.version} - org.springframework @@ -79,4 +76,4 @@ 3.0.0 - + \ No newline at end of file diff --git a/persistence-modules/spring-data-dynamodb/pom.xml b/persistence-modules/spring-data-dynamodb/pom.xml index 377e35b635..28127179c2 100644 --- a/persistence-modules/spring-data-dynamodb/pom.xml +++ b/persistence-modules/spring-data-dynamodb/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-data-dynamodb spring-data-dynamodb @@ -184,4 +185,4 @@ 3.1.1 - + \ No newline at end of file diff --git a/persistence-modules/spring-data-eclipselink/pom.xml b/persistence-modules/spring-data-eclipselink/pom.xml index 4ae43de07a..a344d64864 100644 --- a/persistence-modules/spring-data-eclipselink/pom.xml +++ b/persistence-modules/spring-data-eclipselink/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-data-eclipselink spring-data-eclipselink @@ -67,4 +68,4 @@ 2.7.0 - + \ No newline at end of file diff --git a/persistence-modules/spring-data-elasticsearch/pom.xml b/persistence-modules/spring-data-elasticsearch/pom.xml index 6a983145ee..7e91a5b15c 100644 --- a/persistence-modules/spring-data-elasticsearch/pom.xml +++ b/persistence-modules/spring-data-elasticsearch/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 spring-data-elasticsearch spring-data-elasticsearch @@ -18,31 +19,26 @@ spring-web ${spring.version} - org.springframework.data spring-data-elasticsearch ${spring-data-elasticsearch.version} - org.elasticsearch elasticsearch ${elasticsearch.version} - com.alibaba fastjson ${fastjson.version} - org.locationtech.spatial4j spatial4j ${spatial4j.version} - org.locationtech.jts jts-core @@ -54,7 +50,6 @@ - org.springframework spring-test @@ -70,4 +65,5 @@ 0.7 1.15.0 + \ No newline at end of file diff --git a/persistence-modules/spring-data-gemfire/pom.xml b/persistence-modules/spring-data-gemfire/pom.xml index a0cc4d5360..53ce67fb6d 100644 --- a/persistence-modules/spring-data-gemfire/pom.xml +++ b/persistence-modules/spring-data-gemfire/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-data-gemfire spring-data-gemfire @@ -18,7 +19,6 @@ spring-data-gemfire ${spring-data-gemfire-version} - com.gemstone.gemfire gemfire @@ -30,7 +30,6 @@ google-collections ${google-collections-version} - org.springframework spring-context diff --git a/persistence-modules/spring-data-geode/pom.xml b/persistence-modules/spring-data-geode/pom.xml index ebdb37299e..0673701f42 100644 --- a/persistence-modules/spring-data-geode/pom.xml +++ b/persistence-modules/spring-data-geode/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-data-geode spring-data-geode @@ -41,7 +42,6 @@ spring-geode-starter ${spring-geode-starter-version} - org.springframework.boot spring-boot-autoconfigure diff --git a/persistence-modules/spring-data-jdbc/pom.xml b/persistence-modules/spring-data-jdbc/pom.xml index 15f8d7fb95..2672405dd6 100644 --- a/persistence-modules/spring-data-jdbc/pom.xml +++ b/persistence-modules/spring-data-jdbc/pom.xml @@ -1,32 +1,30 @@ - 4.0.0 - - com.baeldung - parent-boot-2 - 0.0.1-SNAPSHOT - ../../parent-boot-2 - - spring-data-jdbc - spring-data-jdbc + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../../parent-boot-2 + + spring-data-jdbc + spring-data-jdbc - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-data-jdbc - - - com.h2database - h2 - runtime - - + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-data-jdbc + + + com.h2database + h2 + runtime + + - - - + \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-annotations/pom.xml b/persistence-modules/spring-data-jpa-annotations/pom.xml index ff30790eaf..113d6e5dc6 100644 --- a/persistence-modules/spring-data-jpa-annotations/pom.xml +++ b/persistence-modules/spring-data-jpa-annotations/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-data-jpa-annotations @@ -25,12 +26,10 @@ org.hibernate hibernate-envers - com.h2database h2 - org.testcontainers @@ -38,13 +37,11 @@ ${testcontainers.postgresql.version} test - org.postgresql postgresql - org.springframework.security spring-security-test @@ -59,7 +56,6 @@ spring-boot-starter-test test - com.google.guava guava @@ -72,7 +68,6 @@ 1.10.6 42.2.5 21.0 - \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-crud/pom.xml b/persistence-modules/spring-data-jpa-crud/pom.xml index 16ee74aa62..8f9a3cc0e8 100644 --- a/persistence-modules/spring-data-jpa-crud/pom.xml +++ b/persistence-modules/spring-data-jpa-crud/pom.xml @@ -1,7 +1,7 @@ 4.0.0 spring-data-jpa-crud @@ -47,7 +47,6 @@ h2 runtime - org.testcontainers @@ -64,4 +63,4 @@ 1.12.2 - + \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-enterprise/pom.xml b/persistence-modules/spring-data-jpa-enterprise/pom.xml index 12ffeee7f0..4367a11222 100644 --- a/persistence-modules/spring-data-jpa-enterprise/pom.xml +++ b/persistence-modules/spring-data-jpa-enterprise/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 spring-data-jpa-enterprise @@ -12,58 +13,49 @@ 0.0.1-SNAPSHOT ../../parent-boot-2 - + org.springframework.boot spring-boot-starter-web - org.springframework.boot spring-boot-starter-data-jpa - org.springframework.boot spring-boot-starter-data-jdbc - org.springframework.boot spring-boot-starter-cache - com.h2database h2 - - + org.hibernate hibernate-envers - com.google.guava guava ${guava.version} - org.mapstruct mapstruct-jdk8 ${mapstruct.version} provided - org.springframework.security spring-security-test test - - + org.testcontainers postgresql @@ -100,4 +92,4 @@ 1.12.2 - + \ No newline at end of file diff --git a/persistence-modules/spring-data-jpa-filtering/pom.xml b/persistence-modules/spring-data-jpa-filtering/pom.xml index 25ef68fe4c..038fd24723 100644 --- a/persistence-modules/spring-data-jpa-filtering/pom.xml +++ b/persistence-modules/spring-data-jpa-filtering/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 spring-data-jpa-filtering @@ -25,12 +26,10 @@ org.hibernate hibernate-envers - com.h2database h2 - org.testcontainers @@ -38,13 +37,11 @@ ${testcontainers.postgresql.version} test - org.postgresql postgresql - org.springframework.security spring-security-test @@ -59,7 +56,6 @@ spring-boot-starter-test test - com.google.guava guava @@ -72,7 +68,6 @@ 1.10.6 42.2.5 21.0 - \ No newline at end of file