[maven-surefire] branch master updated: [travisci] Travis CI timeout 30 min
This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-surefire.git The following commit(s) were added to refs/heads/master by this push: new 5b92878 [travisci] Travis CI timeout 30 min 5b92878 is described below commit 5b92878e54bce0dbdbcc98ef305882441213d08c Author: tibordigana AuthorDate: Mon Mar 8 23:41:07 2021 +0100 [travisci] Travis CI timeout 30 min --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 963469f..d3c6b22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,10 +28,10 @@ jdk: openjdk15 jobs: include: - stage: repo cleanup - script: mvn -e -B -V -nsu org.apache.maven.plugins:maven-dependency-plugin:3.1.1:purge-local-repository + script: travis_wait 5 mvn -e -B -V -nsu org.apache.maven.plugins:maven-dependency-plugin:3.1.1:purge-local-repository - stage: mvn build - script: mvn clean install -e -B -V -nsu -P run-its -DskipITs -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn + script: travis_wait 30 mvn clean install -e -B -V -nsu -P run-its -DskipITs -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn branches: only:
[maven] branch master updated: [MNG-7051] Return unmodifiable profile lists
This is an automated email from the ASF dual-hosted git repository.
mthmulders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new ad24f59 [MNG-7051] Return unmodifiable profile lists
ad24f59 is described below
commit ad24f599cecf2cbaa94c0339d9256946f846b173
Author: Maarten Mulders
AuthorDate: Fri Feb 12 17:06:47 2021 +0100
[MNG-7051] Return unmodifiable profile lists
This helps deprecation and keeps the code consistent.
Closes #452.
---
.../apache/maven/execution/MavenExecutionRequest.java| 16
.../org/apache/maven/execution/ProfileActivation.java| 5 +++--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
index f31e33f..d0ac0f1 100644
---
a/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
+++
b/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
@@ -278,51 +278,51 @@ public interface MavenExecutionRequest
MavenExecutionRequest setProfiles( List profiles );
/**
- * @deprecated Use {@link #getProfileActivation()}.
+ * @deprecated Since Maven 4: use {@link #getProfileActivation()}.
*/
@Deprecated
MavenExecutionRequest addActiveProfile( String profile );
/**
- * @deprecated Use {@link #getProfileActivation()}.
+ * @deprecated Since Maven 4: use {@link #getProfileActivation()}.
*/
@Deprecated
MavenExecutionRequest addActiveProfiles( List profiles );
/**
- * @deprecated Use {@link #getProfileActivation()}.
+ * @deprecated Since Maven 4: use {@link #getProfileActivation()}.
*/
@Deprecated
MavenExecutionRequest setActiveProfiles( List profiles );
/**
* @return The list of profiles that the user wants to activate.
- * @deprecated Use {@link #getProfileActivation()}.
+ * @deprecated Since Maven 4: use {@link #getProfileActivation()}.
*/
@Deprecated
List getActiveProfiles();
/**
- * @deprecated Use {@link #getProfileActivation()}.
+ * @deprecated Since Maven 4: use {@link #getProfileActivation()}.
*/
@Deprecated
MavenExecutionRequest addInactiveProfile( String profile );
/**
- * @deprecated Use {@link #getProfileActivation()}.
+ * @deprecated Since Maven 4: use {@link #getProfileActivation()}.
*/
@Deprecated
MavenExecutionRequest addInactiveProfiles( List profiles );
/**
- * @deprecated Use {@link #getProfileActivation()}.
+ * @deprecated Since Maven 4: use {@link #getProfileActivation()}.
*/
@Deprecated
MavenExecutionRequest setInactiveProfiles( List profiles );
/**
* @return The list of profiles that the user wants to de-activate.
- * @deprecated Use {@link #getProfileActivation()}.
+ * @deprecated Since Maven 4: use {@link #getProfileActivation()}.
*/
@Deprecated
List getInactiveProfiles();
diff --git
a/maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java
b/maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java
index 21530bd..1837696 100644
--- a/maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java
+++ b/maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java
@@ -20,6 +20,7 @@ package org.apache.maven.execution;
*/
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -74,7 +75,7 @@ public class ProfileActivation
@Deprecated
public List getActiveProfiles()
{
-return new ArrayList<>( getProfileIds( pa -> pa.active ) );
+return Collections.unmodifiableList( new ArrayList<>( getProfileIds(
pa -> pa.active ) ) );
}
/**
@@ -84,7 +85,7 @@ public class ProfileActivation
@Deprecated
public List getInactiveProfiles()
{
-return new ArrayList<>( getProfileIds( pa -> !pa.active ) );
+return Collections.unmodifiableList( new ArrayList<>( getProfileIds(
pa -> !pa.active ) ) );
}
/**
[maven] branch MNG-6511-optional-project-selection created (now c9426d4)
This is an automated email from the ASF dual-hosted git repository. mthmulders pushed a change to branch MNG-6511-optional-project-selection in repository https://gitbox.apache.org/repos/asf/maven.git. at c9426d4 [MNG-6511] Log missing project on info level No new revisions were added by this update.
[maven] branch master updated: [MNG-7051] When an optional profile could not be found, an info message should be thrown instead of a warning.
This is an automated email from the ASF dual-hosted git repository. martinkanters pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven.git The following commit(s) were added to refs/heads/master by this push: new 9643ac6 [MNG-7051] When an optional profile could not be found, an info message should be thrown instead of a warning. 9643ac6 is described below commit 9643ac630cf4e9378cf3a7989ce84ca7fe802819 Author: Martin Kanters AuthorDate: Mon Mar 8 13:42:57 2021 +0100 [MNG-7051] When an optional profile could not be found, an info message should be thrown instead of a warning. --- maven-core/src/main/java/org/apache/maven/DefaultMaven.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index 98c5fe6..f80833b 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -611,7 +611,7 @@ public class DefaultMaven "The requested optional profiles [%s] could not be activated or deactivated because they " + "do not exist.", String.join( ", ", notFoundOptionalProfiles ) ); -logger.warn( message ); +logger.info( message ); } }
[maven-integration-testing] branch master updated: [MNG-7051] When an optional profile could not be found, an info message should be thrown instead of a warning.
This is an automated email from the ASF dual-hosted git repository. martinkanters pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git The following commit(s) were added to refs/heads/master by this push: new 379faa9 [MNG-7051] When an optional profile could not be found, an info message should be thrown instead of a warning. 379faa9 is described below commit 379faa9e4498933465e63e1307aa58effeb3c839 Author: Martin Kanters AuthorDate: Mon Mar 8 13:41:11 2021 +0100 [MNG-7051] When an optional profile could not be found, an info message should be thrown instead of a warning. --- .../maven/it/MavenITmng7051OptionalProfileActivationTest.java | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java index 6682ada..652d411 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng7051OptionalProfileActivationTest.java @@ -72,7 +72,7 @@ public class MavenITmng7051OptionalProfileActivationTest verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); -verifier.verifyTextInLog( "[WARNING] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." ); +verifier.verifyTextInLog( "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." ); } /** @@ -89,7 +89,7 @@ public class MavenITmng7051OptionalProfileActivationTest verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); -verifier.verifyTextInLog( "[WARNING] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." ); +verifier.verifyTextInLog( "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." ); } /** @@ -106,7 +106,7 @@ public class MavenITmng7051OptionalProfileActivationTest verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); -verifier.verifyTextInLog( "[WARNING] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." ); +verifier.verifyTextInLog( "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." ); } /** @@ -123,6 +123,6 @@ public class MavenITmng7051OptionalProfileActivationTest verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); -verifier.verifyTextInLog( "[WARNING] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." ); +verifier.verifyTextInLog( "[INFO] The requested optional profiles [non-existing-profile] could not be activated or deactivated because they do not exist." ); } }
[maven-surefire] branch SUREFIRE-1892 updated (e3a1a7b -> 69aa817)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch SUREFIRE-1892 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git. from e3a1a7b [SUREFIRE-1892] ensure systemPropertyVariables values are stringified add 69aa817 style + handle null in systemPropertyVariables values No new revisions were added by this update. Summary of changes: .../java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java | 5 +++-- .../org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-)
