From 8edf88a08be909a748cfd4f0f0c479e835c7f8a1 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 27 Jun 2019 09:42:14 -0700 Subject: [PATCH] Polish M2Eclipse ignore configuration Pull all M2Eclipse ignore configuration up to the parent POM and increase the version ranges covered. --- pom.xml | 147 ++++++++++++++-- spring-boot-project/spring-boot-cli/pom.xml | 35 ---- .../spring-boot-parent/pom.xml | 166 ------------------ .../spring-boot-starter-parent/pom.xml | 51 ------ spring-boot-smoke-tests/pom.xml | 49 ------ .../pom.xml | 28 --- .../pom.xml | 28 --- .../spring-boot-smoke-test-jooq/pom.xml | 34 ---- .../spring-boot-devtools-tests/pom.xml | 28 --- 9 files changed, 137 insertions(+), 429 deletions(-) diff --git a/pom.xml b/pom.xml index d2ce07181f..2b5523fcf6 100644 --- a/pom.xml +++ b/pom.xml @@ -226,22 +226,149 @@ - - org.jetbrains.kotlin - - - kotlin-maven-plugin - - - [1.1.51,) - + org.apache.maven.plugins + maven-checkstyle-plugin + [1,) + + check + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [1,) + + copy + copy-dependencies + unpack + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [1,) + + enforce + + + + + + + + + org.apache.maven.plugins + maven-invoker-plugin + [1,) + + install + + + + + + + + + org.apache.maven.plugins + maven-plugin-plugin + [1,) + + descriptor + helpmojo + + + + + + + + + org.basepom.maven + duplicate-finder-maven-plugin + [1,) + + check + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + [1,) + + reserve-network-port + + + + + + + + + org.codehaus.mojo + flatten-maven-plugin + [1,) + + flatten + + + + + + + + + org.jetbrains.kotlin + kotlin-maven-plugin + [1,) compile test-compile - + + + + + + org.jooq + jooq-codegen-maven + [1,) + + generate + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + [1,) + + build-info + + + + diff --git a/spring-boot-project/spring-boot-cli/pom.xml b/spring-boot-project/spring-boot-cli/pom.xml index c8f1db8dda..19dd28df81 100644 --- a/spring-boot-project/spring-boot-cli/pom.xml +++ b/spring-boot-project/spring-boot-cli/pom.xml @@ -436,41 +436,6 @@ - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-dependency-plugin - - - [1.0.0,) - - - unpack - copy-dependencies - - - - - - - - - - - - diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml index 7a9d780cb6..29611d2eae 100644 --- a/spring-boot-project/spring-boot-parent/pom.xml +++ b/spring-boot-project/spring-boot-parent/pom.xml @@ -359,172 +359,6 @@ sonar-maven-plugin 3.3.0.603 - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.basepom.maven - duplicate-finder-maven-plugin - [1,2) - - check - - - - - - - - - - org.apache.maven.plugins - - - maven-enforcer-plugin - - - [1.3.1,) - - - enforce - - - - - - - - - - org.apache.maven.plugins - - - maven-dependency-plugin - - - [2.8,) - - - copy - - - - - - - - - - org.apache.maven.plugins - - - maven-plugin-plugin - - - [3.2,) - - - descriptor - helpmojo - - - - - - - - - - org.codehaus.mojo - - - build-helper-maven-plugin - - - [1.9.1,) - - - - reserve-network-port - - - - - - - - - - - org.apache.maven.plugins - - - maven-checkstyle-plugin - - - [2.16,) - - - - check - - - - - - - - - - - org.apache.maven.plugins - - - maven-invoker-plugin - - - [1.0.0,) - - - - install - - - - - - - - - - - org.codehaus.mojo - - - flatten-maven-plugin - - - [1.0.0,) - - - flatten - - - - - - - - - - diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml index de1caf230f..23b32d80e7 100644 --- a/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml +++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-parent/pom.xml @@ -223,57 +223,6 @@ - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.codehaus.mojo - - - flatten-maven-plugin - - - [1.0.0,) - - - flatten - - - - - - - - - - org.apache.maven.plugins - - - maven-checkstyle-plugin - - - [3.0.0,) - - - check - - - - - - - - - - diff --git a/spring-boot-smoke-tests/pom.xml b/spring-boot-smoke-tests/pom.xml index 8ee30bd110..4e1ab147e5 100644 --- a/spring-boot-smoke-tests/pom.xml +++ b/spring-boot-smoke-tests/pom.xml @@ -126,55 +126,6 @@ - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-enforcer-plugin - - - [1.3.1,) - - - enforce - - - - - - - - - - org.springframework.boot - - - spring-boot-maven-plugin - - - [1.4.0.BUILD-SNAPSHOT,) - - - build-info - - - - - - - - - - diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/pom.xml b/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/pom.xml index 8169a9d93d..44660693ae 100644 --- a/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/pom.xml +++ b/spring-boot-smoke-tests/spring-boot-smoke-test-custom-layout/pom.xml @@ -82,33 +82,5 @@ maven-failsafe-plugin - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [2.10,) - - copy - - - - - - - - - - - - diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/pom.xml b/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/pom.xml index 0c22ddd0c4..bb274c13cb 100644 --- a/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/pom.xml +++ b/spring-boot-smoke-tests/spring-boot-smoke-test-data-cassandra/pom.xml @@ -80,34 +80,6 @@ spring-boot-maven-plugin - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.codehaus.mojo - build-helper-maven-plugin - [1.9.1,) - - reserve-network-port - - - - - - - - - - - - diff --git a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/pom.xml b/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/pom.xml index 2fe1b1d72e..9e17af7bd9 100644 --- a/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/pom.xml +++ b/spring-boot-smoke-tests/spring-boot-smoke-test-jooq/pom.xml @@ -63,40 +63,6 @@ spring-boot-maven-plugin - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.jooq - - jooq-codegen-maven - - - [3.6.2,) - - - generate - - - - - - - - - - - - diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml b/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml index a597162898..e6a48093f9 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/pom.xml @@ -58,33 +58,5 @@ - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-dependency-plugin - [2.10,) - - copy-dependencies - - - - - - - - - - - -