You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/10/06 11:13:52 UTC
[maven-enforcer] branch MENFORCER-320 updated (d94f3b5 -> caef332)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MENFORCER-320
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git.
discard d94f3b5 [MENFORCER-320] - RequireProfileIdsExist check fails if no profiles have been specified - RequireProfileIdsExist check must not fail if there are no profiles in the pom.xml and no profiles have been specified in the command line - fix site: breadcrumbs on the "requireProfileIdsExist" page.
discard e136668 [MENFORCER-317] - Fix RequireFileChecksum ignores configured message - Introduce configurable message for nonexistent file - Including small refactoring: extract checksum calculation into private method.
discard de52202 [MENFORCER-315] - Add thirdparty rules page to the enforcer site o Add thirdparty-rules page to site for enumerating thirdparty Maven Enforcer rules; o Add link to Sonatype OSS Index rules documentation
discard d66191d Changed configuration for allowedPluginRepositories
add 7b02571 Changed configuration for allowedPluginRepositories
add df77932 [MENFORCER-315] - Add thirdparty rules page to the enforcer site o Add thirdparty-rules page to site for enumerating thirdparty Maven Enforcer rules; o Add link to Sonatype OSS Index rules documentation
add 208c5c7 [MENFORCER-317] - Fix RequireFileChecksum ignores configured message - Introduce configurable message for nonexistent file - Including small refactoring: extract checksum calculation into private method.
new caef332 [MENFORCER-320] - RequireProfileIdsExist check fails if no profiles have been specified - RequireProfileIdsExist check must not fail if there are no profiles in the pom.xml and no profiles have been specified in the command line - fix site: breadcrumbs on the "requireProfileIdsExist" page.
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 (d94f3b5)
\
N -- N -- N refs/heads/MENFORCER-320 (caef332)
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:
[maven-enforcer] 01/01: [MENFORCER-320] - RequireProfileIdsExist
check fails if no profiles have been specified - RequireProfileIdsExist
check must not fail if there are no profiles in the pom.xml and no profiles
have been specified in the command line - fix site: breadcrumbs on the
"requireProfileIdsExist" page.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MENFORCER-320
in repository https://gitbox.apache.org/repos/asf/maven-enforcer.git
commit caef332f7598264ffc21d79bf9c4e6e4028a8210
Author: Alex Shesterov <al...@gmail.com>
AuthorDate: Fri Oct 5 15:29:18 2018 +0200
[MENFORCER-320] - RequireProfileIdsExist check fails if no profiles have been specified
- RequireProfileIdsExist check must not fail if there are no profiles
in the pom.xml and no profiles have been specified in the command line
- fix site: breadcrumbs on the "requireProfileIdsExist" page.
---
.../maven/plugins/enforcer/RequireProfileIdsExist.java | 12 ++++++------
enforcer-rules/src/site/apt/requireProfileIdsExist.apt.vm | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProfileIdsExist.java b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProfileIdsExist.java
index 9a16546..770f644 100644
--- a/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProfileIdsExist.java
+++ b/enforcer-rules/src/main/java/org/apache/maven/plugins/enforcer/RequireProfileIdsExist.java
@@ -64,13 +64,13 @@ public class RequireProfileIdsExist extends AbstractNonCacheableEnforcerRule
for ( org.apache.maven.settings.Profile profile : session.getSettings().getProfiles() )
{
profileIds.remove( profile.getId() );
-
- if ( profileIds.isEmpty() )
- {
- return;
- }
}
-
+
+ if ( profileIds.isEmpty() )
+ {
+ return;
+ }
+
StringBuilder sb = new StringBuilder();
if ( profileIds.size() > 1 )
{
diff --git a/enforcer-rules/src/site/apt/requireProfileIdsExist.apt.vm b/enforcer-rules/src/site/apt/requireProfileIdsExist.apt.vm
index 8da72a4..49e84ac 100644
--- a/enforcer-rules/src/site/apt/requireProfileIdsExist.apt.vm
+++ b/enforcer-rules/src/site/apt/requireProfileIdsExist.apt.vm
@@ -16,7 +16,7 @@
~~ under the License.
-----
- Require Upper Bound Dependencies
+ Require Existence of Profiles Specified on the Commandline
-----
-----
2017-09-25