Skip to content

[MNG-3309] Cascading profile activation #1774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gnodet wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[MNG-3309] Cascading profile activation #1774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
distribution: 'temurin'

- name: Checkout maven
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false

Expand Down Expand Up @@ -163,7 +163,7 @@ jobs:
run: choco install graphviz

- name: Checkout maven
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false

Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:
distribution: 'temurin'

- name: Checkout maven
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false

Expand Down
15 changes: 0 additions & 15 deletions api/maven-api-core/src/main/java/org/apache/maven/api/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,21 +489,6 @@ public final class Constants {
@Config(type = "java.lang.Boolean", defaultValue = "false")
public static final String MAVEN_CONSUMER_POM_FLATTEN = "maven.consumer.pom.flatten";

/**
* User property for controlling removal of unused managed dependencies during consumer POM flattening.
* When set to {@code true} (default), managed dependencies that do not appear in the resolved
* dependency tree are removed from the consumer POM to keep it lean. This is important when using
* BOMs like Spring Boot or Quarkus that contain hundreds of managed dependency entries.
* When set to {@code false}, all managed dependencies are preserved in the consumer POM,
* which may be needed in rare cases where downstream consumers override transitive dependency
* versions and rely on the original managed dependencies for alignment.
*
* @since 4.1.0
*/
@Config(type = "java.lang.Boolean", defaultValue = "true")
public static final String MAVEN_CONSUMER_POM_REMOVE_UNUSED_MANAGED_DEPENDENCIES =
"maven.consumer.pom.removeUnusedManagedDependencies";

/**
* User property for controlling "maven personality". If activated Maven will behave
* like the previous major version, Maven 3.
Expand Down
7 changes: 0 additions & 7 deletions api/maven-api-core/src/main/java/org/apache/maven/api/feature/Features.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,6 @@ public static boolean consumerPomFlatten(@Nullable Map<String, ?> userProperties
return doGet(userProperties, Constants.MAVEN_CONSUMER_POM_FLATTEN, false);
}

/**
* Check if unused managed dependency removal is enabled during consumer POM flattening.
*/
public static boolean consumerPomRemoveUnusedManagedDependencies(@Nullable Map<String, ?> userProperties) {
return doGet(userProperties, Constants.MAVEN_CONSUMER_POM_REMOVE_UNUSED_MANAGED_DEPENDENCIES, true);
}

/**
* Check if build POM deployment is enabled.
*/
Expand Down
22 changes: 0 additions & 22 deletions compat/maven-compat/src/main/java/org/apache/maven/toolchain/DefaultToolchain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

import org.apache.maven.toolchain.model.ToolchainModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Default abstract toolchain implementation, to be used as base class for any toolchain implementation
Expand Down Expand Up @@ -69,27 +68,6 @@ protected DefaultToolchain(ToolchainModel model, String type, Logger logger) {
this.type = type;
}

/**
* @param model the model, must not be {@code null}
* @param logger the logger (ignored, an SLF4J logger is used instead)
* @deprecated Use {@link #DefaultToolchain(ToolchainModel, Logger)} with an SLF4J logger instead.
*/
@Deprecated(since = "4.0.0")
protected DefaultToolchain(ToolchainModel model, org.codehaus.plexus.logging.Logger logger) {
this(model, LoggerFactory.getLogger(DefaultToolchain.class));
}

/**
* @param model the model, must not be {@code null}
* @param type the type
* @param logger the logger (ignored, an SLF4J logger is used instead)
* @deprecated Use {@link #DefaultToolchain(ToolchainModel, String, Logger)} with an SLF4J logger instead.
*/
@Deprecated(since = "4.0.0")
protected DefaultToolchain(ToolchainModel model, String type, org.codehaus.plexus.logging.Logger logger) {
this(model, type, LoggerFactory.getLogger(DefaultToolchain.class));
}

@Override
public final String getType() {
return type != null ? type : model.getType();
Expand Down
16 changes: 0 additions & 16 deletions ...at/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-child.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,4 @@ under the License.
</plugin>
</plugins>
</build>

<reporting>
<plugins>
<plugin>
<artifactId>MNG-5115-2</artifactId>
<reportSets>
<reportSet>
<id>inherited-append</id>
<reports>
<report>from-child</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>
</project>
12 changes: 0 additions & 12 deletions ...maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-expected.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,18 +82,6 @@ under the License.
<!-- reportSet with inherited=false is not here -->
</reportSets>
</plugin>
<plugin>
<artifactId>MNG-5115-2</artifactId>
<reportSets>
<reportSet>
<id>inherited-append</id>
<reports>
<report>from-child</report>
<report>to-be-inherited</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>
</project>
11 changes: 0 additions & 11 deletions ...t/maven-model-builder/src/test/resources/poms/inheritance/plugin-configuration-parent.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,6 @@ under the License.
</reportSet>
</reportSets>
</plugin>
<plugin>
<artifactId>MNG-5115-2</artifactId>
<reportSets>
<reportSet>
<id>inherited-append</id>
<reports>
<report>to-be-inherited</report>
</reports>
</reportSet>
</reportSets>
</plugin>
</plugins>
</reporting>
</project>
11 changes: 0 additions & 11 deletions doap_Maven.rdf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,6 @@ under the License.
<release>
<Version>
<name>Latest stable release</name>
<created>2026-05-13</created>
<revision>3.9.16</revision>
<file-release>https://archive.apache.org/dist/maven/maven-3/3.9.16/binaries/apache-maven-3.9.16-bin.zip</file-release>
<file-release>https://archive.apache.org/dist/maven/maven-3/3.9.16/binaries/apache-maven-3.9.16-bin.tar.gz</file-release>
<file-release>https://archive.apache.org/dist/maven/maven-3/3.9.16/source/apache-maven-3.9.16-src.zip</file-release>
<file-release>https://archive.apache.org/dist/maven/maven-3/3.9.16/source/apache-maven-3.9.16-src.tar.gz</file-release>
</Version>
</release>
<release>
<Version>
<name>Apache Maven 3.9.15</name>
<created>2026-04-13</created>
<revision>3.9.15</revision>
<file-release>https://archive.apache.org/dist/maven/maven-3/3.9.15/binaries/apache-maven-3.9.15-bin.zip</file-release>
Expand Down
Loading
Loading