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 2016/09/24 15:14:00 UTC
[39/40] maven git commit: Merge branch
'MNG-6012-Missing-Profile-At-End' of
https://git-wip-us.apache.org/repos/asf/maven into
MNG-6012-Missing-Profile-At-End
Merge branch 'MNG-6012-Missing-Profile-At-End' of https://git-wip-us.apache.org/repos/asf/maven into MNG-6012-Missing-Profile-At-End
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/54f1c0ca
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/54f1c0ca
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/54f1c0ca
Branch: refs/heads/MNG-6012-Missing-Profile-At-End
Commit: 54f1c0caebb47fde2ba0b833b3935159dd447fa0
Parents: cc1b901 7bf0a63
Author: khmarbaise <kh...@apache.org>
Authored: Sat Sep 24 16:35:23 2016 +0200
Committer: khmarbaise <kh...@apache.org>
Committed: Sat Sep 24 16:35:23 2016 +0200
----------------------------------------------------------------------
maven-core/src/main/java/org/apache/maven/DefaultMaven.java | 4 +---
.../org/apache/maven/execution/DefaultMavenExecutionRequest.java | 4 +++-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/54f1c0ca/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
----------------------------------------------------------------------
diff --cc maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index a38cae8,7051737..94ad94c
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@@ -468,7 -470,7 +468,6 @@@ public class DefaultMave
private List<String> identifyProfilesWhichDoNotExist( List<MavenProject> projects, List<String> activeProfileIds )
{
List<String> result = new LinkedList<>();
-
-
Collection<String> notActivatedProfileIds = new LinkedHashSet<>( activeProfileIds );
for ( MavenProject project : projects )
http://git-wip-us.apache.org/repos/asf/maven/blob/54f1c0ca/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
----------------------------------------------------------------------
diff --cc maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 686850d,a95a7f2..7c4ed9a
--- a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@@ -163,12 -163,11 +163,14 @@@ public class DefaultMavenExecutionReque
private boolean useLegacyLocalRepositoryManager = false;
private Map<String, Object> data;
+
+ private boolean failOnMissingProfiles;
+ private FailLevel failLevel;
+
public DefaultMavenExecutionRequest()
{
+ this.failLevel = FailLevel.ERROR;
}
public static MavenExecutionRequest copy( MavenExecutionRequest original )
@@@ -1292,27 -1289,15 +1294,27 @@@
}
@Override
- public boolean isFailOnMissingProfiles()
+ public boolean isFailLevelWARN()
{
- return failOnMissingProfiles;
+ return this.failLevel.equals( FailLevel.WARN );
}
-
+
@Override
- public MavenExecutionRequest setFailOnMissingProfiles( boolean failOnMissingProfiles )
+ public boolean isFailLevelERROR()
{
- this.failOnMissingProfiles = failOnMissingProfiles;
- return this;
+ return this.failLevel.equals( FailLevel.ERROR );
}
+
+ @Override
+ public FailLevel getFailLevel()
+ {
+ return this.failLevel;
+ }
+
+ @Override
+ public MavenExecutionRequest setFailLevel( FailLevel failLevel )
+ {
+ this.failLevel = failLevel;
- return this;
+ }
++
}