You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by eo...@apache.org on 2018/12/12 17:32:02 UTC

[maven-enforcer] branch MENFORCER-323 updated (0b81083 -> 5ac7679)

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

eolivelli pushed a change to branch MENFORCER-323
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git.


 discard 0b81083  [MENFORCER-323] - Improve output of "Some plugins are missing valid versions" error
     add 9106689  [MENFORCER-322] requireProfileIdsExist triggers if profile is defined at parent  o Fixed iterating over parent poms. Added IT.
     new 5ac7679  [MENFORCER-323] - Improve output of "Some plugins are missing valid versions" error

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (0b81083)
            \
             N -- N -- N   refs/heads/MENFORCER-323 (5ac7679)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../plugins/enforcer/RequireProfileIdsExist.java   | 27 ++++++++-----
 .../MENFORCER-322-module}/pom.xml                  | 15 +++++---
 .../invoker.properties                             | 45 +++++++++++++---------
 .../pom.xml                                        |  9 +++--
 .../verify.groovy                                  |  4 +-
 5 files changed, 64 insertions(+), 36 deletions(-)
 copy maven-enforcer-plugin/src/it/projects/{require-profile-ids-exist_failure => require-profile-id-exist_defined_in_parent/MENFORCER-322-module}/pom.xml (83%)
 copy maven-enforcer-plugin/src/it/projects/{always-fail => require-profile-id-exist_defined_in_parent}/invoker.properties (74%)
 copy maven-enforcer-plugin/src/it/projects/{require-profile-ids-exist_failure => require-profile-id-exist_defined_in_parent}/pom.xml (89%)
 copy maven-enforcer-plugin/src/it/projects/{require-profile-ids-exist_failure => require-profile-id-exist_defined_in_parent}/verify.groovy (82%)


[maven-enforcer] 01/01: [MENFORCER-323] - Improve output of "Some plugins are missing valid versions" error

Posted by eo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 5ac7679e582ce98aa86b6df21c1261e77a391a7a
Author: Josh Soref <js...@users.noreply.github.com>
AuthorDate: Mon Dec 10 14:39:20 2018 -0500

    [MENFORCER-323] - Improve output of "Some plugins are missing valid versions" error
    
    Fix whitespaces around brackets in case of "Some plugins are missing valid versions"
---
 .../org/apache/maven/plugins/enforcer/RequirePluginVersions.java   | 7 ++++---
 .../src/it/projects/require-plugin-versions-ci/verify.groovy       | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
index f3df358..b63af6e 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequirePluginVersions.java
@@ -265,7 +265,7 @@ public class RequirePluginVersions
                 newMsg.append( "Some plugins are missing valid versions:" );
                 if ( banLatest || banRelease || banSnapshots || banTimestamps )
                 {
-                    newMsg.append( "(" );
+                    newMsg.append( " (" );
                     if ( banLatest )
                     {
                         newMsg.append( "LATEST " );
@@ -278,8 +278,9 @@ public class RequirePluginVersions
                     {
                         newMsg.append( "SNAPSHOT " );
                     }
-                    newMsg.append( "are not allowed )\n" );
+                    newMsg.append( "are not allowed)" );
                 }
+                newMsg.append( "\n" );
                 for ( Plugin plugin : failures )
                 {
                     newMsg.append( plugin.getGroupId() );
@@ -1262,4 +1263,4 @@ public class RequirePluginVersions
     {
         return additionalPlugins;
     }
-}
\ No newline at end of file
+}
diff --git a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-ci/verify.groovy b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-ci/verify.groovy
index 865bfeb..d098917 100644
--- a/maven-enforcer-plugin/src/it/projects/require-plugin-versions-ci/verify.groovy
+++ b/maven-enforcer-plugin/src/it/projects/require-plugin-versions-ci/verify.groovy
@@ -18,4 +18,4 @@
  */
 File buildLog = new File( basedir, 'build.log' )
 assert buildLog.text.contains( '[WARNING] Rule 0: org.apache.maven.plugins.enforcer.RequirePluginVersions failed with message:' )
-assert buildLog.text.contains( 'Some plugins are missing valid versions:(LATEST RELEASE SNAPSHOT are not allowed )' )
+assert buildLog.text.contains( 'Some plugins are missing valid versions: (LATEST RELEASE SNAPSHOT are not allowed)' )