This is an automated email from the ASF dual-hosted git repository. khmarbaise pushed a commit to branch IMPROVEMENT in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit 16d0a567e7c501a1837ca14533c4bd665e59ceb7 Author: Karl Heinz Marbaise <khmarba...@apache.org> AuthorDate: Sun Feb 24 20:52:36 2019 +0100 Simplyfied configuration for JDK 7 for all integration tests. --- maven-enforcer-plugin/pom.xml | 2 + .../src/it/projects/always-fail-warn/pom.xml | 7 ---- .../src/it/projects/always-fail/pom.xml | 7 ---- .../src/it/projects/always-pass/pom.xml | 7 ---- .../pom.xml | 9 +---- .../pom.xml | 9 +---- .../projects/ban-distribution-management/pom.xml | 7 ---- .../pom.xml | 7 ---- .../it/projects/ban-pom-dependency-version/pom.xml | 11 +----- .../ban-transitive-dependencies-fail/pom.xml | 11 +----- .../projects/ban-transitive-dependencies/pom.xml | 11 +----- .../banned-dependencies-versionrange-fail/pom.xml | 9 +---- .../banned-dependencies-versionrange/pom.xml | 9 +---- .../projects/banned-dependencies-wildcards/pom.xml | 9 +---- .../src/it/projects/banned-dependencies/pom.xml | 7 ---- .../src/it/projects/banned-plugins/pom.xml | 7 ---- .../it/projects/builds_a_pom_noop/module/pom.xml | 3 +- .../src/it/projects/builds_a_pom_noop/pom.xml | 10 +---- .../src/it/projects/cli-always-fail/pom.xml | 7 ---- .../src/it/projects/cli-always-pass/pom.xml | 7 ---- .../projects/dependencies_converge/module/pom.xml | 3 +- .../src/it/projects/dependencies_converge/pom.xml | 10 +---- .../dependencies_not_converging/module/pom.xml | 3 +- .../projects/dependencies_not_converging/pom.xml | 10 +---- .../module/pom.xml | 3 +- .../dependencies_not_converging_test_scope/pom.xml | 12 +----- .../src/it/projects/display-info/pom.xml | 7 ---- .../src/it/projects/evaluate-beanshell/pom.xml | 14 ------- .../src/it/projects/multimodule/pom.xml | 9 +---- .../it/projects/require-active-profile-all/pom.xml | 7 ---- .../require-active-profile-from-settings/pom.xml | 7 ---- .../src/it/projects/require-active-profile/pom.xml | 7 ---- .../src/it/projects/require-file-checksum/pom.xml | 15 +------- .../it/projects/require-files-dont-exist/pom.xml | 7 ---- .../src/it/projects/require-files-exist/pom.xml | 7 ---- .../src/it/projects/require-files-size/pom.xml | 14 ------- .../src/it/projects/require-java-version/pom.xml | 7 ---- .../src/it/projects/require-maven-version/pom.xml | 14 ------- .../pom.xml | 7 ---- .../require-no-repositories-allow-repo/pom.xml | 7 ---- .../it/projects/require-no-repositories/pom.xml | 7 ---- .../require-no-repositories_failure/pom.xml | 9 +---- .../pom.xml | 11 +----- .../pom.xml | 7 ---- .../pom.xml | 7 ---- .../it/projects/require-no-repositories_mm/pom.xml | 7 ---- .../projects/require-no-repositories_mm_ci/pom.xml | 7 ---- .../it/projects/require-plugin-versions-ci/pom.xml | 7 ---- .../pom.xml | 7 ---- .../require-plugin-versions-expressions/pom.xml | 45 +--------------------- .../require-plugin-versions-mm-ci-friendly/pom.xml | 15 +------- .../pom.xml | 10 +---- .../pom.xml | 14 +------ .../pom.xml | 17 +------- .../it/projects/require-plugin-versions/pom.xml | 8 ---- .../MENFORCER-322-module/pom.xml | 13 ++----- .../pom.xml | 11 +----- .../require-profile-ids-exist_failure/pom.xml | 9 +---- .../require-profile-ids-exist_success/pom.xml | 9 +---- .../src/it/projects/require-property/pom.xml | 14 ------- .../require-release-dependencies-excludes/pom.xml | 12 +----- .../pom.xml | 12 +----- .../projects/require-release-dependencies/pom.xml | 7 ---- .../it/projects/require-release-version/pom.xml | 7 ---- .../projects/require-same-versions_failure/pom.xml | 23 ++--------- .../projects/require-same-versions_success/pom.xml | 23 ++--------- .../require-snapshot-version_failure/pom.xml | 7 ---- .../require-snapshot-version_success/pom.xml | 7 ---- .../pom.xml | 10 +---- .../pom.xml | 10 +---- .../pom.xml | 12 +----- .../pom.xml | 12 +----- .../module/pom.xml | 3 +- .../require-upper-bound-deps_failure/pom.xml | 10 +---- .../module/pom.xml | 3 +- .../require-upper-bound-deps_ignored/pom.xml | 10 +---- .../module/pom.xml | 3 +- .../require-upper-bound-deps_success/pom.xml | 10 +---- .../projects/resolve_collect_dependencies/pom.xml | 9 +---- maven-enforcer-plugin/src/site/apt/index.apt | 4 -- pom.xml | 1 - 81 files changed, 66 insertions(+), 689 deletions(-) diff --git a/maven-enforcer-plugin/pom.xml b/maven-enforcer-plugin/pom.xml index 6729d40..0d2eda7 100644 --- a/maven-enforcer-plugin/pom.xml +++ b/maven-enforcer-plugin/pom.xml @@ -169,6 +169,8 @@ <properties> <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central --> <https.protocols>${https.protocols}</https.protocols> + <maven.compiler.source>${maven.compiler.source}</maven.compiler.source> + <maven.compiler.target>${maven.compiler.target}</maven.compiler.target> </properties> </configuration> <executions> diff --git a/maven-enforcer-plugin/src/it/projects/always-fail-warn/pom.xml b/maven-enforcer-plugin/src/it/projects/always-fail-warn/pom.xml index 7248ed1..0f809c6 100644 --- a/maven-enforcer-plugin/src/it/projects/always-fail-warn/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/always-fail-warn/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/always-fail/pom.xml b/maven-enforcer-plugin/src/it/projects/always-fail/pom.xml index dd5c5d8..53c77c8 100644 --- a/maven-enforcer-plugin/src/it/projects/always-fail/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/always-fail/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/always-pass/pom.xml b/maven-enforcer-plugin/src/it/projects/always-pass/pom.xml index ac20d20..2375f8c 100644 --- a/maven-enforcer-plugin/src/it/projects/always-pass/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/always-pass/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/ban-distribution-management-multi-module-build/pom.xml b/maven-enforcer-plugin/src/it/projects/ban-distribution-management-multi-module-build/pom.xml index 1e9e160..3c4a0a4 100644 --- a/maven-enforcer-plugin/src/it/projects/ban-distribution-management-multi-module-build/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/ban-distribution-management-multi-module-build/pom.xml @@ -41,13 +41,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -67,7 +60,7 @@ under the License. </plugin> </plugins> </build> - + <modules> <module>module1</module> <module>module2</module> diff --git a/maven-enforcer-plugin/src/it/projects/ban-distribution-management-multi-module-except-site/pom.xml b/maven-enforcer-plugin/src/it/projects/ban-distribution-management-multi-module-except-site/pom.xml index 8cc2a34..b7b4db6 100644 --- a/maven-enforcer-plugin/src/it/projects/ban-distribution-management-multi-module-except-site/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/ban-distribution-management-multi-module-except-site/pom.xml @@ -38,13 +38,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -66,7 +59,7 @@ under the License. </plugin> </plugins> </build> - + <modules> <module>module1</module> <module>module2</module> diff --git a/maven-enforcer-plugin/src/it/projects/ban-distribution-management/pom.xml b/maven-enforcer-plugin/src/it/projects/ban-distribution-management/pom.xml index 30958ba..304aa5e 100644 --- a/maven-enforcer-plugin/src/it/projects/ban-distribution-management/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/ban-distribution-management/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version-utf8-with-bom/pom.xml b/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version-utf8-with-bom/pom.xml index a4a45e9..125f87e 100644 --- a/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version-utf8-with-bom/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version-utf8-with-bom/pom.xml @@ -29,13 +29,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/pom.xml b/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/pom.xml index c4e18ed..95c345a 100644 --- a/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/pom.xml @@ -29,13 +29,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -61,12 +54,12 @@ under the License. <groupId>org.apache.maven.plugins.enforcer.its</groupId> <artifactId>menforcer152</artifactId> <version>1.0</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.maven.plugins.enforcer.its</groupId> <artifactId>menforcer152</artifactId> <version>1.0</version> - </dependency> + </dependency> </dependencies> </project> diff --git a/maven-enforcer-plugin/src/it/projects/ban-transitive-dependencies-fail/pom.xml b/maven-enforcer-plugin/src/it/projects/ban-transitive-dependencies-fail/pom.xml index 6f53191..071260e 100644 --- a/maven-enforcer-plugin/src/it/projects/ban-transitive-dependencies-fail/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/ban-transitive-dependencies-fail/pom.xml @@ -29,13 +29,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -66,12 +59,12 @@ under the License. <groupId>org.apache.maven.plugins.enforcer.its</groupId> <artifactId>menforcer138_archiver</artifactId> <version>2.1.1</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.maven.plugins.enforcer.its</groupId> <artifactId>menforcer138_utils</artifactId> <version>3.0</version> - </dependency> + </dependency> </dependencies> </project> diff --git a/maven-enforcer-plugin/src/it/projects/ban-transitive-dependencies/pom.xml b/maven-enforcer-plugin/src/it/projects/ban-transitive-dependencies/pom.xml index 178db3d..d83287a 100644 --- a/maven-enforcer-plugin/src/it/projects/ban-transitive-dependencies/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/ban-transitive-dependencies/pom.xml @@ -29,13 +29,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -66,12 +59,12 @@ under the License. <groupId>org.apache.maven.plugins.enforcer.its</groupId> <artifactId>menforcer138_archiver</artifactId> <version>2.1.1</version> - </dependency> + </dependency> <dependency> <groupId>org.apache.maven.plugins.enforcer.its</groupId> <artifactId>menforcer138_utils</artifactId> <version>3.0</version> - </dependency> + </dependency> </dependencies> </project> diff --git a/maven-enforcer-plugin/src/it/projects/banned-dependencies-versionrange-fail/pom.xml b/maven-enforcer-plugin/src/it/projects/banned-dependencies-versionrange-fail/pom.xml index 8cd0b6e..c07f134 100644 --- a/maven-enforcer-plugin/src/it/projects/banned-dependencies-versionrange-fail/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/banned-dependencies-versionrange-fail/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -63,7 +56,7 @@ under the License. </plugin> </plugins> </build> - + <dependencies> <dependency> <groupId>org.apache.maven.plugins.enforcer.its</groupId> diff --git a/maven-enforcer-plugin/src/it/projects/banned-dependencies-versionrange/pom.xml b/maven-enforcer-plugin/src/it/projects/banned-dependencies-versionrange/pom.xml index 709ffe1..d934fa6 100644 --- a/maven-enforcer-plugin/src/it/projects/banned-dependencies-versionrange/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/banned-dependencies-versionrange/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -65,7 +58,7 @@ under the License. </plugin> </plugins> </build> - + <dependencies> <dependency> <groupId>org.apache.maven.plugins.enforcer.its</groupId> diff --git a/maven-enforcer-plugin/src/it/projects/banned-dependencies-wildcards/pom.xml b/maven-enforcer-plugin/src/it/projects/banned-dependencies-wildcards/pom.xml index 996b9cd..563631e 100644 --- a/maven-enforcer-plugin/src/it/projects/banned-dependencies-wildcards/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/banned-dependencies-wildcards/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -65,7 +58,7 @@ under the License. </plugin> </plugins> </build> - + <dependencies> <dependency> <groupId>org.apache.maven.plugins.enforcer.its</groupId> diff --git a/maven-enforcer-plugin/src/it/projects/banned-dependencies/pom.xml b/maven-enforcer-plugin/src/it/projects/banned-dependencies/pom.xml index e49b448..8fd7fc5 100644 --- a/maven-enforcer-plugin/src/it/projects/banned-dependencies/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/banned-dependencies/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/banned-plugins/pom.xml b/maven-enforcer-plugin/src/it/projects/banned-plugins/pom.xml index 9c453c3..7a59cd8 100644 --- a/maven-enforcer-plugin/src/it/projects/banned-plugins/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/banned-plugins/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/builds_a_pom_noop/module/pom.xml b/maven-enforcer-plugin/src/it/projects/builds_a_pom_noop/module/pom.xml index 207abf2..f0dfcfd 100644 --- a/maven-enforcer-plugin/src/it/projects/builds_a_pom_noop/module/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/builds_a_pom_noop/module/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>test</groupId> diff --git a/maven-enforcer-plugin/src/it/projects/builds_a_pom_noop/pom.xml b/maven-enforcer-plugin/src/it/projects/builds_a_pom_noop/pom.xml index d173d8c..0ffa71b 100644 --- a/maven-enforcer-plugin/src/it/projects/builds_a_pom_noop/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/builds_a_pom_noop/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>test</groupId> <artifactId>TestParent</artifactId> @@ -28,13 +27,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/cli-always-fail/pom.xml b/maven-enforcer-plugin/src/it/projects/cli-always-fail/pom.xml index 6e1a578..0915303 100644 --- a/maven-enforcer-plugin/src/it/projects/cli-always-fail/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/cli-always-fail/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/cli-always-pass/pom.xml b/maven-enforcer-plugin/src/it/projects/cli-always-pass/pom.xml index ac20d20..2375f8c 100644 --- a/maven-enforcer-plugin/src/it/projects/cli-always-pass/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/cli-always-pass/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/dependencies_converge/module/pom.xml b/maven-enforcer-plugin/src/it/projects/dependencies_converge/module/pom.xml index 207abf2..f0dfcfd 100644 --- a/maven-enforcer-plugin/src/it/projects/dependencies_converge/module/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/dependencies_converge/module/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>test</groupId> diff --git a/maven-enforcer-plugin/src/it/projects/dependencies_converge/pom.xml b/maven-enforcer-plugin/src/it/projects/dependencies_converge/pom.xml index 81b2188..5cb6be3 100644 --- a/maven-enforcer-plugin/src/it/projects/dependencies_converge/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/dependencies_converge/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>test</groupId> <artifactId>TestParent</artifactId> @@ -46,13 +45,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/dependencies_not_converging/module/pom.xml b/maven-enforcer-plugin/src/it/projects/dependencies_not_converging/module/pom.xml index edc6928..6d2c1bb 100644 --- a/maven-enforcer-plugin/src/it/projects/dependencies_not_converging/module/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/dependencies_not_converging/module/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>test</groupId> diff --git a/maven-enforcer-plugin/src/it/projects/dependencies_not_converging/pom.xml b/maven-enforcer-plugin/src/it/projects/dependencies_not_converging/pom.xml index a4adeae..a33316a 100644 --- a/maven-enforcer-plugin/src/it/projects/dependencies_not_converging/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/dependencies_not_converging/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>test</groupId> <artifactId>TestParent</artifactId> @@ -40,13 +39,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/dependencies_not_converging_test_scope/module/pom.xml b/maven-enforcer-plugin/src/it/projects/dependencies_not_converging_test_scope/module/pom.xml index edc6928..6d2c1bb 100644 --- a/maven-enforcer-plugin/src/it/projects/dependencies_not_converging_test_scope/module/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/dependencies_not_converging_test_scope/module/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>test</groupId> diff --git a/maven-enforcer-plugin/src/it/projects/dependencies_not_converging_test_scope/pom.xml b/maven-enforcer-plugin/src/it/projects/dependencies_not_converging_test_scope/pom.xml index 8c8e944..223aa9a 100644 --- a/maven-enforcer-plugin/src/it/projects/dependencies_not_converging_test_scope/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/dependencies_not_converging_test_scope/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>test</groupId> <artifactId>TestParent</artifactId> @@ -41,14 +40,7 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> <executions> diff --git a/maven-enforcer-plugin/src/it/projects/display-info/pom.xml b/maven-enforcer-plugin/src/it/projects/display-info/pom.xml index be7ee8a..8746ad7 100644 --- a/maven-enforcer-plugin/src/it/projects/display-info/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/display-info/pom.xml @@ -27,13 +27,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> <executions> diff --git a/maven-enforcer-plugin/src/it/projects/evaluate-beanshell/pom.xml b/maven-enforcer-plugin/src/it/projects/evaluate-beanshell/pom.xml index 0bc3e38..fd6dcea 100644 --- a/maven-enforcer-plugin/src/it/projects/evaluate-beanshell/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/evaluate-beanshell/pom.xml @@ -32,20 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/multimodule/pom.xml b/maven-enforcer-plugin/src/it/projects/multimodule/pom.xml index ea872f4..6b45cb2 100644 --- a/maven-enforcer-plugin/src/it/projects/multimodule/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/multimodule/pom.xml @@ -30,13 +30,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -56,7 +49,7 @@ under the License. </plugin> </plugins> </build> - + <modules> <module>module1</module> <module>module2</module> diff --git a/maven-enforcer-plugin/src/it/projects/require-active-profile-all/pom.xml b/maven-enforcer-plugin/src/it/projects/require-active-profile-all/pom.xml index 97bedd2..c7082dd 100644 --- a/maven-enforcer-plugin/src/it/projects/require-active-profile-all/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-active-profile-all/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-active-profile-from-settings/pom.xml b/maven-enforcer-plugin/src/it/projects/require-active-profile-from-settings/pom.xml index fe0687b..bd9359b 100644 --- a/maven-enforcer-plugin/src/it/projects/require-active-profile-from-settings/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-active-profile-from-settings/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-active-profile/pom.xml b/maven-enforcer-plugin/src/it/projects/require-active-profile/pom.xml index 78557fd..b57cce6 100644 --- a/maven-enforcer-plugin/src/it/projects/require-active-profile/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-active-profile/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-file-checksum/pom.xml b/maven-enforcer-plugin/src/it/projects/require-file-checksum/pom.xml index 37d764f..46e5a44 100644 --- a/maven-enforcer-plugin/src/it/projects/require-file-checksum/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-file-checksum/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -68,16 +61,12 @@ under the License. <requireFileChecksum> <file>${project.basedir}/LICENSE</file> <type>sha384</type> - <checksum> - 6f9e6b81487911c5a339c541016a459acaf8312e430ccabe5c10cb2ddf9a307f4595c78555f911377f4fb853ffe87046 - </checksum> + <checksum>6f9e6b81487911c5a339c541016a459acaf8312e430ccabe5c10cb2ddf9a307f4595c78555f911377f4fb853ffe87046</checksum> </requireFileChecksum> <requireFileChecksum> <file>${project.basedir}/LICENSE</file> <type>sha512</type> - <checksum> - c51c3cf07c87af78dd7af4407ae3993ea1051d8a7c260cf34bbaa41c468dcd3b62d2be3d9a09807a8595d0065e2d75d1bf9ffc8276d567a983ff057f6b51b0cc - </checksum> + <checksum>c51c3cf07c87af78dd7af4407ae3993ea1051d8a7c260cf34bbaa41c468dcd3b62d2be3d9a09807a8595d0065e2d75d1bf9ffc8276d567a983ff057f6b51b0cc</checksum> </requireFileChecksum> </rules> </configuration> diff --git a/maven-enforcer-plugin/src/it/projects/require-files-dont-exist/pom.xml b/maven-enforcer-plugin/src/it/projects/require-files-dont-exist/pom.xml index 71f11f9..544c1a2 100644 --- a/maven-enforcer-plugin/src/it/projects/require-files-dont-exist/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-files-dont-exist/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-files-exist/pom.xml b/maven-enforcer-plugin/src/it/projects/require-files-exist/pom.xml index 1589933..ce4612c 100644 --- a/maven-enforcer-plugin/src/it/projects/require-files-exist/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-files-exist/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-files-size/pom.xml b/maven-enforcer-plugin/src/it/projects/require-files-size/pom.xml index 7a47775..4223598 100644 --- a/maven-enforcer-plugin/src/it/projects/require-files-size/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-files-size/pom.xml @@ -32,20 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-java-version/pom.xml b/maven-enforcer-plugin/src/it/projects/require-java-version/pom.xml index f857151..8e85cff 100644 --- a/maven-enforcer-plugin/src/it/projects/require-java-version/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-java-version/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-maven-version/pom.xml b/maven-enforcer-plugin/src/it/projects/require-maven-version/pom.xml index 7b0287a..e2c26df 100644 --- a/maven-enforcer-plugin/src/it/projects/require-maven-version/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-maven-version/pom.xml @@ -32,20 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-no-repositories-allow-plugin-repo/pom.xml b/maven-enforcer-plugin/src/it/projects/require-no-repositories-allow-plugin-repo/pom.xml index 133ddf5..cc568e2 100644 --- a/maven-enforcer-plugin/src/it/projects/require-no-repositories-allow-plugin-repo/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-no-repositories-allow-plugin-repo/pom.xml @@ -46,13 +46,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-no-repositories-allow-repo/pom.xml b/maven-enforcer-plugin/src/it/projects/require-no-repositories-allow-repo/pom.xml index 894e26c..9c9aa27 100644 --- a/maven-enforcer-plugin/src/it/projects/require-no-repositories-allow-repo/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-no-repositories-allow-repo/pom.xml @@ -46,13 +46,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-no-repositories/pom.xml b/maven-enforcer-plugin/src/it/projects/require-no-repositories/pom.xml index b03f0e1..bf5d7f9 100644 --- a/maven-enforcer-plugin/src/it/projects/require-no-repositories/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-no-repositories/pom.xml @@ -33,13 +33,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure/pom.xml b/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure/pom.xml index 9aabc4d..2075770 100644 --- a/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure/pom.xml @@ -32,18 +32,11 @@ under the License. <name>Asual Public Repository</name> <url>http://localhost</url> </repository> - </repositories> + </repositories> <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure_allowed-plugin-repo/pom.xml b/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure_allowed-plugin-repo/pom.xml index 6d1690d..557a44c 100644 --- a/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure_allowed-plugin-repo/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure_allowed-plugin-repo/pom.xml @@ -26,9 +26,7 @@ <artifactId>test</artifactId> <version>1.0</version> - <description>This IT makes sure to prevent having defined pluginRepository and repository in - allowedPluginRepositories - </description> + <description>This IT makes sure to prevent having defined pluginRepository and repository in allowedPluginRepositories</description> <pluginRepositories> <pluginRepository> @@ -48,13 +46,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure_plugin-repositories/pom.xml b/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure_plugin-repositories/pom.xml index 3edc623..0ceb88b 100644 --- a/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure_plugin-repositories/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure_plugin-repositories/pom.xml @@ -36,13 +36,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure_repositories/pom.xml b/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure_repositories/pom.xml index 133ddf5..cc568e2 100644 --- a/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure_repositories/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-no-repositories_failure_repositories/pom.xml @@ -46,13 +46,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-no-repositories_mm/pom.xml b/maven-enforcer-plugin/src/it/projects/require-no-repositories_mm/pom.xml index d3be3a5..e2651ac 100644 --- a/maven-enforcer-plugin/src/it/projects/require-no-repositories_mm/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-no-repositories_mm/pom.xml @@ -37,13 +37,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-no-repositories_mm_ci/pom.xml b/maven-enforcer-plugin/src/it/projects/require-no-repositories_mm_ci/pom.xml index eed6afc..2ab44fa 100644 --- a/maven-enforcer-plugin/src/it/projects/require-no-repositories_mm_ci/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-no-repositories_mm_ci/pom.xml @@ -40,13 +40,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-ci/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-ci/pom.xml index 2d08a8c..dd6501f 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-ci/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-ci/pom.xml @@ -40,13 +40,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-custom-packaging/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-custom-packaging/pom.xml index bf30acf..9a82bfa 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-custom-packaging/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-custom-packaging/pom.xml @@ -33,13 +33,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-one-plugin</artifactId> <version>1.2</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions/pom.xml index fe2e1c6..33321a9 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.enforcer.its</groupId> <artifactId>requirePluginVersions_Expressions</artifactId> @@ -35,13 +34,6 @@ <pluginManagement> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> <version>2.5</version> @@ -90,13 +82,6 @@ </pluginManagement> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -127,13 +112,6 @@ <reporting> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>${expressionplugin.groupId}</groupId> <artifactId>${expressionplugin.artifactId}</artifactId> <version>${expressionplugin.version}</version> @@ -148,13 +126,6 @@ <pluginManagement> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>${expressionplugin.groupId}</groupId> <artifactId>${expressionplugin.artifactId}</artifactId> <version>${expressionplugin.version}</version> @@ -163,13 +134,6 @@ </pluginManagement> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>${expressionplugin.groupId}</groupId> <artifactId>${expressionplugin.artifactId}</artifactId> <version>${expressionplugin.version}</version> @@ -179,13 +143,6 @@ <reporting> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>${expressionplugin.groupId}</groupId> <artifactId>${expressionplugin.artifactId}</artifactId> <version>${expressionplugin.version}</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-mm-ci-friendly/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-mm-ci-friendly/pom.xml index 07aa1de..e9d613b 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-mm-ci-friendly/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-mm-ci-friendly/pom.xml @@ -29,7 +29,7 @@ under the License. <description> </description> - + <properties> <revision>0.0.1-SNAPSHOT</revision> </properties> @@ -51,10 +51,6 @@ under the License. <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>2.5.1</version> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -106,20 +102,13 @@ under the License. <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> </plugin> </plugins> </build> - + <modules> <module>menforcer281-module</module> </modules> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-extensions/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-extensions/pom.xml index 1f8d387..73faf7b 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-extensions/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-extensions/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.its.enforcer</groupId> <artifactId>pluginWithExtensions</artifactId> @@ -29,13 +28,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml index 58d3188..efbefd7 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-plugin-with-integration-test-lifecycle/pom.xml @@ -18,28 +18,18 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.its.enforcer</groupId> <artifactId>pluginWithIntegrationTestLifecycle</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <properties> - <tycho-version>0.22.0 - </tycho-version><!-- minimum 0.22.0: depends on https://bugs.eclipse.org/bugs/show_bug.cgi?id=435313 --> + <tycho-version>0.22.0</tycho-version><!-- minimum 0.22.0: depends on https://bugs.eclipse.org/bugs/show_bug.cgi?id=435313 --> </properties> <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-projectGAVexpressions/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-projectGAVexpressions/pom.xml index 4429e7b..f2ed9c7 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-projectGAVexpressions/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-projectGAVexpressions/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>${projectGAV.groupId}</groupId> <artifactId>${projectGAV.artifactId}</artifactId> @@ -35,13 +34,6 @@ <pluginManagement> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> <version>2.5</version> @@ -85,13 +77,6 @@ </pluginManagement> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions/pom.xml index 5365644..7bd7043 100644 --- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions/pom.xml @@ -33,14 +33,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.7.0</version> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-profile-id-exist_defined_in_parent/MENFORCER-322-module/pom.xml b/maven-enforcer-plugin/src/it/projects/require-profile-id-exist_defined_in_parent/MENFORCER-322-module/pom.xml index 92a564b..a0540d5 100644 --- a/maven-enforcer-plugin/src/it/projects/require-profile-id-exist_defined_in_parent/MENFORCER-322-module/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-profile-id-exist_defined_in_parent/MENFORCER-322-module/pom.xml @@ -22,14 +22,14 @@ under the License. <!-- MENFORCER-322 --> <project> <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>org.apache.maven.its.enforcer</groupId> <artifactId>test</artifactId> <version>1.0</version> <relativePath>..</relativePath> </parent> - + <groupId>org.apache.maven.its.enforcer</groupId> <artifactId>menforcer-322-module</artifactId> <version>1.0</version> @@ -37,13 +37,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -63,7 +56,7 @@ under the License. </plugin> </plugins> </build> - + <profiles> <profile> <id>b</id> diff --git a/maven-enforcer-plugin/src/it/projects/require-profile-id-exist_defined_in_parent/pom.xml b/maven-enforcer-plugin/src/it/projects/require-profile-id-exist_defined_in_parent/pom.xml index e1aa073..21adc5c 100644 --- a/maven-enforcer-plugin/src/it/projects/require-profile-id-exist_defined_in_parent/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-profile-id-exist_defined_in_parent/pom.xml @@ -31,13 +31,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -57,11 +50,11 @@ under the License. </plugin> </plugins> </build> - + <modules> <module>MENFORCER-322-module</module> </modules> - + <profiles> <profile> <id>a</id> diff --git a/maven-enforcer-plugin/src/it/projects/require-profile-ids-exist_failure/pom.xml b/maven-enforcer-plugin/src/it/projects/require-profile-ids-exist_failure/pom.xml index fe08d8f..ccac8b9 100644 --- a/maven-enforcer-plugin/src/it/projects/require-profile-ids-exist_failure/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-profile-ids-exist_failure/pom.xml @@ -29,13 +29,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -55,7 +48,7 @@ under the License. </plugin> </plugins> </build> - + <profiles> <profile> <id>a</id> diff --git a/maven-enforcer-plugin/src/it/projects/require-profile-ids-exist_success/pom.xml b/maven-enforcer-plugin/src/it/projects/require-profile-ids-exist_success/pom.xml index fe08d8f..ccac8b9 100644 --- a/maven-enforcer-plugin/src/it/projects/require-profile-ids-exist_success/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-profile-ids-exist_success/pom.xml @@ -29,13 +29,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -55,7 +48,7 @@ under the License. </plugin> </plugins> </build> - + <profiles> <profile> <id>a</id> diff --git a/maven-enforcer-plugin/src/it/projects/require-property/pom.xml b/maven-enforcer-plugin/src/it/projects/require-property/pom.xml index 36f84d2..da9f997 100644 --- a/maven-enforcer-plugin/src/it/projects/require-property/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-property/pom.xml @@ -32,20 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-release-dependencies-excludes/pom.xml b/maven-enforcer-plugin/src/it/projects/require-release-dependencies-excludes/pom.xml index 18d3dfd..a20df3b 100644 --- a/maven-enforcer-plugin/src/it/projects/require-release-dependencies-excludes/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-release-dependencies-excludes/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.enforcer.its</groupId> <artifactId>requireReleaseDeps</artifactId> @@ -29,13 +28,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -68,4 +60,4 @@ <version>1.0-SNAPSHOT</version> </dependency> </dependencies> -</project> \ No newline at end of file + </project> \ No newline at end of file diff --git a/maven-enforcer-plugin/src/it/projects/require-release-dependencies-excludes_failure/pom.xml b/maven-enforcer-plugin/src/it/projects/require-release-dependencies-excludes_failure/pom.xml index da3024a..cc0de84 100644 --- a/maven-enforcer-plugin/src/it/projects/require-release-dependencies-excludes_failure/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-release-dependencies-excludes_failure/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.enforcer.its</groupId> <artifactId>requireReleaseDeps</artifactId> @@ -29,13 +28,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -68,4 +60,4 @@ <version>1.0-SNAPSHOT</version> </dependency> </dependencies> -</project> \ No newline at end of file + </project> \ No newline at end of file diff --git a/maven-enforcer-plugin/src/it/projects/require-release-dependencies/pom.xml b/maven-enforcer-plugin/src/it/projects/require-release-dependencies/pom.xml index f580126..6693dc6 100644 --- a/maven-enforcer-plugin/src/it/projects/require-release-dependencies/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-release-dependencies/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-release-version/pom.xml b/maven-enforcer-plugin/src/it/projects/require-release-version/pom.xml index d854d41..2b5d582 100644 --- a/maven-enforcer-plugin/src/it/projects/require-release-version/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-release-version/pom.xml @@ -32,13 +32,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-same-versions_failure/pom.xml b/maven-enforcer-plugin/src/it/projects/require-same-versions_failure/pom.xml index 4314ad5..b920167 100644 --- a/maven-enforcer-plugin/src/it/projects/require-same-versions_failure/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-same-versions_failure/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.enforcer.its</groupId> <artifactId>requireSameVersion</artifactId> @@ -28,13 +27,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -80,23 +72,16 @@ </plugin> </plugins> </build> - + <reporting> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> <version>2.13</version> </plugin> </plugins> </reporting> + - -</project> \ No newline at end of file + </project> \ No newline at end of file diff --git a/maven-enforcer-plugin/src/it/projects/require-same-versions_success/pom.xml b/maven-enforcer-plugin/src/it/projects/require-same-versions_success/pom.xml index 1801104..7e61396 100644 --- a/maven-enforcer-plugin/src/it/projects/require-same-versions_success/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-same-versions_success/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.enforcer.its</groupId> <artifactId>requireSameVersion</artifactId> @@ -29,13 +28,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -81,23 +73,16 @@ </plugin> </plugins> </build> - + <reporting> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-report-plugin</artifactId> <version>2.14</version> </plugin> </plugins> </reporting> + - -</project> \ No newline at end of file + </project> \ No newline at end of file diff --git a/maven-enforcer-plugin/src/it/projects/require-snapshot-version_failure/pom.xml b/maven-enforcer-plugin/src/it/projects/require-snapshot-version_failure/pom.xml index e37137c..f2e2e1f 100644 --- a/maven-enforcer-plugin/src/it/projects/require-snapshot-version_failure/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-snapshot-version_failure/pom.xml @@ -31,13 +31,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-snapshot-version_success/pom.xml b/maven-enforcer-plugin/src/it/projects/require-snapshot-version_success/pom.xml index c8e7437..0c32f53 100644 --- a/maven-enforcer-plugin/src/it/projects/require-snapshot-version_success/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-snapshot-version_success/pom.xml @@ -31,13 +31,6 @@ under the License. <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-managed_failure/pom.xml b/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-managed_failure/pom.xml index 5ec40dd..4ac3887 100644 --- a/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-managed_failure/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-managed_failure/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.enforcer.its</groupId> <artifactId>menforcer146-a</artifactId> @@ -28,13 +27,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-managed_success/pom.xml b/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-managed_success/pom.xml index 2a240b2..7dd758a 100644 --- a/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-managed_success/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-managed_success/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.enforcer.its</groupId> <artifactId>menforcer146-a</artifactId> @@ -28,13 +27,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/pom.xml b/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/pom.xml index b17d65c..c2c4366 100644 --- a/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_failure/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.enforcer.its</groupId> <artifactId>requireUpperBoundDependenciesUnique</artifactId> @@ -29,13 +28,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -65,4 +57,4 @@ <version>1.0-SNAPSHOT</version> </dependency> </dependencies> -</project> \ No newline at end of file + </project> \ No newline at end of file diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_success/pom.xml b/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_success/pom.xml index 062ecb6..17e9e2a 100644 --- a/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_success/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-dependencies-unique_success/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.enforcer.its</groupId> <artifactId>requireUpperBoundDependenciesUnique</artifactId> @@ -29,13 +28,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -63,4 +55,4 @@ <version>1.0-SNAPSHOT</version> </dependency> </dependencies> -</project> \ No newline at end of file + </project> \ No newline at end of file diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/module/pom.xml b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/module/pom.xml index edc6928..6d2c1bb 100644 --- a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/module/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/module/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>test</groupId> diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/pom.xml b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/pom.xml index 2411710..49701f5 100644 --- a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_failure/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.plugins.enforcer.its</groupId> <artifactId>menforcer128</artifactId> @@ -41,13 +40,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/module/pom.xml b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/module/pom.xml index edc6928..6d2c1bb 100644 --- a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/module/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/module/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>test</groupId> diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/pom.xml b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/pom.xml index 254bd7b..746e074 100644 --- a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_ignored/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.plugins.enforcer.its</groupId> <artifactId>menforcer128</artifactId> @@ -41,13 +40,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_success/module/pom.xml b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_success/module/pom.xml index edc6928..6d2c1bb 100644 --- a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_success/module/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_success/module/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>test</groupId> diff --git a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_success/pom.xml b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_success/pom.xml index 2f0414b..107c554 100644 --- a/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_success/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/require-upper-bound-deps_success/pom.xml @@ -18,8 +18,7 @@ * under the License. * --> -<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" 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"> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven.plugins.enforcer.its</groupId> <artifactId>menforcer128</artifactId> @@ -41,13 +40,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> diff --git a/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml b/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml index 923d72c..fe985df 100644 --- a/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml +++ b/maven-enforcer-plugin/src/it/projects/resolve_collect_dependencies/pom.xml @@ -22,13 +22,6 @@ <build> <plugins> <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <target>1.7</target> - <source>1.7</source> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <version>@project.version@</version> @@ -40,7 +33,7 @@ </goals> <configuration> <rules> - <requirePluginVersions/> + <requirePluginVersions /> </rules> <fail>false</fail> </configuration> diff --git a/maven-enforcer-plugin/src/site/apt/index.apt b/maven-enforcer-plugin/src/site/apt/index.apt index 68ad33c..5d7fd64 100644 --- a/maven-enforcer-plugin/src/site/apt/index.apt +++ b/maven-enforcer-plugin/src/site/apt/index.apt @@ -36,10 +36,6 @@ Maven Enforcer Plugin - The Loving Iron Fist of Maven\x99 *{{{./display-info-mojo.html}enforcer:display-info}} display the current information as detected by the built-in rules. -* Using 3.0.0-M2+ - - The minimum needed JDK is now JDK7+. - * Usage General instructions on how to use the Enforcer Plugin can be found on the {{{./usage.html}usage page}}. diff --git a/pom.xml b/pom.xml index dbad94b..ce27fe1 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,6 @@ <properties> <maven.version>3.0</maven.version> <maven.site.path>enforcer-archives/enforcer-LATEST</maven.site.path> - <javaVersion>7</javaVersion> </properties> <dependencyManagement>