You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2020/02/04 22:15:28 UTC
[maven] 01/01: Merge branch 'master' into MNG-6656
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven.git
commit a191af7c4e932eef496daf5bae0bfa47475d134a
Merge: 3d453bf 716cc1f
Author: rfscholte <rf...@apache.org>
AuthorDate: Tue Feb 4 23:15:12 2020 +0100
Merge branch 'master' into MNG-6656
Jenkinsfile | 10 +-
apache-maven/pom.xml | 6 +-
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 +-
.../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 +-
.../repository/legacy/LegacyRepositorySystem.java | 8 +-
.../metadata/DefaultClasspathTransformation.java | 30 +--
.../maven/repository/metadata/MetadataGraph.java | 14 +-
.../AbstractArtifactComponentTestCase.java | 3 +-
.../resolver/filter/AndArtifactFilterTest.java | 10 +-
.../resolver/filter/OrArtifactFilterTest.java | 10 +-
.../maven/artifact/testutils/TestFileManager.java | 10 +-
.../maven/repository/legacy/StringWagon.java | 11 +-
.../resolver/DefaultArtifactCollectorTest.java | 20 +-
.../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/internal/DefaultMavenPluginManager.java | 10 +-
.../PluginDependencyResolutionListener.java | 10 +-
.../version/PluginVersionResolutionException.java | 12 +-
.../maven/project/DefaultProjectBuilder.java | 12 +-
.../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 +-
.../project/ExtensionDescriptorBuilderTest.java | 11 +-
.../apache/maven/project/ProjectBuilderTest.java | 20 +-
maven-embedder/pom.xml | 8 +-
.../main/java/org/apache/maven/cli/CLIManager.java | 5 +-
.../org/apache/maven/cli/CLIReportingUtils.java | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 30 ++-
.../java/org/apache/maven/cli/ResolveFile.java | 3 +-
.../maven/cli/event/ExecutionEventLogger.java | 28 ++-
.../transfer/AbstractMavenTransferListener.java | 2 +-
.../cli/transfer/ConsoleMavenTransferListener.java | 2 +-
.../META-INF/maven/slf4j-configuration.properties | 2 +-
.../maven/model/building/ArtifactModelSource.java | 52 +++--
.../maven/model/building/DefaultModelBuilder.java | 224 +++++++++++++++------
.../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 +++
.../interpolation/ProblemDetectingValueSource.java | 1 -
.../StringSearchModelInterpolator.java | 32 ++-
.../StringVisitorModelInterpolator.java | 32 ++-
.../model/superpom/DefaultSuperPomProvider.java | 2 +-
.../StringSearchModelInterpolatorTest.java | 20 +-
.../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 +++++++++
maven-slf4j-wrapper/pom.xml | 44 ++++
.../apache/maven/logwrapper/LogLevelRecorder.java | 40 ++--
.../maven/logwrapper/MavenSlf4jWrapperFactory.java | 30 +--
maven-slf4j-wrapper/src/site/site.xml | 38 ++++
.../maven/logwrapper/LogLevelRecorderTest.java | 50 ++---
pom.xml | 20 +-
109 files changed, 1189 insertions(+), 690 deletions(-)
diff --cc maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
index d402f96,da43088..7407b9a
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@@ -37,10 -39,8 +39,9 @@@ import org.apache.maven.execution.Maven
import org.apache.maven.model.building.FileModelSource;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelSource;
+import org.apache.maven.session.scope.internal.SessionScope;
import org.apache.maven.shared.utils.io.FileUtils;
- import com.google.common.io.Files;
public class ProjectBuilderTest
extends AbstractCoreMavenComponentTestCase
diff --cc maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 0e2f10a,cc1ba71..98d2703
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@@ -19,46 -19,13 +19,48 @@@ package org.apache.maven.model.building
* under the License.
*/
+import static org.apache.maven.model.building.Result.error;
+import static org.apache.maven.model.building.Result.newResult;
+
+ import org.apache.maven.artifact.versioning.ArtifactVersion;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamResult;
+
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
+ import org.apache.maven.building.Source;
+import org.apache.maven.feature.Features;
import org.apache.maven.model.Activation;
import org.apache.maven.model.Build;
+import org.apache.maven.model.BuildBase;
+import org.apache.maven.model.CiManagement;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.InputLocation;
@@@ -462,12 -415,17 +464,22 @@@ public class DefaultModelBuilde
resultData.setArtifactId( resultModel.getArtifactId() );
resultData.setVersion( resultModel.getVersion() );
+ if ( request.getPomFile() != null )
+ {
+ intoCache( request.getModelCache(), new FileModelSource( request.getPomFile() ), ModelCacheTag.RAW,
+ resultData );
+ }
+ else
+ {
+ intoCache( request.getModelCache(), request.getModelSource(), ModelCacheTag.RAW, resultData );
+ }
+
result.setEffectiveModel( resultModel );
+
+ if ( request.getPomFile() != null )
+ {
+ modelCacheManager.put( request.getPomFile().toPath(), resultModel );
+ }
for ( ModelData currentData : lineage )
{
diff --cc pom.xml
index 3bfc00e,3148a97..56e7e78
--- a/pom.xml
+++ b/pom.xml
@@@ -234,9 -241,9 +241,14 @@@ under the License
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-slf4j-wrapper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-xml</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!--bootstrap-end-comment-->
<!-- Plexus -->
<dependency>