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 2020/03/08 13:23:40 UTC
[maven] branch MNG-6012-Missing-Profile-At-End updated (a4fef0b ->
65dd237)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MNG-6012-Missing-Profile-At-End
in repository https://gitbox.apache.org/repos/asf/maven.git.
discard a4fef0b WIP - [MNG-6012] Missing profile is only notified at the end of a run o Introduced new command line option --fail-on-missing-profiles which will fail the build immediately. o Print WARNING at the beginning and at the end of the output.
add 25ced83 [MNG-6813] - Remove Maven 1 leftover
add 610e623 [MNG-6814] - Remove useless exclusion in maven-plugin-api
add 13c80d5 [MNG-6815] - Upgrade guice 4.2.2
add 7284bd6 Updated README.md
add 5750857 [MNG-6817] - Upgrade mockito to 3.2.0
add 11664b6 [MNG-6818] - Upgrade plexus-utils 3.3.0
add 3332f4d [MNG-6816] Prefer System.lineSeparator() over system properties
add 99953a4 [MNG-6820] - Remove unnecessary dependency exclusions for commons-cli
add e7654f6 [MNG-6821] - Remove unnecessary dependency exclusions for plexus-component-annotations
add b8f066e [MNG-6823] - Remove unnecessary dependency exclusions for wagon-http
add 06842d6 [MNG-6826] - Remove condition check for JDK8+ in FileSizeFormatTest - The conditions to check for JDK8+ in test cases is obsolete with the lift to JDK8.
add 78ad10d [MNG-6807] - Remove LifecycleXpp3ReaderTest
add 370570b Fixed display text for Apache License.
add aad48b7 Removed duplication of License part.
add 11b8b2d [MNG-6824] ModelMerger is broken Fix modules Apply Java 8 Functions
add 1ad7801 [MNG-6827] Replace deprecated StringUtils#defaultString() from Plexus Utils
add e3aa406 [MNG-6824] ModelMerger is broken Fixing reportSet.reports, mailingList.otherArchives, contributor.roles, build.filters, execution.goals, patternSet.includes, patternSet.excludes
add d251074 [MNG-6065] Create option --fail-on-severity
add 25de698 Removed JDK7 related configuration.
add e48c067 Moved org.slf4j.impl.MavenLoggerFactoryTest to the correct submodule
add 08397c2 [MNG-6065] Moved org.slf4j.impl.MavenLoggerFactoryTest to the correct submodule
add 5553ff0 [MNG-5982] Pass user properties to ModelBuildingRequest
add 6d63038 Revert "[MNG-5982] Pass user properties to ModelBuildingRequest"
add f3e6641 [MNG-6841] update plexus-interpolation to 1.26
add 735b72f [MNG-6844] Use StandardCharsets and remove outdated @SuppressWarnings
add 5670dfa [MNG-6842] ProjectBuilderTest uses Guava, but Guava is not defined in dependencies
add f620bb7 [MNG-6844] Remove outdated TODOs
add 3949228 [MNG-6847] Explicit type can be replaced by the diamond operator
add 9989e6a [MNG-6837] Simplify detection of the MAVEN_HOME and make it fully qualified on Windows
add 838c196 [MNG-5587] When the build fails emit any errors without the user having to specify -e or -X
add da5d8b8 [MNG-6850] Prevent printing the EXEC_DIR when it's just a disk letter
add a6f113a Bump junit from 4.12 to 4.13
add ce35eff [MNG-6853] - Don't box primitives where it's not needed
add ff9bc4f [MNG-6852] Upgrade maven-source-plugin from 3.2.0 to 3.2.1
add ddb454a [MNG-6831] Replace Anonymous classes by lambdas
add 1697e7a [MNG-6855] Simplify code
add ace32fd [MNG-6855] Simplify code - computeIfAbsent()
add e6c897e [MNG-6855] Simplify some code
add 96e11e1 [MNG-6855] Remove redundant code
add cdb2cd0 [MNG-6071] Normalize relative paths for working directory
add 720e46d Revert "[MNG-5587] When the build fails emit any errors without the user having to specify -e or -X"
add 45076f3 Improve license handling
add 35658fd Run Integration Tests with Java 8, 11, 13 and 14
add 716cc1f [MNG-5669] same pom.xml is read multiple times
add b0d2846 [MNG-6859] Build not reproducible when built from source release
add d9bf929 [MNG-6562] added WARNING on default bindings plugins unlocked versions
add 9ae008a use https://repository.a.o/ for Apache SNAPSHOT plugins
add f2e9afd Refactor getLocalRepository() in tests by using the repositorySystem
new 65dd237 WIP - [MNG-6012] Missing profile is only notified at the end of a run o Introduced new command line option --fail-on-missing-profiles which will fail the build immediately. o Print WARNING at the beginning and at the end of the output.
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 (a4fef0b)
\
N -- N -- N refs/heads/MNG-6012-Missing-Profile-At-End (65dd237)
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:
Jenkinsfile | 10 +-
README.md | 10 +-
apache-maven/pom.xml | 8 +-
apache-maven/src/bin/mvn.cmd | 12 +-
.../main/appended-resources/META-INF/LICENSE.vm | 19 +-
.../licenses/{ASL-2.0.txt => Apache-2.0.txt} | 0
apache-maven/src/main/assembly/component.xml | 1 +
.../apache/maven/settings/GlobalSettingsTest.java | 3 +-
.../repository/ArtifactRepositoryPolicy.java | 4 +-
.../AbstractArtifactResolutionException.java | 2 +-
.../MultipleArtifactsNotFoundException.java | 2 +-
.../artifact/versioning/ComparableVersion.java | 6 +-
.../maven/artifact/versioning/VersionRange.java | 4 +-
.../maven/building/DefaultProblemCollector.java | 2 +-
.../java/org/apache/maven/building/FileSource.java | 31 ++
.../org/apache/maven/building/StringSource.java | 36 +-
.../java/org/apache/maven/building/UrlSource.java | 32 +-
.../artifact/resolver/DefaultArtifactResolver.java | 14 +-
.../maven/profiles/DefaultProfileManager.java | 19 +-
.../java/org/apache/maven/project/ModelUtils.java | 8 +-
.../DefaultModelInheritanceAssembler.java | 10 +-
.../project/validation/ModelValidationResult.java | 6 +-
.../repository/legacy/LegacyRepositorySystem.java | 8 +-
.../metadata/DefaultClasspathTransformation.java | 30 +-
.../maven/repository/metadata/MetadataGraph.java | 14 +-
.../AbstractArtifactComponentTestCase.java | 3 +-
.../resolver/ArtifactResolutionExceptionTest.java | 2 +-
.../resolver/filter/AndArtifactFilterTest.java | 10 +-
.../resolver/filter/OrArtifactFilterTest.java | 10 +-
.../maven/artifact/testutils/TestFileManager.java | 13 +-
.../maven/repository/legacy/StringWagon.java | 11 +-
.../resolver/DefaultArtifactCollectorTest.java | 20 +-
maven-core/pom.xml | 37 +-
.../apache/maven/DuplicateProjectException.java | 2 +-
.../main/java/org/apache/maven/ReactorReader.java | 8 +-
.../metadata/AbstractRepositoryMetadata.java | 3 +-
.../apache/maven/bridge/MavenRepositorySystem.java | 8 +-
.../maven/classrealm/DefaultClassRealmManager.java | 5 +-
.../DefaultMavenExecutionRequestPopulator.java | 2 +-
.../execution/DefaultMavenExecutionResult.java | 4 +-
.../org/apache/maven/execution/ReactorManager.java | 19 +-
.../scope/internal/MojoExecutionScope.java | 47 +--
.../graph/FilteredProjectDependencyGraph.java | 2 +-
.../DefaultLifecycleExecutionPlanCalculator.java | 4 +-
.../internal/DefaultLifecycleMappingDelegate.java | 8 +-
.../internal/DefaultLifecyclePluginAnalyzer.java | 11 +-
.../lifecycle/internal/DependencyContext.java | 4 +-
.../lifecycle/internal/LifecycleModuleBuilder.java | 3 +-
.../lifecycle/internal/MojoDescriptorCreator.java | 2 +-
.../lifecycle/internal/ReactorBuildStatus.java | 2 +-
.../multithreaded/MultiThreadedBuilder.java | 15 +-
.../builder/multithreaded/ThreadOutputMuxer.java | 2 +-
.../plugin/DefaultLifecycleBindingsInjector.java | 42 +-
.../plugin/internal/DefaultMavenPluginManager.java | 10 +-
.../DefaultPluginDependenciesResolver.java | 11 +-
.../PluginDependencyResolutionListener.java | 10 +-
.../version/PluginVersionResolutionException.java | 12 +-
.../maven/project/DefaultProjectBuilder.java | 12 +-
.../DefaultProjectDependenciesResolver.java | 11 +-
.../org/apache/maven/project/MavenProject.java | 2 +-
.../org/apache/maven/project/ProjectSorter.java | 8 +-
.../apache/maven/project/ReactorModelCache.java | 78 +++-
.../artifact/DefaultMavenMetadataCache.java | 8 +-
.../maven/repository/ArtifactTransferEvent.java | 5 +-
.../maven/session/scope/internal/SessionScope.java | 47 +--
.../maven/toolchain/DefaultToolchainManager.java | 2 +-
.../building/DefaultToolchainsBuilder.java | 17 +-
.../building/DefaultToolchainsBuildingResult.java | 2 +-
.../artifact/handler/ArtifactHandlerTest.java | 1 -
.../configuration/DefaultBeanConfiguratorTest.java | 20 +-
.../scope/internal/MojoExecutionScopeTest.java | 20 +-
.../lifecycle/internal/BuilderCommonTest.java | 3 +-
.../internal/LifecycleDependencyResolverTest.java | 10 +-
.../internal/stub/CompletionServiceStub.java | 2 +-
.../internal/stub/DefaultLifecyclesStub.java | 1 -
.../lifecycle/internal/stub/MojoExecutorStub.java | 2 +-
.../PluginParameterExpressionEvaluatorTest.java | 2 +-
.../project/AbstractMavenProjectTestCase.java | 7 +-
.../project/DefaultMavenProjectBuilderTest.java | 6 +-
.../project/ExtensionDescriptorBuilderTest.java | 11 +-
.../apache/maven/project/ProjectBuilderTest.java | 20 +-
.../building/DefaultToolchainsBuilderTest.java | 2 +-
.../building/ToolchainsBuildingExceptionTest.java | 2 +-
.../test/projects/project-builder/MNG-6723/pom.xml | 38 ++
maven-embedder/pom.xml | 66 ++--
.../main/java/org/apache/maven/cli/CLIManager.java | 5 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 4 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 30 +-
.../java/org/apache/maven/cli/ResolveFile.java | 3 +-
.../maven/cli/event/ExecutionEventLogger.java | 28 +-
.../impl/UnsupportedSlf4jBindingConfiguration.java | 2 +-
.../transfer/AbstractMavenTransferListener.java | 2 +-
.../cli/transfer/ConsoleMavenTransferListener.java | 2 +-
.../META-INF/maven/slf4j-configuration.properties | 2 +-
.../maven/cli/CLIManagerDocumentationTest.java | 2 +-
.../maven/cli/transfer/FileSizeFormatTest.java | 21 +-
.../maven/model/building/ArtifactModelSource.java | 27 +-
.../maven/model/building/DefaultModelBuilder.java | 225 ++++++++---
.../maven/model/building/FileModelSource.java | 9 +-
.../model/building/ModelBuildingEventCatapult.java | 9 +-
.../apache/maven/model/building/ModelCache.java | 29 ++
.../apache/maven/model/building/ModelCacheTag.java | 26 ++
.../inheritance/DefaultInheritanceAssembler.java | 8 +-
.../interpolation/ProblemDetectingValueSource.java | 1 -
.../StringSearchModelInterpolator.java | 32 +-
.../StringVisitorModelInterpolator.java | 32 +-
.../DefaultDependencyManagementInjector.java | 4 +-
.../DefaultPluginManagementInjector.java | 8 +-
.../apache/maven/model/merge/MavenModelMerger.java | 48 +--
.../model/profile/DefaultProfileInjector.java | 16 +-
.../model/superpom/DefaultSuperPomProvider.java | 2 +-
.../model/validation/DefaultModelValidator.java | 7 +-
.../StringSearchModelInterpolatorTest.java | 20 +-
maven-model/pom.xml | 16 +-
.../org/apache/maven/model/merge/ModelMerger.java | 408 +++++--------------
.../apache/maven/model/merge/ModelMergerTest.java | 430 +++++++++++++++++++++
maven-plugin-api/pom.xml | 6 -
.../plugin/lifecycle/LifecycleXpp3ReaderTest.java | 55 ---
maven-plugin-api/src/test/resources/lifecycle.xml | 39 --
.../internal/DefaultArtifactDescriptorReader.java | 7 +-
.../repository/internal/DefaultModelResolver.java | 7 +-
.../internal/RemoteSnapshotMetadataTest.java | 2 +-
.../settings/building/DefaultSettingsBuilder.java | 17 +-
.../building/DefaultSettingsBuildingResult.java | 2 +-
.../building/DefaultSettingsProblemCollector.java | 2 +-
.../crypto/DefaultSettingsDecryptionResult.java | 6 +-
maven-slf4j-provider/pom.xml | 4 +
.../org/slf4j/impl/MavenFailOnSeverityLogger.java | 142 +++++++
...eLoggerFactory.java => MavenLoggerFactory.java} | 43 ++-
.../java/org/slf4j/impl/MavenSimpleLogger.java | 24 +-
.../java/org/slf4j/impl/StaticLoggerBinder.java | 4 +-
.../org/slf4j/impl/MavenLoggerFactoryTest.java | 90 +++++
.../pom.xml | 18 +-
.../apache/maven/logwrapper/LogLevelRecorder.java | 41 +-
.../maven/logwrapper/MavenSlf4jWrapperFactory.java | 17 +-
.../src/site/site.xml | 0
.../maven/logwrapper/LogLevelRecorderTest.java | 37 +-
pom.xml | 52 +--
138 files changed, 1820 insertions(+), 1291 deletions(-)
rename apache-maven/src/main/appended-resources/licenses/{ASL-2.0.txt => Apache-2.0.txt} (100%)
copy maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java => maven-model-builder/src/main/java/org/apache/maven/model/building/ArtifactModelSource.java (69%)
create mode 100644 maven-model/src/test/java/org/apache/maven/model/merge/ModelMergerTest.java
delete mode 100644 maven-plugin-api/src/test/java/org/apache/maven/plugin/lifecycle/LifecycleXpp3ReaderTest.java
delete mode 100644 maven-plugin-api/src/test/resources/lifecycle.xml
create mode 100644 maven-slf4j-provider/src/main/java/org/slf4j/impl/MavenFailOnSeverityLogger.java
rename maven-slf4j-provider/src/main/java/org/slf4j/impl/{MavenSimpleLoggerFactory.java => MavenLoggerFactory.java} (52%)
create mode 100644 maven-slf4j-provider/src/test/java/org/slf4j/impl/MavenLoggerFactoryTest.java
copy {maven-builder-support => maven-slf4j-wrapper}/pom.xml (69%)
copy maven-core/src/main/java/org/apache/maven/extension/internal/CoreExportsProvider.java => maven-slf4j-wrapper/src/main/java/org/apache/maven/logwrapper/LogLevelRecorder.java (52%)
copy maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManagerDelegate.java => maven-slf4j-wrapper/src/main/java/org/apache/maven/logwrapper/MavenSlf4jWrapperFactory.java (70%)
copy {maven-slf4j-provider => maven-slf4j-wrapper}/src/site/site.xml (100%)
copy maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java => maven-slf4j-wrapper/src/test/java/org/apache/maven/logwrapper/LogLevelRecorderTest.java (55%)
[maven] 01/01: WIP - [MNG-6012] Missing profile is only notified at the end of a run o Introduced new command line option --fail-on-missing-profiles which will fail the build immediately. o Print WARNING at the beginning and at the end of the output.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-6012-Missing-Profile-At-End
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 65dd2374d63a08655b19f4a0f852bfb23339964c
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Jul 16 13:13:54 2016 +0200
WIP - [MNG-6012] Missing profile is only notified at the end of a run
o Introduced new command line option --fail-on-missing-profiles
which will fail the build immediately.
o Print WARNING at the beginning and at the end of the output.
---
apache-maven/pom.xml | 11 +++++++
.../execution/DefaultMavenExecutionRequest.java | 36 ++++++++++++++++++++--
.../maven/execution/MavenExecutionRequest.java | 36 ++++++++++++++++++++++
.../main/java/org/apache/maven/cli/CLIManager.java | 2 +-
.../apache/maven/monitor/logging/DefaultLog.java | 3 ++
5 files changed, 84 insertions(+), 4 deletions(-)
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index a73163f..58116db 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -131,6 +131,17 @@ under the License.
</plugins>
</pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>process-resource-bundles</id>
+ <phase>U</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
index 4a039eb..fc36b39 100644
--- 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,8 +163,11 @@ public class DefaultMavenExecutionRequest
private Map<String, Object> data;
+ private FailLevel failLevel;
+
public DefaultMavenExecutionRequest()
{
+ this.failLevel = FailLevel.ERROR;
}
public static MavenExecutionRequest copy( MavenExecutionRequest original )
@@ -186,8 +189,8 @@ public class DefaultMavenExecutionRequest
copy.setGlobalSettingsFile( original.getGlobalSettingsFile() );
copy.setUserToolchainsFile( original.getUserToolchainsFile() );
copy.setGlobalToolchainsFile( original.getGlobalToolchainsFile() );
- copy.setBaseDirectory( ( original.getBaseDirectory() != null ) ? new File( original.getBaseDirectory() )
- : null );
+ copy.setBaseDirectory(
+ ( original.getBaseDirectory() != null ) ? new File( original.getBaseDirectory() ) : null );
copy.setGoals( original.getGoals() );
copy.setRecursive( original.isRecursive() );
copy.setPom( original.getPom() );
@@ -670,7 +673,9 @@ public class DefaultMavenExecutionRequest
return useReactor;
}
- /** @deprecated use {@link #setPom(File)} */
+ /**
+ * @deprecated use {@link #setPom(File)}
+ */
@Deprecated
public MavenExecutionRequest setPomFile( String pomFilename )
{
@@ -1283,4 +1288,29 @@ public class DefaultMavenExecutionRequest
return data;
}
+
+ @Override
+ public boolean isFailLevelWARN()
+ {
+ return this.failLevel.equals( FailLevel.WARN );
+ }
+
+ @Override
+ public boolean isFailLevelERROR()
+ {
+ return this.failLevel.equals( FailLevel.ERROR );
+ }
+
+ @Override
+ public FailLevel getFailLevel()
+ {
+ return this.failLevel;
+ }
+
+ @Override
+ public MavenExecutionRequest setFailLevel( FailLevel failLevel )
+ {
+ this.failLevel = failLevel;
+ return this;
+ }
}
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 d006a43..1550c78 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
@@ -92,6 +92,16 @@ public interface MavenExecutionRequest
String CHECKSUM_POLICY_WARN = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
+ public enum FailLevel {
+ /**
+ * The default level on which Maven will fail the build.
+ */
+ ERROR,
+ /**
+ * In case of warnings fail the build.
+ */
+ WARN
+ }
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
@@ -442,4 +452,30 @@ public interface MavenExecutionRequest
* @since 3.3.0
*/
Map<String, Object> getData();
+
+ /**
+ * @return the current {@link FailLevel}
+ * @since 3.4.0
+ */
+ FailLevel getFailLevel();
+
+ /**
+ * Set the fail level to one of {@link FailLevel}.
+ * @param The FailLevel.
+ * @return {@link MavenExecutionRequest}
+ * @since 3.4.0
+ */
+ MavenExecutionRequest setFailLevel( FailLevel failLevel );
+
+ /**
+ * check if FailLevel is {@code WARN}.
+ * @return true if {@link FailLevel} is {@code WARN}.
+ */
+ boolean isFailLevelWARN();
+ /**
+ * check if FailLevel is {@code ERROR}.
+ * @return true if {@link FailLevel} is {@code ERROR}.
+ */
+ boolean isFailLevelERROR();
+
}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
index c9e002a..f1d45a0 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
@@ -26,7 +26,7 @@ import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
+import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java b/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java
index 4fee2e2..8820562 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/monitor/logging/DefaultLog.java
@@ -81,16 +81,19 @@ public class DefaultLog
public void warn( CharSequence content )
{
logger.warn( toString( content ) );
+ logger.warn( " **** " );
}
public void warn( CharSequence content, Throwable error )
{
logger.warn( toString( content ), error );
+ logger.warn( " **** " );
}
public void warn( Throwable error )
{
logger.warn( "", error );
+ logger.warn( " **** " );
}
public void error( CharSequence content )