michael-o commented on a change in pull request #429:
URL: https://github.com/apache/maven/pull/429#discussion_r567250499
##########
File path:
maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
##########
@@ -277,22 +277,62 @@
MavenExecutionRequest setProfiles( List<Profile> profiles );
+ /**
+ * @deprecated Use {@link #getProfileActivation()}.
Review comment:
I think the link should point to a method would can suitably replace a
deprecated one, if possible.
##########
File path: maven-core/src/main/java/org/apache/maven/DefaultMaven.java
##########
@@ -493,22 +505,88 @@ private void
validatePrerequisitesForNonMavenPluginProjects( List<MavenProject>
}
}
- private void validateActivatedProfiles( List<MavenProject> projects,
List<String> activeProfileIds )
+ /**
+ * Get all profiles that are detected in either the projects, any parent
of the projects or the settings.
+ * @param session The Maven session
+ * @return A {@link Set} of profile identifiers, never {@code null}.
+ */
+ private Set<String> getAllProfiles( MavenSession session )
{
- Collection<String> notActivatedProfileIds = new LinkedHashSet<>(
activeProfileIds );
-
- for ( MavenProject project : projects )
+ final Set<MavenProject> projectsIncludingParents = new HashSet<>();
+ for ( MavenProject project : session.getProjects() )
{
- for ( List<String> profileIds :
project.getInjectedProfileIds().values() )
+ boolean isAdded = projectsIncludingParents.add( project );
+ MavenProject parent = project.getParent();
+ while ( isAdded && parent != null )
{
- notActivatedProfileIds.removeAll( profileIds );
+ isAdded = projectsIncludingParents.add( parent );
+ parent = parent.getParent();
}
}
- for ( String notActivatedProfileId : notActivatedProfileIds )
+ final Stream<String> projectProfiles =
projectsIncludingParents.stream()
+ .map( MavenProject::getModel )
+ .map( Model::getProfiles )
+ .flatMap( Collection::stream )
+ .map( Profile::getId );
+ final Stream<String> settingsProfiles =
session.getSettings().getProfiles().stream()
+ .map( org.apache.maven.settings.Profile::getId );
+
+ return Stream.concat( projectProfiles, settingsProfiles ).collect(
toSet() );
+ }
+
+ /**
+ * Check whether the required profiles were found in any of the projects
we're building or the Maven settings.
Review comment:
drop "Maven" because the method above doesn't use it either.
##########
File path:
maven-core/src/main/java/org/apache/maven/execution/ProfileActivation.java
##########
@@ -0,0 +1,180 @@
+package org.apache.maven.execution;
+
+/*
+ * 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.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
+
+import static java.util.stream.Collectors.toSet;
+
+/**
+ * Container for storing the request from the user to activate or de-activate
certain profiles and optionally fail the
+ * build if those profiles do not exist.
+ */
+public class ProfileActivation
Review comment:
Agreed.
##########
File path: maven-core/src/main/java/org/apache/maven/DefaultMaven.java
##########
@@ -493,22 +505,88 @@ private void
validatePrerequisitesForNonMavenPluginProjects( List<MavenProject>
}
}
- private void validateActivatedProfiles( List<MavenProject> projects,
List<String> activeProfileIds )
+ /**
+ * Get all profiles that are detected in either the projects, any parent
of the projects or the settings.
+ * @param session The Maven session
+ * @return A {@link Set} of profile identifiers, never {@code null}.
+ */
+ private Set<String> getAllProfiles( MavenSession session )
{
- Collection<String> notActivatedProfileIds = new LinkedHashSet<>(
activeProfileIds );
-
- for ( MavenProject project : projects )
+ final Set<MavenProject> projectsIncludingParents = new HashSet<>();
+ for ( MavenProject project : session.getProjects() )
{
- for ( List<String> profileIds :
project.getInjectedProfileIds().values() )
+ boolean isAdded = projectsIncludingParents.add( project );
+ MavenProject parent = project.getParent();
+ while ( isAdded && parent != null )
{
- notActivatedProfileIds.removeAll( profileIds );
+ isAdded = projectsIncludingParents.add( parent );
+ parent = parent.getParent();
}
}
- for ( String notActivatedProfileId : notActivatedProfileIds )
+ final Stream<String> projectProfiles =
projectsIncludingParents.stream()
+ .map( MavenProject::getModel )
+ .map( Model::getProfiles )
+ .flatMap( Collection::stream )
+ .map( Profile::getId );
+ final Stream<String> settingsProfiles =
session.getSettings().getProfiles().stream()
+ .map( org.apache.maven.settings.Profile::getId );
+
+ return Stream.concat( projectProfiles, settingsProfiles ).collect(
toSet() );
+ }
+
+ /**
+ * Check whether the required profiles were found in any of the projects
we're building or the Maven settings.
+ * @param session the Maven session.
+ * @param profileActivation the requested optional and required profiles.
+ */
+ private void validateRequiredProfiles( MavenSession session,
ProfileActivation profileActivation )
+ {
+ final Set<String> allAvailableProfiles = getAllProfiles( session );
+
+ final Set<String> requiredProfiles = new HashSet<>( );
+ requiredProfiles.addAll(
profileActivation.getRequiredActiveProfileIds() );
+ requiredProfiles.addAll(
profileActivation.getRequiredInactiveProfileIds() );
+
+ // Check whether the required profiles were found in any of the
projects we're building.
+ final Set<String> notFoundRequiredProfiles = requiredProfiles.stream()
+ .filter( rap -> !allAvailableProfiles.contains( rap ) )
+ .collect( toSet() );
+
+ if ( !notFoundRequiredProfiles.isEmpty() )
+ {
+ final String message = String.format(
+ "The requested profiles [%s] could not be activated or
de-activated because they do not exist.",
Review comment:
Please use [deactivate](https://www.lexico.com/en/definition/deactivate).
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
