From c5d8eec033f41c09c6f6831d3183483e6933fe54 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 14 Jun 2016 11:47:05 +0100 Subject: [PATCH] Verify that starters do not pull in duplicate classes and resources Closes gh-6163 --- spring-boot-starters/pom.xml | 17 ++++++++++ .../spring-boot-starter-batch/pom.xml | 33 +++++++++++++++++++ .../pom.xml | 22 +++++++++++++ .../pom.xml | 25 ++++++++++++++ .../spring-boot-starter-data-gemfire/pom.xml | 22 +++++++++++++ .../spring-boot-starter-data-jpa/pom.xml | 22 +++++++++++++ .../spring-boot-starter-data-redis/pom.xml | 22 +++++++++++++ .../spring-boot-starter-data-rest/pom.xml | 22 +++++++++++++ .../spring-boot-starter-data-solr/pom.xml | 22 +++++++++++++ .../spring-boot-starter-hornetq/pom.xml | 22 +++++++++++++ .../spring-boot-starter-jersey/pom.xml | 23 +++++++++++++ .../spring-boot-starter-jetty/pom.xml | 22 +++++++++++++ .../spring-boot-starter-redis/pom.xml | 22 +++++++++++++ .../spring-boot-starter-remote-shell/pom.xml | 22 +++++++++++++ .../spring-boot-starter-test/pom.xml | 33 +++++++++++++++++++ 15 files changed, 351 insertions(+) diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml index afbe766a16..a34be3c49d 100644 --- a/spring-boot-starters/pom.xml +++ b/spring-boot-starters/pom.xml @@ -143,6 +143,23 @@ true + + org.basepom.maven + duplicate-finder-maven-plugin + 1.2.1 + + + duplicate-dependencies + validate + + check + + + true + + + + diff --git a/spring-boot-starters/spring-boot-starter-batch/pom.xml b/spring-boot-starters/spring-boot-starter-batch/pom.xml index 99ffc0f5b3..4afbc65411 100644 --- a/spring-boot-starters/spring-boot-starter-batch/pom.xml +++ b/spring-boot-starters/spring-boot-starter-batch/pom.xml @@ -35,4 +35,37 @@ spring-batch-core + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + + + + xpp3 + xpp3_min + + + xmlpull + xmlpull + + + + + + + + + + diff --git a/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml b/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml index 6e4326a727..932f409cdc 100644 --- a/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-couchbase/pom.xml @@ -30,4 +30,26 @@ spring-data-couchbase + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + changelog.txt + + + + + + + diff --git a/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml b/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml index be03101365..5368134ae6 100644 --- a/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml @@ -28,4 +28,29 @@ spring-data-elasticsearch + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + org.joda.time.base.BaseDateTime + + + changelog.txt + + + + + + + diff --git a/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml b/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml index 67b6860675..61612d9827 100644 --- a/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml @@ -46,4 +46,26 @@ + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + changelog.txt + + + + + + + diff --git a/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml index 5ed6d10a2e..4a20446381 100644 --- a/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-jpa/pom.xml @@ -59,4 +59,26 @@ spring-aspects + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + changelog.txt + + + + + + + diff --git a/spring-boot-starters/spring-boot-starter-data-redis/pom.xml b/spring-boot-starters/spring-boot-starter-data-redis/pom.xml index d7d1a6b93d..d69b2264ad 100644 --- a/spring-boot-starters/spring-boot-starter-data-redis/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-redis/pom.xml @@ -32,4 +32,26 @@ jedis + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + changelog.txt + + + + + + + diff --git a/spring-boot-starters/spring-boot-starter-data-rest/pom.xml b/spring-boot-starters/spring-boot-starter-data-rest/pom.xml index 05978bb5a6..4d84873804 100644 --- a/spring-boot-starters/spring-boot-starter-data-rest/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-rest/pom.xml @@ -40,4 +40,26 @@ spring-data-rest-webmvc + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + changelog.txt + + + + + + + diff --git a/spring-boot-starters/spring-boot-starter-data-solr/pom.xml b/spring-boot-starters/spring-boot-starter-data-solr/pom.xml index ffee42f6d6..fd65cf0300 100644 --- a/spring-boot-starters/spring-boot-starter-data-solr/pom.xml +++ b/spring-boot-starters/spring-boot-starter-data-solr/pom.xml @@ -42,4 +42,26 @@ httpmime + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + changelog.txt + + + + + + + diff --git a/spring-boot-starters/spring-boot-starter-hornetq/pom.xml b/spring-boot-starters/spring-boot-starter-hornetq/pom.xml index a11bd6448a..d173c89ca0 100644 --- a/spring-boot-starters/spring-boot-starter-hornetq/pom.xml +++ b/spring-boot-starters/spring-boot-starter-hornetq/pom.xml @@ -32,4 +32,26 @@ hornetq-jms-client + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + org/hornetq/utils.HornetQUtil(Bundle|Logger).i18n.properties + + + + + + + diff --git a/spring-boot-starters/spring-boot-starter-jersey/pom.xml b/spring-boot-starters/spring-boot-starter-jersey/pom.xml index 8de2c93bba..f7770b7748 100644 --- a/spring-boot-starters/spring-boot-starter-jersey/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jersey/pom.xml @@ -80,4 +80,27 @@ jersey-media-json-jackson + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + org.aopalliance.* + javax.annotation.* + + + + + + + diff --git a/spring-boot-starters/spring-boot-starter-jetty/pom.xml b/spring-boot-starters/spring-boot-starter-jetty/pom.xml index fb35c33065..bf54478d93 100644 --- a/spring-boot-starters/spring-boot-starter-jetty/pom.xml +++ b/spring-boot-starters/spring-boot-starter-jetty/pom.xml @@ -42,4 +42,26 @@ + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + about.html + + + + + + + diff --git a/spring-boot-starters/spring-boot-starter-redis/pom.xml b/spring-boot-starters/spring-boot-starter-redis/pom.xml index 6e699543fb..3d61ae64df 100644 --- a/spring-boot-starters/spring-boot-starter-redis/pom.xml +++ b/spring-boot-starters/spring-boot-starter-redis/pom.xml @@ -32,4 +32,26 @@ jedis + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + changelog.txt + + + + + + + diff --git a/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml b/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml index 394f99b8c1..ac17a11dcf 100644 --- a/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml +++ b/spring-boot-starters/spring-boot-starter-remote-shell/pom.xml @@ -117,4 +117,26 @@ javax.mail + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + crash/crash.properties + + + + + + + diff --git a/spring-boot-starters/spring-boot-starter-test/pom.xml b/spring-boot-starters/spring-boot-starter-test/pom.xml index 588d48e00e..c611234f84 100644 --- a/spring-boot-starters/spring-boot-starter-test/pom.xml +++ b/spring-boot-starters/spring-boot-starter-test/pom.xml @@ -70,4 +70,37 @@ spring-test + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + duplicate-dependencies + validate + + check + + + + + + + org.ow2.asm + asm + + + net.minidev + accessors-smart + + + + + + + + + +