You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/09/08 23:43:35 UTC
svn commit: r693291 [1/4] - in
/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven:
./ profiles/ profiles/activation/ profiles/build/ profiles/injection/
project/ project/artifact/ project/builder/ project/...
Author: sisbell
Date: Mon Sep 8 14:43:31 2008
New Revision: 693291
URL: http://svn.apache.org/viewvc?rev=693291&view=rev
Log:
Maven code convention.
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectHelper.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultRepositoryHelper.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DuplicateArtifactAttachmentException.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DuplicateProjectException.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/InvalidProjectModelException.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/InvalidProjectVersionException.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProjectHelper.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MavenProjectRestorer.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ModelAndFile.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectUtils.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/RepositoryHelper.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectArtifact.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/artifact/InvalidDependencyVersionException.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/artifact/ProjectArtifactMetadata.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/ArtifactModelContainerFactory.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/IdModelContainerFactory.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicDomainModel.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/PomClassicTransformer.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/Profile.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultImportModel.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/PathTranslatingPostProcessor.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/path/DefaultPathTranslator.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmManagementException.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmScanningUtils.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/realm/RealmUtils.java
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java Mon Sep 8 14:43:31 2008
@@ -32,7 +32,9 @@
import java.util.Iterator;
import java.util.List;
-/** @author Jason van Zyl */
+/**
+ * @author Jason van Zyl
+ */
public class DefaultMavenTools
implements MavenTools
{
@@ -94,7 +96,8 @@
if ( url == null || url.trim().length() < 1 )
{
- throw new MissingRepositoryElementException( "Repository URL must not be empty (ID is: " + id + ").", id );
+ throw new MissingRepositoryElementException( "Repository URL must not be empty (ID is: " + id + ").",
+ id );
}
ArtifactRepositoryPolicy snapshots = buildArtifactRepositoryPolicy( repo.getSnapshots() );
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java Mon Sep 8 14:43:31 2008
@@ -35,7 +35,11 @@
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.Logger;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Map.Entry;
public class DefaultProfileManager
@@ -50,7 +54,6 @@
/**
* the properties passed to the profile manager are the props that
* are passed to maven, possibly containing profile activator properties
- *
*/
public DefaultProfileManager( PlexusContainer container, ProfileActivationContext profileActivationContext )
{
@@ -181,7 +184,7 @@
public List getActiveProfiles()
throws ProfileActivationException
{
- return getActiveProfiles( null );
+ return getActiveProfiles( null );
}
public List getActiveProfiles( Model model )
@@ -194,7 +197,8 @@
if ( ( model != null ) && ( realmManager != null ) )
{
- projectRealm = realmManager.getProjectRealm( ModelUtils.getGroupId( model ), model.getArtifactId(), ModelUtils.getVersion( model ) );
+ projectRealm = realmManager.getProjectRealm( ModelUtils.getGroupId( model ), model.getArtifactId(),
+ ModelUtils.getVersion( model ) );
oldLookupRealm = container.setLookupRealm( projectRealm );
}
@@ -237,18 +241,18 @@
{
List defaultIds = profileActivationContext.getActiveByDefaultProfileIds();
- List deactivatedIds = profileActivationContext.getExplicitlyInactiveProfileIds();
-
+ List deactivatedIds = profileActivationContext.getExplicitlyInactiveProfileIds();
+
for ( Iterator it = defaultIds.iterator(); it.hasNext(); )
{
String profileId = (String) it.next();
-
- // If this profile was excluded, don't add it back in
- // Fixes MNG-3545
- if (deactivatedIds.contains(profileId))
- {
- continue;
- }
+
+ // If this profile was excluded, don't add it back in
+ // Fixes MNG-3545
+ if ( deactivatedIds.contains( profileId ) )
+ {
+ continue;
+ }
Profile profile = (Profile) profilesById.get( profileId );
if ( profile != null )
@@ -291,7 +295,8 @@
{
if ( activator.isActive( profile, context ) )
{
- container.getLogger().debug( "Profile: " + profile.getId() + " is active. (source: " + profile.getSource() + ")" );
+ container.getLogger().debug(
+ "Profile: " + profile.getId() + " is active. (source: " + profile.getSource() + ")" );
return true;
}
}
@@ -305,7 +310,7 @@
}
finally
{
- container.getContext().put("SystemProperties", null);
+ container.getContext().put( "SystemProperties", null );
if ( activators != null )
{
try
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/CustomActivator.java Mon Sep 8 14:43:31 2008
@@ -90,8 +90,9 @@
{
if ( !context.isCustomActivatorFailureSuppressed() )
{
- throw new ProfileActivationException( "Cannot find custom ProfileActivator: " + type
- + ". \nPerhaps you're missing a build extension?", e );
+ throw new ProfileActivationException(
+ "Cannot find custom ProfileActivator: " + type + ". \nPerhaps you're missing a build extension?",
+ e );
}
}
@@ -107,8 +108,7 @@
{
if ( !context.isCustomActivatorFailureSuppressed() )
{
- throw new ProfileActivationException( "Failed to configure custom ProfileActivator: " + type
- + ".", e );
+ throw new ProfileActivationException( "Failed to configure custom ProfileActivator: " + type + ".", e );
}
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/DefaultProfileActivationContext.java Mon Sep 8 14:43:31 2008
@@ -12,13 +12,19 @@
{
private boolean isCustomActivatorFailureSuppressed;
+
private final Properties executionProperties;
+
List explicitlyActive;
+
List explicitlyInactive;
+
private final MavenRealmManager realmManager;
+
private List activeByDefault;
- public DefaultProfileActivationContext( MavenRealmManager realmManager, Properties executionProperties, boolean isCustomActivatorFailureSuppressed )
+ public DefaultProfileActivationContext( MavenRealmManager realmManager, Properties executionProperties,
+ boolean isCustomActivatorFailureSuppressed )
{
this.realmManager = realmManager;
this.executionProperties = executionProperties;
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/FileProfileActivator.java Mon Sep 8 14:43:31 2008
@@ -76,11 +76,13 @@
{
if ( logger.isDebugEnabled() )
{
- logger.debug( "Failed to interpolate exists file location for profile activator: " + fileString, e );
+ logger.debug( "Failed to interpolate exists file location for profile activator: " + fileString,
+ e );
}
else
{
- logger.warn( "Failed to interpolate exists file location for profile activator: " + fileString + ". Run in debug mode (-X) for more information." );
+ logger.warn( "Failed to interpolate exists file location for profile activator: " + fileString +
+ ". Run in debug mode (-X) for more information." );
}
}
@@ -88,7 +90,8 @@
if ( logger != null )
{
- logger.debug( "FileProfileActivator: Checking file existence for: " + fileString + ". Result: " + result );
+ logger.debug(
+ "FileProfileActivator: Checking file existence for: " + fileString + ". Result: " + result );
}
return result;
@@ -107,11 +110,13 @@
{
if ( logger.isDebugEnabled() )
{
- logger.debug( "Failed to interpolate missing file location for profile activator: " + fileString, e );
+ logger.debug(
+ "Failed to interpolate missing file location for profile activator: " + fileString, e );
}
else
{
- logger.warn( "Failed to interpolate missing file location for profile activator: " + fileString + ". Run in debug mode (-X) for more information." );
+ logger.warn( "Failed to interpolate missing file location for profile activator: " +
+ fileString + ". Run in debug mode (-X) for more information." );
}
}
@@ -119,7 +124,8 @@
if ( logger != null )
{
- logger.debug( "FileProfileActivator: Checking file is missing for: " + fileString + ". Result: " + result );
+ logger.debug(
+ "FileProfileActivator: Checking file is missing for: " + fileString + ". Result: " + result );
}
return result;
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/JdkPrefixProfileActivator.java Mon Sep 8 14:43:31 2008
@@ -43,7 +43,8 @@
String javaVersion = props.getProperty( JDK_VERSION );
if ( javaVersion == null )
{
- getLogger().warn( "Cannot locate java version property: " + JDK_VERSION + ". NOT enabling profile: " + profile.getId() );
+ getLogger().warn(
+ "Cannot locate java version property: " + JDK_VERSION + ". NOT enabling profile: " + profile.getId() );
return false;
}
@@ -100,7 +101,8 @@
}
}
- /** This method transforms a string like "1.5.0_06" into
+ /**
+ * This method transforms a string like "1.5.0_06" into
* new int[]{1, 5, 0, 6}.
*/
private static int[] asIntArray( String pVersion )
@@ -129,7 +131,8 @@
return result;
}
- /** This method compares to integer arrays, as created
+ /**
+ * This method compares to integer arrays, as created
* by {@link #asIntArray(String)}.
*/
private static int compareTo( int[] pVersion1, int[] pVersion2 )
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/OperatingSystemProfileActivator.java Mon Sep 8 14:43:31 2008
@@ -62,7 +62,8 @@
private boolean ensureAtLeastOneNonNull( ActivationOS os )
{
- return ( os.getArch() != null ) || ( os.getFamily() != null ) || ( os.getName() != null ) || ( os.getVersion() != null );
+ return ( os.getArch() != null ) || ( os.getFamily() != null ) || ( os.getName() != null ) ||
+ ( os.getVersion() != null );
}
private boolean determineVersionMatch( String version )
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/ProfileActivator.java Mon Sep 8 14:43:31 2008
@@ -25,8 +25,10 @@
{
static final String ROLE = ProfileActivator.class.getName();
- boolean canDetermineActivation( Profile profile, ProfileActivationContext context ) throws ProfileActivationException;
+ boolean canDetermineActivation( Profile profile, ProfileActivationContext context )
+ throws ProfileActivationException;
- boolean isActive( Profile profile, ProfileActivationContext context ) throws ProfileActivationException;
+ boolean isActive( Profile profile, ProfileActivationContext context )
+ throws ProfileActivationException;
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java Mon Sep 8 14:43:31 2008
@@ -46,7 +46,7 @@
String name = property.getName();
boolean reverseName = false;
- if ( name.startsWith("!") )
+ if ( name.startsWith( "!" ) )
{
reverseName = true;
name = name.substring( 1 );
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/build/DefaultProfileAdvisor.java Mon Sep 8 14:43:31 2008
@@ -26,7 +26,11 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
-import org.apache.maven.profiles.*;
+import org.apache.maven.profiles.DefaultProfileManager;
+import org.apache.maven.profiles.MavenProfilesBuilder;
+import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.profiles.ProfilesConversionUtils;
+import org.apache.maven.profiles.ProfilesRoot;
import org.apache.maven.profiles.activation.ProfileActivationContext;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.apache.maven.profiles.injection.ProfileInjector;
@@ -63,25 +67,18 @@
private Logger logger;
- public List applyActivatedProfiles( Model model,
- File pomFile,
- boolean useProfilesXml,
+ public List applyActivatedProfiles( Model model, File pomFile, boolean useProfilesXml,
ProfileActivationContext activationContext )
throws ProjectBuildingException
{
// logger.debug( "Building profile manager for model: " + model.getId() + " with pom file: "
// + pomFile );
- ProfileManager profileManager = buildProfileManager( model,
- pomFile,
- useProfilesXml,
- activationContext );
+ ProfileManager profileManager = buildProfileManager( model, pomFile, useProfilesXml, activationContext );
return applyActivatedProfiles( model, pomFile, profileManager );
}
- public List applyActivatedExternalProfiles( Model model,
- File projectDir,
- ProfileManager externalProfileManager )
+ public List applyActivatedExternalProfiles( Model model, File projectDir, ProfileManager externalProfileManager )
throws ProjectBuildingException
{
if ( externalProfileManager == null )
@@ -95,9 +92,7 @@
return applyActivatedProfiles( model, projectDir, externalProfileManager );
}
- private List applyActivatedProfiles( Model model,
- File pomFile,
- ProfileManager profileManager )
+ private List applyActivatedProfiles( Model model, File pomFile, ProfileManager profileManager )
throws ProjectBuildingException
{
List activeProfiles;
@@ -142,9 +137,7 @@
return activeProfiles;
}
- private ProfileManager buildProfileManager( Model model,
- File pomFile,
- boolean useProfilesXml,
+ private ProfileManager buildProfileManager( Model model, File pomFile, boolean useProfilesXml,
ProfileActivationContext profileActivationContext )
throws ProjectBuildingException
{
@@ -160,8 +153,7 @@
return profileManager;
}
- public LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model,
- File pomFile,
+ public LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model, File pomFile,
ProfileManager profileManager )
throws ProjectBuildingException
{
@@ -179,8 +171,7 @@
}
catch ( ProfileActivationException e )
{
- throw new ProjectBuildingException(
- model.getId(),
+ throw new ProjectBuildingException( model.getId(),
"Failed to compute active profiles for repository aggregation.",
pomFile, e );
}
@@ -192,7 +183,8 @@
Profile externalProfile = (Profile) i.next();
if ( externalProfile.getRepositories() != null )
{
- for ( Iterator repoIterator = externalProfile.getRepositories().iterator(); repoIterator.hasNext(); )
+ for ( Iterator repoIterator = externalProfile.getRepositories().iterator();
+ repoIterator.hasNext(); )
{
Repository mavenRepo = (Repository) repoIterator.next();
@@ -215,23 +207,16 @@
}
}
- public LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model,
- File pomFile,
- boolean useProfilesXml,
+ public LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model, File pomFile, boolean useProfilesXml,
ProfileActivationContext activationContext )
throws ProjectBuildingException
{
- ProfileManager profileManager = buildProfileManager( model,
- pomFile,
- useProfilesXml,
- activationContext );
+ ProfileManager profileManager = buildProfileManager( model, pomFile, useProfilesXml, activationContext );
return getArtifactRepositoriesFromActiveProfiles( model, pomFile, profileManager );
}
- private void loadExternalProjectProfiles( ProfileManager profileManager,
- Model model,
- File pomFile )
+ private void loadExternalProjectProfiles( ProfileManager profileManager, Model model, File pomFile )
throws ProjectBuildingException
{
if ( pomFile != null )
@@ -264,14 +249,14 @@
catch ( IOException e )
{
throw new ProjectBuildingException( model.getId(),
- "Cannot read profiles.xml resource from directory: "
- + projectDir, pomFile, e );
+ "Cannot read profiles.xml resource from directory: " + projectDir,
+ pomFile, e );
}
catch ( XmlPullParserException e )
{
throw new ProjectBuildingException( model.getId(),
- "Cannot parse profiles.xml resource from directory: "
- + projectDir, pomFile, e );
+ "Cannot parse profiles.xml resource from directory: " + projectDir,
+ pomFile, e );
}
}
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/build/ProfileAdvisor.java Mon Sep 8 14:43:31 2008
@@ -29,35 +29,25 @@
import java.util.List;
/**
- *
* @author jdcasey
- *
*/
public interface ProfileAdvisor
{
String ROLE = ProfileAdvisor.class.getName();
- LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model,
- File pomFile,
- ProfileManager profileManager )
+ LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model, File pomFile, ProfileManager profileManager )
throws ProjectBuildingException;
- LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model,
- File pomFile,
- boolean useProfilesXml,
+ LinkedHashSet getArtifactRepositoriesFromActiveProfiles( Model model, File pomFile, boolean useProfilesXml,
ProfileActivationContext profileActivationContext )
throws ProjectBuildingException;
- List applyActivatedProfiles( Model model,
- File pomFile,
- boolean useProfilesXml,
+ List applyActivatedProfiles( Model model, File pomFile, boolean useProfilesXml,
ProfileActivationContext activationContext )
throws ProjectBuildingException;
- List applyActivatedExternalProfiles( Model model,
- File pomFile,
- ProfileManager externalProfileManager )
+ List applyActivatedExternalProfiles( Model model, File pomFile, ProfileManager externalProfileManager )
throws ProjectBuildingException;
}
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/profiles/injection/DefaultProfileInjector.java Mon Sep 8 14:43:31 2008
@@ -19,21 +19,41 @@
* under the License.
*/
-import org.apache.maven.model.*;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.BuildBase;
+import org.apache.maven.model.ConfigurationContainer;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.DistributionManagement;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginContainer;
+import org.apache.maven.model.PluginExecution;
+import org.apache.maven.model.PluginManagement;
+import org.apache.maven.model.Profile;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.ReportSet;
+import org.apache.maven.model.Reporting;
import org.apache.maven.project.ModelUtils;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
/**
* Inject profile data into a Model, using the profile as the dominant data source, and
* persisting results of the injection in the Model.
- *
+ * <p/>
* This will look similar to the ModelUtils/DefaultModelInheritanceAssembler code, but
* they are distinct. In model inheritance, the child provides data dominance AND persists
* the results of the merge...sort of a 'merge-out' system.
- *
+ * <p/>
* In this system, the profile is dominant, but the model receives the merge result...sort
* of a 'merge-in' system. The two pieces of code look like they could be combined with a
* set of flags to determine which direction to merge 'to', but there are enough differences
@@ -122,15 +142,15 @@
/**
* This should be the resulting ordering of plugins after injection:
- *
+ * <p/>
* Given:
- *
- * model: X -> A -> B -> D -> E
- * profile: Y -> A -> C -> D -> F
- *
+ * <p/>
+ * model: X -> A -> B -> D -> E
+ * profile: Y -> A -> C -> D -> F
+ * <p/>
* Result:
- *
- * X -> Y -> A -> B -> C -> D -> E -> F
+ * <p/>
+ * X -> Y -> A -> B -> C -> D -> E -> F
*/
protected void injectPlugins( PluginContainer profileContainer, PluginContainer modelContainer )
{
@@ -194,7 +214,8 @@
modelPlugin.setVersion( profilePlugin.getVersion() );
}
- modelPlugin.setDependencies( injectDependencies( profilePlugin.getDependencies(), modelPlugin.getDependencies() ) );
+ modelPlugin.setDependencies(
+ injectDependencies( profilePlugin.getDependencies(), modelPlugin.getDependencies() ) );
// merge the lists of goals that are not attached to an <execution/>
injectConfigurationContainer( profilePlugin, modelPlugin );
@@ -277,13 +298,13 @@
/**
* Merge two DOMs. Copy the dominant DOM so the original one is left unchanged.
- * <p>
+ * <p/>
* Use this method instead of a direct call to {@link Xpp3Dom#mergeXpp3Dom(Xpp3Dom, Xpp3Dom)}.
* Profiles are dominant, thus they are merge targets, but they may be merged in several times
* (e.g. if they are inherited). So with the second merge, you don't get the profile's original
* DOM, but an already merged one.
*
- * @param dominant Dominant DOM
+ * @param dominant Dominant DOM
* @param recessive Recessive DOM
* @return Merged DOM
*/
Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=693291&r1=693290&r2=693291&view=diff
==============================================================================
--- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Mon Sep 8 14:43:31 2008
@@ -29,7 +29,13 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.model.*;
+import org.apache.maven.model.Build;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.DependencyManagement;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.PluginManagement;
+import org.apache.maven.model.Profile;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.profiles.MavenProfilesBuilder;
@@ -56,9 +62,20 @@
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.Writer;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
/*:apt
@@ -98,8 +115,8 @@
* @version $Id$
*/
public class DefaultMavenProjectBuilder
- implements MavenProjectBuilder,
- Initializable, LogEnabled {
+ implements MavenProjectBuilder, Initializable, LogEnabled
+{
protected MavenProfilesBuilder profilesBuilder;
protected ArtifactResolver artifactResolver;
@@ -133,11 +150,13 @@
// maven-assembly-plugin (2.2-beta-1) is accessing it via reflection.
// the aspect weaving seems not to work for reflection from plugin.
+
private Map processedProjectCache = new HashMap();
private static final String MAVEN_MODEL_VERSION = "4.0.0";
- public void initialize() {
+ public void initialize()
+ {
modelReader = new MavenXpp3Reader();
}
@@ -145,165 +164,176 @@
// MavenProjectBuilder Implementation
// ----------------------------------------------------------------------
- public MavenProject build(File projectDescriptor,
- ArtifactRepository localRepository,
- ProfileManager profileManager)
- throws ProjectBuildingException {
- ProjectBuilderConfiguration config = new DefaultProjectBuilderConfiguration().setLocalRepository(localRepository)
- .setGlobalProfileManager(profileManager);
-
- return build(projectDescriptor, config);
+ public MavenProject build( File projectDescriptor, ArtifactRepository localRepository,
+ ProfileManager profileManager )
+ throws ProjectBuildingException
+ {
+ ProjectBuilderConfiguration config =
+ new DefaultProjectBuilderConfiguration().setLocalRepository( localRepository )
+ .setGlobalProfileManager( profileManager );
+
+ return build( projectDescriptor, config );
}
- public MavenProject build(File projectDescriptor,
- ProjectBuilderConfiguration config)
- throws ProjectBuildingException {
+ public MavenProject build( File projectDescriptor, ProjectBuilderConfiguration config )
+ throws ProjectBuildingException
+ {
MavenProject project = projectWorkspace.getProject( projectDescriptor );
- if (project == null) {
- project = readModelFromLocalPath("unknown", projectDescriptor, new PomArtifactResolver(config.getLocalRepository(),
- repositoryHelper.buildArtifactRepositories(getSuperProject(config, projectDescriptor, true).getModel()), artifactResolver), config);
-
- project.setFile(projectDescriptor);
- project = buildInternal(project.getModel(),
- config,
- projectDescriptor,
- project.getParentFile(),
- true
- );
-
- Build build = project.getBuild();
+ if ( project == null )
+ {
+ project = readModelFromLocalPath( "unknown", projectDescriptor, new PomArtifactResolver(
+ config.getLocalRepository(), repositoryHelper.buildArtifactRepositories(
+ getSuperProject( config, projectDescriptor, true ).getModel() ), artifactResolver ), config );
+
+ project.setFile( projectDescriptor );
+ project = buildInternal( project.getModel(), config, projectDescriptor, project.getParentFile(), true );
+
+ Build build = project.getBuild();
// NOTE: setting this script-source root before path translation, because
// the plugin tools compose basedir and scriptSourceRoot into a single file.
- project.addScriptSourceRoot(build.getScriptSourceDirectory());
- project.addCompileSourceRoot(build.getSourceDirectory());
- project.addTestCompileSourceRoot(build.getTestSourceDirectory());
- project.setFile(projectDescriptor);
+ project.addScriptSourceRoot( build.getScriptSourceDirectory() );
+ project.addCompileSourceRoot( build.getSourceDirectory() );
+ project.addTestCompileSourceRoot( build.getTestSourceDirectory() );
+ project.setFile( projectDescriptor );
- setBuildOutputDirectoryOnParent(project);
+ setBuildOutputDirectoryOnParent( project );
}
return project;
}
-
/**
* @deprecated
*/
@Deprecated
- public MavenProject buildFromRepository(Artifact artifact,
- List remoteArtifactRepositories,
- ArtifactRepository localRepository,
- boolean allowStub)
- throws ProjectBuildingException
+ public MavenProject buildFromRepository( Artifact artifact, List remoteArtifactRepositories,
+ ArtifactRepository localRepository, boolean allowStub )
+ throws ProjectBuildingException
{
- return buildFromRepository(artifact, remoteArtifactRepositories, localRepository);
+ return buildFromRepository( artifact, remoteArtifactRepositories, localRepository );
}
- public MavenProject buildFromRepository(Artifact artifact,
- List remoteArtifactRepositories,
- ArtifactRepository localRepository)
- throws ProjectBuildingException {
+ public MavenProject buildFromRepository( Artifact artifact, List remoteArtifactRepositories,
+ ArtifactRepository localRepository )
+ throws ProjectBuildingException
+ {
MavenProject project = null;
- if (!Artifact.LATEST_VERSION.equals(artifact.getVersion()) && !Artifact.RELEASE_VERSION.equals(artifact.getVersion())) {
- project = projectWorkspace.getProject(artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion());
+ if ( !Artifact.LATEST_VERSION.equals( artifact.getVersion() ) &&
+ !Artifact.RELEASE_VERSION.equals( artifact.getVersion() ) )
+ {
+ project =
+ projectWorkspace.getProject( artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() );
}
File f = artifact.getFile();
- if (project == null) {
- repositoryHelper.findModelFromRepository(artifact, remoteArtifactRepositories, localRepository);
+ if ( project == null )
+ {
+ repositoryHelper.findModelFromRepository( artifact, remoteArtifactRepositories, localRepository );
- ProjectBuilderConfiguration config = new DefaultProjectBuilderConfiguration().setLocalRepository(localRepository);
+ ProjectBuilderConfiguration config =
+ new DefaultProjectBuilderConfiguration().setLocalRepository( localRepository );
- List<ArtifactRepository> artifactRepositories = new ArrayList<ArtifactRepository>(remoteArtifactRepositories);
- artifactRepositories.addAll(repositoryHelper.buildArtifactRepositories(getSuperProject(config, artifact.getFile(), false).getModel()));
+ List<ArtifactRepository> artifactRepositories =
+ new ArrayList<ArtifactRepository>( remoteArtifactRepositories );
+ artifactRepositories.addAll( repositoryHelper.buildArtifactRepositories(
+ getSuperProject( config, artifact.getFile(), false ).getModel() ) );
- project = readModelFromLocalPath("unknown", artifact.getFile(), new PomArtifactResolver(config.getLocalRepository(),
- artifactRepositories, artifactResolver), config);
- project = buildInternal(project.getModel(), config, artifact.getFile(), project.getParentFile(),
- false);
+ project = readModelFromLocalPath( "unknown", artifact.getFile(), new PomArtifactResolver(
+ config.getLocalRepository(), artifactRepositories, artifactResolver ), config );
+ project = buildInternal( project.getModel(), config, artifact.getFile(), project.getParentFile(), false );
}
- artifact.setFile(f);
- project.setVersion(artifact.getVersion());
+ artifact.setFile( f );
+ project.setVersion( artifact.getVersion() );
return project;
}
// what is using this externally? jvz.
public MavenProject buildStandaloneSuperProject()
- throws ProjectBuildingException {
+ throws ProjectBuildingException
+ {
//TODO mkleint - use the (Container, Properties) constructor to make system properties embeddable
- return buildStandaloneSuperProject(new DefaultProjectBuilderConfiguration());
+ return buildStandaloneSuperProject( new DefaultProjectBuilderConfiguration() );
}
- public MavenProject buildStandaloneSuperProject(ProfileManager profileManager)
- throws ProjectBuildingException {
+ public MavenProject buildStandaloneSuperProject( ProfileManager profileManager )
+ throws ProjectBuildingException
+ {
//TODO mkleint - use the (Container, Properties) constructor to make system properties embeddable
- return buildStandaloneSuperProject(new DefaultProjectBuilderConfiguration().setGlobalProfileManager(profileManager));
+ return buildStandaloneSuperProject(
+ new DefaultProjectBuilderConfiguration().setGlobalProfileManager( profileManager ) );
}
- public MavenProject buildStandaloneSuperProject(ProjectBuilderConfiguration config)
- throws ProjectBuildingException {
+ public MavenProject buildStandaloneSuperProject( ProjectBuilderConfiguration config )
+ throws ProjectBuildingException
+ {
Model superModel = getSuperModel();
- superModel.setGroupId(STANDALONE_SUPERPOM_GROUPID);
+ superModel.setGroupId( STANDALONE_SUPERPOM_GROUPID );
- superModel.setArtifactId(STANDALONE_SUPERPOM_ARTIFACTID);
+ superModel.setArtifactId( STANDALONE_SUPERPOM_ARTIFACTID );
- superModel.setVersion(STANDALONE_SUPERPOM_VERSION);
+ superModel.setVersion( STANDALONE_SUPERPOM_VERSION );
- superModel = ModelUtils.cloneModel(superModel);
+ superModel = ModelUtils.cloneModel( superModel );
ProfileManager profileManager = config.getGlobalProfileManager();
List activeProfiles = new ArrayList();
- if (profileManager != null) {
- List activated = profileAdvisor.applyActivatedProfiles(superModel, null, false, profileManager.getProfileActivationContext());
- if (!activated.isEmpty()) {
- activeProfiles.addAll(activated);
+ if ( profileManager != null )
+ {
+ List activated = profileAdvisor.applyActivatedProfiles( superModel, null, false,
+ profileManager.getProfileActivationContext() );
+ if ( !activated.isEmpty() )
+ {
+ activeProfiles.addAll( activated );
}
- activated = profileAdvisor.applyActivatedExternalProfiles(superModel, null, profileManager);
- if (!activated.isEmpty()) {
- activeProfiles.addAll(activated);
+ activated = profileAdvisor.applyActivatedExternalProfiles( superModel, null, profileManager );
+ if ( !activated.isEmpty() )
+ {
+ activeProfiles.addAll( activated );
}
}
MavenProject project;
- try {
- project = new MavenProject(superModel, artifactFactory, mavenTools, repositoryHelper, this, config);
- } catch (InvalidRepositoryException e) {
- throw new ProjectBuildingException(STANDALONE_SUPERPOM_GROUPID + ":"
- + STANDALONE_SUPERPOM_ARTIFACTID,
- "Maven super-POM contains an invalid repository!",
- e);
- }
-
- getLogger().debug("Activated the following profiles for standalone super-pom: " + activeProfiles);
-
- try {
- project = interpolateModelAndInjectDefault(project.getModel(), null, null, config);
- project.setActiveProfiles(activeProfiles);
- project.setRemoteArtifactRepositories(mavenTools.buildArtifactRepositories(superModel.getRepositories()));
- project.setPluginArtifactRepositories(mavenTools.buildArtifactRepositories(superModel.getRepositories()));
- }
- catch (InvalidRepositoryException e) {
- throw new ProjectBuildingException(STANDALONE_SUPERPOM_GROUPID + ":"
- + STANDALONE_SUPERPOM_ARTIFACTID,
- "Maven super-POM contains an invalid repository!",
- e);
- }
- catch (ModelInterpolationException e) {
- throw new ProjectBuildingException(STANDALONE_SUPERPOM_GROUPID + ":"
- + STANDALONE_SUPERPOM_ARTIFACTID,
- "Maven super-POM contains an invalid expressions!",
- e);
+ try
+ {
+ project = new MavenProject( superModel, artifactFactory, mavenTools, repositoryHelper, this, config );
+ }
+ catch ( InvalidRepositoryException e )
+ {
+ throw new ProjectBuildingException( STANDALONE_SUPERPOM_GROUPID + ":" + STANDALONE_SUPERPOM_ARTIFACTID,
+ "Maven super-POM contains an invalid repository!", e );
+ }
+
+ getLogger().debug( "Activated the following profiles for standalone super-pom: " + activeProfiles );
+
+ try
+ {
+ project = interpolateModelAndInjectDefault( project.getModel(), null, null, config );
+ project.setActiveProfiles( activeProfiles );
+ project.setRemoteArtifactRepositories(
+ mavenTools.buildArtifactRepositories( superModel.getRepositories() ) );
+ project.setPluginArtifactRepositories(
+ mavenTools.buildArtifactRepositories( superModel.getRepositories() ) );
+ }
+ catch ( InvalidRepositoryException e )
+ {
+ throw new ProjectBuildingException( STANDALONE_SUPERPOM_GROUPID + ":" + STANDALONE_SUPERPOM_ARTIFACTID,
+ "Maven super-POM contains an invalid repository!", e );
+ }
+ catch ( ModelInterpolationException e )
+ {
+ throw new ProjectBuildingException( STANDALONE_SUPERPOM_GROUPID + ":" + STANDALONE_SUPERPOM_ARTIFACTID,
+ "Maven super-POM contains an invalid expressions!", e );
}
- project.setExecutionRoot(true);
+ project.setExecutionRoot( true );
return project;
}
@@ -311,237 +341,275 @@
/**
* @since 2.0.x
*/
- public MavenProject buildWithDependencies(File projectDescriptor,
- ArtifactRepository localRepository,
- ProfileManager profileManager)
- throws ProjectBuildingException {
- return buildProjectWithDependencies(projectDescriptor, localRepository, profileManager).getProject();
+ public MavenProject buildWithDependencies( File projectDescriptor, ArtifactRepository localRepository,
+ ProfileManager profileManager )
+ throws ProjectBuildingException
+ {
+ return buildProjectWithDependencies( projectDescriptor, localRepository, profileManager ).getProject();
}
/**
* @since 2.1
*/
- public MavenProjectBuildingResult buildProjectWithDependencies(File projectDescriptor,
- ArtifactRepository localRepository,
- ProfileManager profileManager)
- throws ProjectBuildingException {
- ProjectBuilderConfiguration config = new DefaultProjectBuilderConfiguration().setLocalRepository(localRepository)
- .setGlobalProfileManager(profileManager);
-
- return buildProjectWithDependencies(projectDescriptor, config);
- }
-
- public MavenProjectBuildingResult buildProjectWithDependencies(File projectDescriptor,
- ProjectBuilderConfiguration config)
- throws ProjectBuildingException {
- MavenProject project = build(projectDescriptor, config);
-
- try {
- project.setDependencyArtifacts(project.createArtifacts(artifactFactory, null, null));
- }
- catch (InvalidDependencyVersionException e) {
- throw new ProjectBuildingException(safeVersionlessKey(project.getGroupId(), project.getArtifactId()),
- "Unable to build project due to an invalid dependency version: " +
- e.getMessage(), projectDescriptor, e);
+ public MavenProjectBuildingResult buildProjectWithDependencies( File projectDescriptor,
+ ArtifactRepository localRepository,
+ ProfileManager profileManager )
+ throws ProjectBuildingException
+ {
+ ProjectBuilderConfiguration config =
+ new DefaultProjectBuilderConfiguration().setLocalRepository( localRepository )
+ .setGlobalProfileManager( profileManager );
+
+ return buildProjectWithDependencies( projectDescriptor, config );
+ }
+
+ public MavenProjectBuildingResult buildProjectWithDependencies( File projectDescriptor,
+ ProjectBuilderConfiguration config )
+ throws ProjectBuildingException
+ {
+ MavenProject project = build( projectDescriptor, config );
+
+ try
+ {
+ project.setDependencyArtifacts( project.createArtifacts( artifactFactory, null, null ) );
+ }
+ catch ( InvalidDependencyVersionException e )
+ {
+ throw new ProjectBuildingException( safeVersionlessKey( project.getGroupId(), project.getArtifactId() ),
+ "Unable to build project due to an invalid dependency version: " +
+ e.getMessage(), projectDescriptor, e );
}
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
- .setArtifact(project.getArtifact())
- .setArtifactDependencies(project.getDependencyArtifacts())
- .setLocalRepository(config.getLocalRepository())
- .setRemoteRepostories(project.getRemoteArtifactRepositories())
- .setManagedVersionMap(project.getManagedVersionMap())
- .setMetadataSource(artifactMetadataSource);
+ .setArtifact( project.getArtifact() )
+ .setArtifactDependencies( project.getDependencyArtifacts() )
+ .setLocalRepository( config.getLocalRepository() )
+ .setRemoteRepostories( project.getRemoteArtifactRepositories() )
+ .setManagedVersionMap( project.getManagedVersionMap() )
+ .setMetadataSource( artifactMetadataSource );
- ArtifactResolutionResult result = artifactResolver.resolve(request);
+ ArtifactResolutionResult result = artifactResolver.resolve( request );
- project.setArtifacts(result.getArtifacts());
+ project.setArtifacts( result.getArtifacts() );
- return new MavenProjectBuildingResult(project, result);
+ return new MavenProjectBuildingResult( project, result );
}
- public void calculateConcreteState(MavenProject project, ProjectBuilderConfiguration config)
- throws ModelInterpolationException {
- new MavenProjectRestorer(pathTranslator, modelInterpolator, getLogger()).calculateConcreteState(project, config);
+ public void calculateConcreteState( MavenProject project, ProjectBuilderConfiguration config )
+ throws ModelInterpolationException
+ {
+ new MavenProjectRestorer( pathTranslator, modelInterpolator, getLogger() ).calculateConcreteState( project,
+ config );
}
- public void restoreDynamicState(MavenProject project, ProjectBuilderConfiguration config)
- throws ModelInterpolationException {
- new MavenProjectRestorer(pathTranslator, modelInterpolator, getLogger()).restoreDynamicState(project, config);
+ public void restoreDynamicState( MavenProject project, ProjectBuilderConfiguration config )
+ throws ModelInterpolationException
+ {
+ new MavenProjectRestorer( pathTranslator, modelInterpolator, getLogger() ).restoreDynamicState( project,
+ config );
}
- public void enableLogging(Logger logger) {
+ public void enableLogging( Logger logger )
+ {
this.logger = logger;
}
- private Logger getLogger() {
+ private Logger getLogger()
+ {
return logger;
}
- private MavenProject buildInternal(Model model,
- ProjectBuilderConfiguration config,
- File projectDescriptor,
- File parentDescriptor,
- boolean isReactorProject )
- throws ProjectBuildingException {
- String projectId = safeVersionlessKey(model.getGroupId(), model.getArtifactId());
+ private MavenProject buildInternal( Model model, ProjectBuilderConfiguration config, File projectDescriptor,
+ File parentDescriptor, boolean isReactorProject )
+ throws ProjectBuildingException
+ {
+ String projectId = safeVersionlessKey( model.getGroupId(), model.getArtifactId() );
ProfileActivationContext profileActivationContext;
ProfileManager externalProfileManager = config.getGlobalProfileManager();
- if (externalProfileManager != null) {
+ if ( externalProfileManager != null )
+ {
// used to trigger the caching of SystemProperties in the container context...
- try {
+ try
+ {
externalProfileManager.getActiveProfiles();
}
- catch (ProfileActivationException e) {
- throw new ProjectBuildingException(projectId, "Failed to activate external profiles.", projectDescriptor, e);
+ catch ( ProfileActivationException e )
+ {
+ throw new ProjectBuildingException( projectId, "Failed to activate external profiles.",
+ projectDescriptor, e );
}
profileActivationContext = externalProfileManager.getProfileActivationContext();
- } else {
- profileActivationContext = new DefaultProfileActivationContext(config.getExecutionProperties(), false);
+ }
+ else
+ {
+ profileActivationContext = new DefaultProfileActivationContext( config.getExecutionProperties(), false );
}
MavenProject project;
- try {
- project = interpolateModelAndInjectDefault(model, projectDescriptor, parentDescriptor, config);
+ try
+ {
+ project = interpolateModelAndInjectDefault( model, projectDescriptor, parentDescriptor, config );
}
- catch (ModelInterpolationException e) {
- throw new InvalidProjectModelException(projectId, e.getMessage(), projectDescriptor, e);
+ catch ( ModelInterpolationException e )
+ {
+ throw new InvalidProjectModelException( projectId, e.getMessage(), projectDescriptor, e );
}
- catch (InvalidRepositoryException e) {
- throw new InvalidProjectModelException(projectId, e.getMessage(), projectDescriptor, e);
+ catch ( InvalidRepositoryException e )
+ {
+ throw new InvalidProjectModelException( projectId, e.getMessage(), projectDescriptor, e );
}
List<Profile> projectProfiles = new ArrayList<Profile>();
- projectProfiles.addAll( profileAdvisor.applyActivatedProfiles( project.getModel(), project.getFile(), isReactorProject, profileActivationContext ) );
- projectProfiles.addAll(profileAdvisor.applyActivatedExternalProfiles(project.getModel(), project.getFile(), externalProfileManager));
- project.setActiveProfiles(projectProfiles);
+ projectProfiles.addAll( profileAdvisor.applyActivatedProfiles( project.getModel(), project.getFile(),
+ isReactorProject, profileActivationContext ) );
+ projectProfiles.addAll( profileAdvisor.applyActivatedExternalProfiles( project.getModel(), project.getFile(),
+ externalProfileManager ) );
+ project.setActiveProfiles( projectProfiles );
- projectWorkspace.storeProjectByCoordinate(project);
- projectWorkspace.storeProjectByFile(project);
+ projectWorkspace.storeProjectByCoordinate( project );
+ projectWorkspace.storeProjectByFile( project );
return project;
}
- private MavenProject interpolateModelAndInjectDefault(Model model,
- File pomFile,
- File parentFile,
- ProjectBuilderConfiguration config
- )
- throws ProjectBuildingException, ModelInterpolationException, InvalidRepositoryException {
+ private MavenProject interpolateModelAndInjectDefault( Model model, File pomFile, File parentFile,
+ ProjectBuilderConfiguration config )
+ throws ProjectBuildingException, ModelInterpolationException, InvalidRepositoryException
+ {
File projectDir = null;
- if (pomFile != null) {
+ if ( pomFile != null )
+ {
projectDir = pomFile.getAbsoluteFile().getParentFile();
}
Build dynamicBuild = model.getBuild();
- if(dynamicBuild != null) {
- model.setBuild(ModelUtils.cloneBuild(dynamicBuild));
+ if ( dynamicBuild != null )
+ {
+ model.setBuild( ModelUtils.cloneBuild( dynamicBuild ) );
}
- model = modelInterpolator.interpolate(model, projectDir, config, getLogger().isDebugEnabled());
+ model = modelInterpolator.interpolate( model, projectDir, config, getLogger().isDebugEnabled() );
- if(dynamicBuild != null && model.getBuild() != null) {
- mergeDeterministicBuildElements(model.getBuild(), dynamicBuild);
- model.setBuild(dynamicBuild);
+ if ( dynamicBuild != null && model.getBuild() != null )
+ {
+ mergeDeterministicBuildElements( model.getBuild(), dynamicBuild );
+ model.setBuild( dynamicBuild );
}
// interpolation is before injection, because interpolation is off-limits in the injected variables
- new DefaultModelDefaultsInjector().injectDefaults(model);
+ new DefaultModelDefaultsInjector().injectDefaults( model );
// We will return a different project object using the new model (hence the need to return a project, not just modify the parameter)
- MavenProject project = new MavenProject(model, artifactFactory, mavenTools, repositoryHelper, this, config);
+ MavenProject project = new MavenProject( model, artifactFactory, mavenTools, repositoryHelper, this, config );
- Artifact projectArtifact = artifactFactory.createBuildArtifact(project.getGroupId(), project.getArtifactId(),
- project.getVersion(), project.getPackaging());
- project.setArtifact(projectArtifact);
- project.setParentFile(parentFile);
+ Artifact projectArtifact = artifactFactory.createBuildArtifact( project.getGroupId(), project.getArtifactId(),
+ project.getVersion(), project.getPackaging() );
+ project.setArtifact( projectArtifact );
+ project.setParentFile( parentFile );
- validateModel(model, pomFile);
+ validateModel( model, pomFile );
return project;
}
// TODO: Remove this!
@SuppressWarnings("unchecked")
- private void mergeDeterministicBuildElements(Build interpolatedBuild,
- Build dynamicBuild) {
+ private void mergeDeterministicBuildElements( Build interpolatedBuild, Build dynamicBuild )
+ {
List<Plugin> dPlugins = dynamicBuild.getPlugins();
- if (dPlugins != null) {
+ if ( dPlugins != null )
+ {
List<Plugin> iPlugins = interpolatedBuild.getPlugins();
- for (int i = 0; i < dPlugins.size(); i++) {
- Plugin dPlugin = dPlugins.get(i);
- Plugin iPlugin = iPlugins.get(i);
-
- dPlugin.setGroupId(iPlugin.getGroupId());
- dPlugin.setArtifactId(iPlugin.getArtifactId());
- dPlugin.setVersion(iPlugin.getVersion());
+ for ( int i = 0; i < dPlugins.size(); i++ )
+ {
+ Plugin dPlugin = dPlugins.get( i );
+ Plugin iPlugin = iPlugins.get( i );
+
+ dPlugin.setGroupId( iPlugin.getGroupId() );
+ dPlugin.setArtifactId( iPlugin.getArtifactId() );
+ dPlugin.setVersion( iPlugin.getVersion() );
- dPlugin.setDependencies(iPlugin.getDependencies());
+ dPlugin.setDependencies( iPlugin.getDependencies() );
}
}
PluginManagement dPluginMgmt = dynamicBuild.getPluginManagement();
- if (dPluginMgmt != null) {
+ if ( dPluginMgmt != null )
+ {
PluginManagement iPluginMgmt = interpolatedBuild.getPluginManagement();
dPlugins = dPluginMgmt.getPlugins();
- if (dPlugins != null) {
+ if ( dPlugins != null )
+ {
List<Plugin> iPlugins = iPluginMgmt.getPlugins();
- for (int i = 0; i < dPlugins.size(); i++) {
- Plugin dPlugin = dPlugins.get(i);
- Plugin iPlugin = iPlugins.get(i);
-
- dPlugin.setGroupId(iPlugin.getGroupId());
- dPlugin.setArtifactId(iPlugin.getArtifactId());
- dPlugin.setVersion(iPlugin.getVersion());
+ for ( int i = 0; i < dPlugins.size(); i++ )
+ {
+ Plugin dPlugin = dPlugins.get( i );
+ Plugin iPlugin = iPlugins.get( i );
+
+ dPlugin.setGroupId( iPlugin.getGroupId() );
+ dPlugin.setArtifactId( iPlugin.getArtifactId() );
+ dPlugin.setVersion( iPlugin.getVersion() );
- dPlugin.setDependencies(iPlugin.getDependencies());
+ dPlugin.setDependencies( iPlugin.getDependencies() );
}
}
}
- if (dynamicBuild.getExtensions() != null) {
- dynamicBuild.setExtensions(interpolatedBuild.getExtensions());
+ if ( dynamicBuild.getExtensions() != null )
+ {
+ dynamicBuild.setExtensions( interpolatedBuild.getExtensions() );
}
}
- private MavenProject getSuperProject(ProjectBuilderConfiguration config, File projectDescriptor, boolean isReactorProject)
- throws ProjectBuildingException {
+ private MavenProject getSuperProject( ProjectBuilderConfiguration config, File projectDescriptor,
+ boolean isReactorProject )
+ throws ProjectBuildingException
+ {
MavenProject superProject;
Model model = getSuperModel();
- try {
- superProject = new MavenProject(model, artifactFactory, mavenTools, repositoryHelper, this, config);
- } catch (InvalidRepositoryException e) {
- throw new ProjectBuildingException(STANDALONE_SUPERPOM_GROUPID + ":"
- + STANDALONE_SUPERPOM_ARTIFACTID,
- "Maven super-POM contains an invalid repository!",
- e);
+ try
+ {
+ superProject = new MavenProject( model, artifactFactory, mavenTools, repositoryHelper, this, config );
+ }
+ catch ( InvalidRepositoryException e )
+ {
+ throw new ProjectBuildingException( STANDALONE_SUPERPOM_GROUPID + ":" + STANDALONE_SUPERPOM_ARTIFACTID,
+ "Maven super-POM contains an invalid repository!", e );
}
- String projectId = safeVersionlessKey(model.getGroupId(), model.getArtifactId());
+ String projectId = safeVersionlessKey( model.getGroupId(), model.getArtifactId() );
ProfileActivationContext profileActivationContext;
ProfileManager externalProfileManager = config.getGlobalProfileManager();
- if (externalProfileManager != null) {
+ if ( externalProfileManager != null )
+ {
// used to trigger the caching of SystemProperties in the container context...
- try {
+ try
+ {
externalProfileManager.getActiveProfiles();
}
- catch (ProfileActivationException e) {
- throw new ProjectBuildingException(projectId, "Failed to activate external profiles.", projectDescriptor, e);
+ catch ( ProfileActivationException e )
+ {
+ throw new ProjectBuildingException( projectId, "Failed to activate external profiles.",
+ projectDescriptor, e );
}
profileActivationContext = externalProfileManager.getProfileActivationContext();
- } else {
- profileActivationContext = new DefaultProfileActivationContext(config.getExecutionProperties(), false);
+ }
+ else
+ {
+ profileActivationContext = new DefaultProfileActivationContext( config.getExecutionProperties(), false );
}
List<Profile> superProjectProfiles = new ArrayList<Profile>();
- superProjectProfiles.addAll(profileAdvisor.applyActivatedProfiles(model, projectDescriptor, isReactorProject, profileActivationContext));
- superProjectProfiles.addAll(profileAdvisor.applyActivatedExternalProfiles(model, projectDescriptor, externalProfileManager));
- superProject.setActiveProfiles(superProjectProfiles);
+ superProjectProfiles.addAll( profileAdvisor.applyActivatedProfiles( model, projectDescriptor, isReactorProject,
+ profileActivationContext ) );
+ superProjectProfiles.addAll(
+ profileAdvisor.applyActivatedExternalProfiles( model, projectDescriptor, externalProfileManager ) );
+ superProject.setActiveProfiles( superProjectProfiles );
return superProject;
}
@@ -549,117 +617,135 @@
private Model superModel;
private Model getSuperModel()
- throws ProjectBuildingException {
- if (superModel != null) {
+ throws ProjectBuildingException
+ {
+ if ( superModel != null )
+ {
return superModel;
}
- URL url = DefaultMavenProjectBuilder.class.getResource("pom-" + MAVEN_MODEL_VERSION + ".xml");
- String projectId = safeVersionlessKey(STANDALONE_SUPERPOM_GROUPID, STANDALONE_SUPERPOM_ARTIFACTID);
+ URL url = DefaultMavenProjectBuilder.class.getResource( "pom-" + MAVEN_MODEL_VERSION + ".xml" );
+ String projectId = safeVersionlessKey( STANDALONE_SUPERPOM_GROUPID, STANDALONE_SUPERPOM_ARTIFACTID );
Reader reader = null;
- try {
- reader = ReaderFactory.newXmlReader(url.openStream());
- String modelSource = IOUtil.toString(reader);
+ try
+ {
+ reader = ReaderFactory.newXmlReader( url.openStream() );
+ String modelSource = IOUtil.toString( reader );
- if (modelSource.indexOf("<modelVersion>" + MAVEN_MODEL_VERSION) < 0) {
- throw new InvalidProjectModelException(projectId, "Not a v" + MAVEN_MODEL_VERSION + " POM.", new File("."));
+ if ( modelSource.indexOf( "<modelVersion>" + MAVEN_MODEL_VERSION ) < 0 )
+ {
+ throw new InvalidProjectModelException( projectId, "Not a v" + MAVEN_MODEL_VERSION + " POM.",
+ new File( "." ) );
}
- StringReader sReader = new StringReader(modelSource);
+ StringReader sReader = new StringReader( modelSource );
- superModel = modelReader.read(sReader, STRICT_MODEL_PARSING);
+ superModel = modelReader.read( sReader, STRICT_MODEL_PARSING );
return superModel;
}
- catch (XmlPullParserException e) {
- throw new InvalidProjectModelException(projectId, "Parse error reading POM. Reason: " + e.getMessage(), e);
+ catch ( XmlPullParserException e )
+ {
+ throw new InvalidProjectModelException( projectId, "Parse error reading POM. Reason: " + e.getMessage(),
+ e );
}
- catch (IOException e) {
- throw new ProjectBuildingException(projectId, "Failed build model from URL \'" + url.toExternalForm() +
- "\'\nError: \'" + e.getLocalizedMessage() + "\'", e);
+ catch ( IOException e )
+ {
+ throw new ProjectBuildingException( projectId, "Failed build model from URL \'" + url.toExternalForm() +
+ "\'\nError: \'" + e.getLocalizedMessage() + "\'", e );
}
- finally {
- IOUtil.close(reader);
+ finally
+ {
+ IOUtil.close( reader );
}
}
- private MavenProject readModelFromLocalPath(String projectId,
- File projectDescriptor,
- PomArtifactResolver resolver,
- ProjectBuilderConfiguration config
- )
- throws ProjectBuildingException {
- if (projectDescriptor == null) {
- throw new IllegalArgumentException("projectDescriptor: null, Project Id =" + projectId);
+ private MavenProject readModelFromLocalPath( String projectId, File projectDescriptor, PomArtifactResolver resolver,
+ ProjectBuilderConfiguration config )
+ throws ProjectBuildingException
+ {
+ if ( projectDescriptor == null )
+ {
+ throw new IllegalArgumentException( "projectDescriptor: null, Project Id =" + projectId );
}
- if (projectBuilder == null) {
- throw new IllegalArgumentException("projectBuilder: not initialized");
+ if ( projectBuilder == null )
+ {
+ throw new IllegalArgumentException( "projectBuilder: not initialized" );
}
MavenProject mavenProject;
- try {
- mavenProject = projectBuilder.buildFromLocalPath(new FileInputStream(projectDescriptor),
- Arrays.asList(getSuperProject(config, projectDescriptor, true).getModel()), null, null, resolver,
- projectDescriptor.getParentFile(), config);
- } catch (IOException e) {
- throw new ProjectBuildingException(projectId, "File = " + projectDescriptor.getAbsolutePath(), e);
+ try
+ {
+ mavenProject = projectBuilder.buildFromLocalPath( new FileInputStream( projectDescriptor ), Arrays.asList(
+ getSuperProject( config, projectDescriptor, true ).getModel() ), null, null, resolver,
+ projectDescriptor.getParentFile(),
+ config );
+ }
+ catch ( IOException e )
+ {
+ throw new ProjectBuildingException( projectId, "File = " + projectDescriptor.getAbsolutePath(), e );
}
return mavenProject;
}
- private void validateModel(Model model,
- File pomFile)
- throws InvalidProjectModelException {
+ private void validateModel( Model model, File pomFile )
+ throws InvalidProjectModelException
+ {
// Must validate before artifact construction to make sure dependencies are good
- ModelValidationResult validationResult = validator.validate(model);
+ ModelValidationResult validationResult = validator.validate( model );
- String projectId = safeVersionlessKey(model.getGroupId(), model.getArtifactId());
+ String projectId = safeVersionlessKey( model.getGroupId(), model.getArtifactId() );
- if (validationResult.getMessageCount() > 0) {
- for(String s : (List<String>) validationResult.getMessages())
+ if ( validationResult.getMessageCount() > 0 )
+ {
+ for ( String s : (List<String>) validationResult.getMessages() )
{
- System.out.println(s);
+ System.out.println( s );
}
- try {
+ try
+ {
Writer out = WriterFactory.newXmlWriter( System.out );
MavenXpp3Writer writer = new MavenXpp3Writer();
- writer.write( out, model);
+ writer.write( out, model );
out.close();
- } catch (IOException e) {
+ }
+ catch ( IOException e )
+ {
}
- throw new InvalidProjectModelException(projectId, "Failed to validate POM", pomFile,
- validationResult );
+ throw new InvalidProjectModelException( projectId, "Failed to validate POM", pomFile, validationResult );
}
}
- private static String safeVersionlessKey(String groupId,
- String artifactId) {
+ private static String safeVersionlessKey( String groupId, String artifactId )
+ {
String gid = groupId;
- if (StringUtils.isEmpty(gid)) {
+ if ( StringUtils.isEmpty( gid ) )
+ {
gid = "unknown";
}
String aid = artifactId;
- if (StringUtils.isEmpty(aid)) {
+ if ( StringUtils.isEmpty( aid ) )
+ {
aid = "unknown";
}
- return ArtifactUtils.versionlessKey(gid, aid);
+ return ArtifactUtils.versionlessKey( gid, aid );
}
-
- private static void setBuildOutputDirectoryOnParent(MavenProject project)
+
+ private static void setBuildOutputDirectoryOnParent( MavenProject project )
{
MavenProject parent = project.getParent();
- if(parent != null)
+ if ( parent != null )
{
- parent.getModel().getBuild().setDirectory(parent.getFile().getAbsolutePath());
- setBuildOutputDirectoryOnParent(parent);
+ parent.getModel().getBuild().setDirectory( parent.getFile().getAbsolutePath() );
+ setBuildOutputDirectoryOnParent( parent );
}
}
@@ -679,7 +765,7 @@
if ( pluginManagement == null )
{
// nothing to inject.
- return ;
+ return;
}
List buildPlugins = build.getPlugins();