Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
As Resolver session contains non-MavenWorkspaceReader, the reactor models (already resolved w/ profiles applied) are re-built when using Resolver within Mojo, instead to get them via ReactorReader as expected. The rebuilt models will lack explicit (-P on CLI) profiles applied, as resolver itself is not maven aware, hence there is no way to "tell" resolver to apply them. Building reactor models w/ profiles applied is NOT done using resolver, but by Maven when loading up reactor, as profiles are NOT applied for downstream transitive dependencies (see discussion on MNG-1388 why). Signed-off-by: Christoph Läubrich <christoph@laeubi-soft.de> Co-authored-by: Christoph Läubrich <christoph@laeubi-soft.de> Co-authored-by: Tamas Cservenak <tamas@cservenak.net>
- Loading branch information
3 people
committed
Apr 8, 2022
1 parent
6189b48
commit 957b5e3
Showing
4 changed files
with
147 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106
maven-core/src/main/java/org/apache/maven/internal/aether/MavenChainedWorkspaceReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| package org.apache.maven.internal.aether; | ||
|
|
||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import java.io.File; | ||
| import java.util.Collection; | ||
| import java.util.List; | ||
|
|
||
| import org.apache.maven.model.Model; | ||
| import org.apache.maven.repository.internal.MavenWorkspaceReader; | ||
| import org.eclipse.aether.artifact.Artifact; | ||
| import org.eclipse.aether.repository.WorkspaceReader; | ||
| import org.eclipse.aether.repository.WorkspaceRepository; | ||
| import org.eclipse.aether.util.repository.ChainedWorkspaceReader; | ||
|
|
||
| /** | ||
| * A maven workspace reader that delegates to a chain of other readers, effectively aggregating their contents. | ||
| */ | ||
| public final class MavenChainedWorkspaceReader | ||
| implements MavenWorkspaceReader | ||
| { | ||
|
|
||
| private ChainedWorkspaceReader delegate; | ||
|
|
||
| private WorkspaceReader[] readers; | ||
|
|
||
| /** | ||
| * Creates a new workspace reader by chaining the specified readers. | ||
| * | ||
| * @param readers The readers to chain must not be {@code null}. | ||
| */ | ||
| private MavenChainedWorkspaceReader( WorkspaceReader... readers ) | ||
| { | ||
| this.delegate = new ChainedWorkspaceReader( readers ); | ||
| this.readers = readers; | ||
| } | ||
|
|
||
| @Override | ||
| public Model findModel( Artifact artifact ) | ||
| { | ||
| for ( WorkspaceReader workspaceReader : readers ) | ||
| { | ||
| if ( workspaceReader instanceof MavenWorkspaceReader ) | ||
| { | ||
| Model model = ( (MavenWorkspaceReader) workspaceReader ).findModel( artifact ); | ||
| if ( model != null ) | ||
| { | ||
| return model; | ||
| } | ||
| } | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public WorkspaceRepository getRepository() | ||
| { | ||
| return delegate.getRepository(); | ||
| } | ||
|
|
||
| @Override | ||
| public File findArtifact( Artifact artifact ) | ||
| { | ||
| return delegate.findArtifact( artifact ); | ||
| } | ||
|
|
||
| @Override | ||
| public List<String> findVersions( Artifact artifact ) | ||
| { | ||
| return delegate.findVersions( artifact ); | ||
| } | ||
|
|
||
| /** | ||
| * chains a collection of {@link WorkspaceReader}s | ||
| * @param workspaceReaderCollection the collection of readers, might be empty but never <code>null</code> | ||
| * @return if the collection contains only one item returns the single item, otherwise creates a new | ||
| * {@link MavenChainedWorkspaceReader} chaining all readers in the order of the given collection. | ||
| */ | ||
| public static WorkspaceReader of( Collection<WorkspaceReader> workspaceReaderCollection ) | ||
| { | ||
| WorkspaceReader[] readers = workspaceReaderCollection.toArray( new WorkspaceReader[0] ); | ||
| if ( readers.length == 1 ) | ||
| { | ||
| return readers[0]; | ||
| } | ||
| return new MavenChainedWorkspaceReader( readers ); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <groupId>simple</groupId> | ||
| <artifactId>simple</artifactId> | ||
| <version>1.0-SNAPSHOT</version> | ||
| <packaging>pom</packaging> | ||
|
|
||
| </project> |