-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MNG-6802] FileProfileActivator changes FileProfileActivator.exists w…
…hich lets flattened resolveCiFriendliesOnly depending fail activating profile Cherry picked from 3fabb63 This closes #649
- Loading branch information
Showing
6 changed files
with
354 additions
and
58 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
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
103 changes: 103 additions & 0 deletions
103
...lder/src/main/java/org/apache/maven/model/path/ProfileActivationFilePathInterpolator.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,103 @@ | ||
| package org.apache.maven.model.path; | ||
|
|
||
| /* | ||
| * 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 org.apache.maven.model.ActivationFile; | ||
| import org.apache.maven.model.profile.ProfileActivationContext; | ||
| import org.codehaus.plexus.interpolation.AbstractValueSource; | ||
| import org.codehaus.plexus.interpolation.InterpolationException; | ||
| import org.codehaus.plexus.interpolation.MapBasedValueSource; | ||
| import org.codehaus.plexus.interpolation.RegexBasedInterpolator; | ||
|
|
||
| import javax.inject.Inject; | ||
| import javax.inject.Named; | ||
| import javax.inject.Singleton; | ||
| import java.io.File; | ||
|
|
||
| /** | ||
| * Finds an absolute path for {@link ActivationFile#getExists()} or {@link ActivationFile#getMissing()} | ||
| * | ||
| * @author Ravil Galeyev | ||
| */ | ||
| @Named | ||
| @Singleton | ||
| public class ProfileActivationFilePathInterpolator | ||
| { | ||
|
|
||
| @Inject | ||
| private PathTranslator pathTranslator; | ||
|
|
||
| public ProfileActivationFilePathInterpolator setPathTranslator( PathTranslator pathTranslator ) | ||
| { | ||
| this.pathTranslator = pathTranslator; | ||
| return this; | ||
| } | ||
|
|
||
| /** | ||
| * Interpolates given {@code path}. | ||
| * | ||
| * @return absolute path or {@code null} if the input was {@code null} | ||
| */ | ||
| public String interpolate( String path, ProfileActivationContext context ) throws InterpolationException | ||
| { | ||
| if ( path == null ) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| RegexBasedInterpolator interpolator = new RegexBasedInterpolator(); | ||
|
|
||
| final File basedir = context.getProjectDirectory(); | ||
|
|
||
| if ( basedir != null ) | ||
| { | ||
| interpolator.addValueSource( new AbstractValueSource( false ) | ||
| { | ||
| @Override | ||
| public Object getValue( String expression ) | ||
| { | ||
| /* | ||
| * We intentionally only support ${basedir} and not ${project.basedir} as the latter form | ||
| * would suggest that other project.* expressions can be used which is beyond the design. | ||
| */ | ||
| if ( "basedir".equals( expression ) ) | ||
| { | ||
| return basedir.getAbsolutePath(); | ||
| } | ||
| return null; | ||
| } | ||
| } ); | ||
| } | ||
| else if ( path.contains( "${basedir}" ) ) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| interpolator.addValueSource( new MapBasedValueSource( context.getProjectProperties() ) ); | ||
|
|
||
| interpolator.addValueSource( new MapBasedValueSource( context.getUserProperties() ) ); | ||
|
|
||
| interpolator.addValueSource( new MapBasedValueSource( context.getSystemProperties() ) ); | ||
|
|
||
| String absolutePath = interpolator.interpolate( path, "" ); | ||
|
|
||
| return pathTranslator.alignToBaseDirectory( absolutePath, basedir ); | ||
| } | ||
| } |
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
Oops, something went wrong.
0f3c39bThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@michael-o This commit broke the build with a checkstyle error...
0f3c39bThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shit, will fix