You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2023/01/07 20:51:57 UTC

[maven-enforcer] branch master updated: [MENFORCER-447] Skip tests for banDuplicatePomDependencyVersions and requireProfileIdsExist with Maven 4

This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git


The following commit(s) were added to refs/heads/master by this push:
     new f524312  [MENFORCER-447] Skip tests for banDuplicatePomDependencyVersions and requireProfileIdsExist with Maven 4
f524312 is described below

commit f524312aadaa5612445a282aec4709aae486506b
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sat Jan 7 19:58:17 2023 +0100

    [MENFORCER-447] Skip tests for banDuplicatePomDependencyVersions and requireProfileIdsExist with Maven 4
    
    Maven 4 strict checking such rules, so build will not start with projects contains such violations.
---
 .../invoker.properties                             |  5 ++-
 .../invoker.properties                             |  5 ++-
 .../ban-pom-dependency-version/invoker.properties  |  5 ++-
 .../require-plugin-versions-expressions2/pom.xml   |  5 +++
 .../invoker.properties                             | 41 ++++++++++++----------
 5 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/maven-enforcer-plugin/src/it/projects/ban-duplicate-dependencies-versions/invoker.properties b/maven-enforcer-plugin/src/it/projects/ban-duplicate-dependencies-versions/invoker.properties
index c98ac4c..6639b51 100644
--- a/maven-enforcer-plugin/src/it/projects/ban-duplicate-dependencies-versions/invoker.properties
+++ b/maven-enforcer-plugin/src/it/projects/ban-duplicate-dependencies-versions/invoker.properties
@@ -15,4 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.buildResult=failure
\ No newline at end of file
+invoker.buildResult=failure
+
+# Maven 4 check itself such rules
+invoker.maven.version = !4+
diff --git a/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version-utf8-with-bom/invoker.properties b/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version-utf8-with-bom/invoker.properties
index c98ac4c..6639b51 100644
--- a/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version-utf8-with-bom/invoker.properties
+++ b/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version-utf8-with-bom/invoker.properties
@@ -15,4 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.buildResult=failure
\ No newline at end of file
+invoker.buildResult=failure
+
+# Maven 4 check itself such rules
+invoker.maven.version = !4+
diff --git a/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/invoker.properties b/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/invoker.properties
index c98ac4c..6639b51 100644
--- a/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/invoker.properties
+++ b/maven-enforcer-plugin/src/it/projects/ban-pom-dependency-version/invoker.properties
@@ -15,4 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.buildResult=failure
\ No newline at end of file
+invoker.buildResult=failure
+
+# Maven 4 check itself such rules
+invoker.maven.version = !4+
diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/pom.xml b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/pom.xml
index c8d18cd..c4a0c35 100644
--- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/pom.xml
+++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-expressions2/pom.xml
@@ -93,6 +93,11 @@
           <artifactId>maven-site-plugin</artifactId>
           <version>3.9.1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-wrapper-plugin</artifactId>
+          <version>3.0.1</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
diff --git a/maven-enforcer-plugin/src/it/projects/require-profile-ids-exist_failure/invoker.properties b/maven-enforcer-plugin/src/it/projects/require-profile-ids-exist_failure/invoker.properties
index bd8df3b..f90c453 100644
--- a/maven-enforcer-plugin/src/it/projects/require-profile-ids-exist_failure/invoker.properties
+++ b/maven-enforcer-plugin/src/it/projects/require-profile-ids-exist_failure/invoker.properties
@@ -1,19 +1,22 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-invoker.buildResult=failure
-invoker.profiles = c
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+invoker.buildResult=failure
+invoker.profiles = c
+
+# Maven 4 check itself such rules
+invoker.maven.version = !4+