Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'trunk' into eclipse-aether 

Conflicts:
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultArtifactDescriptorReader.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
	maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
	maven-aether-provider/src/test/java/org/apache/maven/repository/internal/AbstractRepositoryTestCase.java
	maven-aether-provider/src/test/java/org/apache/maven/repository/internal/DefaultVersionResolverTest.java
	maven-core/src/main/java/org/apache/maven/DefaultMaven.java
	maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
	maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
	maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
	pom.xml
	src/site/site.xml
This commit is contained in:
Jason van Zyl 2013-02-14 22:08:26 -05:00
parent 3868007bf5 8181e7c7fa
commit 137cbd8a97
115 changed files with 2048 additions and 1137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitattributes vendored
View File

@ -1,2 +1,8 @@
*.jar -text -crlf
*.graffle -text -crlf
# Auto detect text files and perform LF normalization
* text=auto
*.java text diff=java
*.html text diff=html
*.css text
*.js text
*.sql text

2
.gitignore vendored
View File

@ -13,3 +13,5 @@ bin/
>>>>>>> 4fdcdbd26244ff81e242054fd38cf415d92499be
.DS_Store
/bootstrap
/dependencies.xml

2
apache-maven/NOTICE.txt
View File

@ -5,7 +5,7 @@
=========================================================================
Apache Maven
Copyright 2001-2011 The Apache Software Foundation
Copyright 2001-2012 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).

14
apache-maven/README.txt
View File

@ -40,18 +40,18 @@
1) Unpack the archive where you would like to store the binaries, eg:
Unix-based Operating Systems (Linux, Solaris and Mac OS X)
tar zxvf apache-maven-3.0.x.tar.gz
tar zxvf apache-maven-3.x.y.tar.gz
Windows 2000/XP
unzip apache-maven-3.0.x.zip
unzip apache-maven-3.x.y.zip
2) A directory called "apache-maven-3.0.x" will be created.
2) A directory called "apache-maven-3.x.y" will be created.
3) Add the bin directory to your PATH, eg:
Unix-based Operating Systems (Linux, Solaris and Mac OS X)
export PATH=/usr/local/apache-maven-3.0.x/bin:$PATH
export PATH=/usr/local/apache-maven-3.x.y/bin:$PATH
Windows 2000/XP
set PATH="c:\program files\apache-maven-3.0.x\bin";%PATH%
set PATH="c:\program files\apache-maven-3.x.y\bin";%PATH%
4) Make sure JAVA_HOME is set to the location of your JDK
@ -71,7 +71,7 @@
Downloads: http://maven.apache.org/download.html
Release Notes: http://maven.apache.org/release-notes.html
Mailing Lists: http://maven.apache.org/mail-lists.html
Source Code: http://svn.apache.org/repos/asf/maven/
Source Code: https://git-wip-us.apache.org/repos/asf/maven.git/apache-maven
Issue Tracking: http://jira.codehaus.org/browse/MNG
Wiki: http://docs.codehaus.org/display/MAVENUSER/
Wiki: https://cwiki.apache.org/confluence/display/MAVEN/
Available Plugins: http://maven.apache.org/plugins/index.html

6
build.xml
View File

@ -36,6 +36,9 @@ END SNIPPET: ant-bootstrap -->
<property name="distributionShortName" value="Maven"/>
<property name="distributionName" value="Apache Maven"/>
<property name="it.workdir.version" value="3.0.x" />
<property name="maven-compile.jvmargs" value="-Xmx512m -Xms512m"/>
<property name="maven-compile.fork" value="true"/>
<property name="maven-compile.maxmemory" value="512m"/>
<target name="initTaskDefs">
<echo>Building ${distributionName} ...</echo>
@ -247,8 +250,9 @@ Do you want to continue?</input>
</target>
<target name="maven-compile" depends="compile-boot,process-classes" description="compiles Maven using the bootstrap Maven, skipping automated tests">
<java fork="true" classname="org.apache.maven.cli.MavenCli" failonerror="true">
<java fork="${maven-compile.fork}" classname="org.apache.maven.cli.MavenCli" failonerror="true" timeout="600000" maxmemory="${maven-compile.maxmemory}">
<!--jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/-->
<!--jvmarg value="${maven-compile.jvmargs}"/-->
<classpath refid="maven.classpath" />
<arg value="${maven.debug}" />
<arg value="-B" />

6
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
View File

@ -45,6 +45,8 @@ abstract class MavenMetadata
implements MergeableMetadata
{
static final String MAVEN_METADATA_XML = "maven-metadata.xml";
private final File file;
protected Metadata metadata;
@ -59,7 +61,7 @@ abstract class MavenMetadata
public String getType()
{
return "maven-metadata.xml";
return MAVEN_METADATA_XML;
}
public File getFile()
@ -86,7 +88,7 @@ abstract class MavenMetadata
protected abstract void merge( Metadata recessive );
private Metadata read( File metadataFile )
static Metadata read( File metadataFile )
throws RepositoryException
{
if ( metadataFile.length() <= 0 )

100
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenSnapshotMetadata.java Normal file
View File

@ -0,0 +1,100 @@
package org.apache.maven.repository.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import org.apache.maven.artifact.repository.metadata.Metadata;
import org.eclipse.aether.artifact.Artifact;
/**
* @author Hervé Boutemy
*/
abstract class MavenSnapshotMetadata
extends MavenMetadata
{
static final String SNAPSHOT = "SNAPSHOT";
protected final Collection<Artifact> artifacts = new ArrayList<Artifact>();
protected final boolean legacyFormat;
protected MavenSnapshotMetadata( Metadata metadata, File file, boolean legacyFormat )
{
super( metadata, file );
this.legacyFormat = legacyFormat;
}
protected static Metadata createRepositoryMetadata( Artifact artifact, boolean legacyFormat )
{
Metadata metadata = new Metadata();
if ( !legacyFormat )
{
metadata.setModelVersion( "1.1.0" );
}
metadata.setGroupId( artifact.getGroupId() );
metadata.setArtifactId( artifact.getArtifactId() );
metadata.setVersion( artifact.getBaseVersion() );
return metadata;
}
public void bind( Artifact artifact )
{
artifacts.add( artifact );
}
public Object getKey()
{
return getGroupId() + ':' + getArtifactId() + ':' + getVersion();
}
public static Object getKey( Artifact artifact )
{
return artifact.getGroupId() + ':' + artifact.getArtifactId() + ':' + artifact.getBaseVersion();
}
protected String getKey( String classifier, String extension )
{
return classifier + ':' + extension;
}
public String getGroupId()
{
return metadata.getGroupId();
}
public String getArtifactId()
{
return metadata.getArtifactId();
}
public String getVersion()
{
return metadata.getVersion();
}
public Nature getNature()
{
return Nature.SNAPSHOT;
}
}

72
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/RemoteSnapshotMetadata.java
View File

@ -23,7 +23,6 @@ import java.io.File;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Map;
@ -39,46 +38,19 @@ import org.eclipse.aether.artifact.Artifact;
* @author Benjamin Bentmann
*/
final class RemoteSnapshotMetadata
extends MavenMetadata
extends MavenSnapshotMetadata
{
private static final String SNAPSHOT = "SNAPSHOT";
private final Collection<Artifact> artifacts = new ArrayList<Artifact>();
private final Map<String, SnapshotVersion> versions = new LinkedHashMap<String, SnapshotVersion>();
private final boolean legacyFormat;
public RemoteSnapshotMetadata( Artifact artifact, boolean legacyFormat )
{
super( createMetadata( artifact, legacyFormat ), null );
this.legacyFormat = legacyFormat;
super( createRepositoryMetadata( artifact, legacyFormat ), null, legacyFormat );
}
private RemoteSnapshotMetadata( Metadata metadata, File file, boolean legacyFormat )
{
super( metadata, file );
this.legacyFormat = legacyFormat;
}
private static Metadata createMetadata( Artifact artifact, boolean legacyFormat )
{
Metadata metadata = new Metadata();
if ( !legacyFormat )
{
metadata.setModelVersion( "1.1.0" );
}
metadata.setGroupId( artifact.getGroupId() );
metadata.setArtifactId( artifact.getArtifactId() );
metadata.setVersion( artifact.getBaseVersion() );
return metadata;
}
public void bind( Artifact artifact )
{
artifacts.add( artifact );
super( metadata, file, legacyFormat );
}
public MavenMetadata setFile( File file )
@ -86,16 +58,6 @@ final class RemoteSnapshotMetadata
return new RemoteSnapshotMetadata( metadata, file, legacyFormat );
}
public Object getKey()
{
return getGroupId() + ':' + getArtifactId() + ':' + getVersion();
}
public static Object getKey( Artifact artifact )
{
return artifact.getGroupId() + ':' + artifact.getArtifactId() + ':' + artifact.getBaseVersion();
}
public String getExpandedVersion( Artifact artifact )
{
String key = getKey( artifact.getClassifier(), artifact.getExtension() );
@ -136,7 +98,7 @@ final class RemoteSnapshotMetadata
if ( version.endsWith( SNAPSHOT ) )
{
String qualifier = snapshot.getTimestamp() + "-" + snapshot.getBuildNumber();
String qualifier = snapshot.getTimestamp() + '-' + snapshot.getBuildNumber();
version = version.substring( 0, version.length() - SNAPSHOT.length() ) + qualifier;
}
@ -145,6 +107,7 @@ final class RemoteSnapshotMetadata
sv.setExtension( artifact.getExtension() );
sv.setVersion( version );
sv.setUpdated( lastUpdated );
versions.put( getKey( sv.getClassifier(), sv.getExtension() ), sv );
}
@ -169,11 +132,6 @@ final class RemoteSnapshotMetadata
}
}
private String getKey( String classifier, String extension )
{
return classifier + ':' + extension;
}
private static int getBuildNumber( Metadata metadata )
{
int number = 0;
@ -191,24 +149,4 @@ final class RemoteSnapshotMetadata
return number;
}
public String getGroupId()
{
return metadata.getGroupId();
}
public String getArtifactId()
{
return metadata.getArtifactId();
}
public String getVersion()
{
return metadata.getVersion();
}
public Nature getNature()
{
return Nature.SNAPSHOT;
}
}

13
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/VersionsMetadata.java
View File

@ -40,18 +40,22 @@ final class VersionsMetadata
public VersionsMetadata( Artifact artifact )
{
super( createMetadata( artifact ), null );
super( createRepositoryMetadata( artifact ), null );
this.artifact = artifact;
}
public VersionsMetadata( Artifact artifact, File file )
{
super( createMetadata( artifact ), file );
super( createRepositoryMetadata( artifact ), file );
this.artifact = artifact;
}
private static Metadata createMetadata( Artifact artifact )
private static Metadata createRepositoryMetadata( Artifact artifact )
{
Metadata metadata = new Metadata();
metadata.setGroupId( artifact.getGroupId() );
metadata.setArtifactId( artifact.getArtifactId() );
Versioning versioning = new Versioning();
versioning.addVersion( artifact.getBaseVersion() );
if ( !artifact.isSnapshot() )
@ -63,10 +67,7 @@ final class VersionsMetadata
versioning.setLatest( artifact.getBaseVersion() );
}
Metadata metadata = new Metadata();
metadata.setVersioning( versioning );
metadata.setGroupId( artifact.getGroupId() );
metadata.setArtifactId( artifact.getArtifactId() );
return metadata;
}

4
maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
View File

@ -32,6 +32,10 @@ import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import org.apache.maven.artifact.versioning.VersionRange;
/**
* Maven Artifact interface. Notice that it mixes artifact definition concepts (groupId, artifactId, version)
* with dependency information (version range, scope).
*/
public interface Artifact
extends Comparable<Artifact>
{

1
maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
View File

@ -21,7 +21,6 @@ package org.apache.maven.artifact.repository;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
/**
* Describes a set of policies for a repository to use under certain conditions.

18
maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
View File

@ -69,9 +69,9 @@ public class ComparableVersion
private interface Item
{
final int INTEGER_ITEM = 0;
final int STRING_ITEM = 1;
final int LIST_ITEM = 2;
int INTEGER_ITEM = 0;
int STRING_ITEM = 1;
int LIST_ITEM = 2;
int compareTo( Item item );
@ -86,7 +86,7 @@ public class ComparableVersion
private static class IntegerItem
implements Item
{
private static final BigInteger BigInteger_ZERO = new BigInteger( "0" );
private static final BigInteger BIG_INTEGER_ZERO = new BigInteger( "0" );
private final BigInteger value;
@ -94,7 +94,7 @@ public class ComparableVersion
private IntegerItem()
{
this.value = BigInteger_ZERO;
this.value = BIG_INTEGER_ZERO;
}
public IntegerItem( String str )
@ -109,14 +109,14 @@ public class ComparableVersion
public boolean isNull()
{
return BigInteger_ZERO.equals( value );
return BIG_INTEGER_ZERO.equals( value );
}
public int compareTo( Item item )
{
if ( item == null )
{
return BigInteger_ZERO.equals( value ) ? 0 : 1; // 1.0 == 1, 1.1 > 1
return BIG_INTEGER_ZERO.equals( value ) ? 0 : 1; // 1.0 == 1, 1.1 > 1
}
switch ( item.getType() )
@ -266,7 +266,7 @@ public class ComparableVersion
void normalize()
{
for( ListIterator<Item> iterator = listIterator( size() ); iterator.hasPrevious(); )
for ( ListIterator<Item> iterator = listIterator( size() ); iterator.hasPrevious(); )
{
Item item = iterator.previous();
if ( item.isNull() )
@ -327,7 +327,7 @@ public class ComparableVersion
public String toString()
{
StringBuilder buffer = new StringBuilder( "(" );
for( Iterator<Item> iter = iterator(); iter.hasNext(); )
for ( Iterator<Item> iter = iterator(); iter.hasNext(); )
{
buffer.append( iter.next() );
if ( iter.hasNext() )

2
maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
View File

@ -72,7 +72,7 @@ public class DefaultArtifactVersion
{
if ( otherVersion instanceof DefaultArtifactVersion )
{
return this.comparable.compareTo( ( (DefaultArtifactVersion) otherVersion).comparable );
return this.comparable.compareTo( ( (DefaultArtifactVersion) otherVersion ).comparable );
}
else
{

2
maven-compat/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
View File

@ -108,7 +108,7 @@ public enum ArtifactScopeEnum
{
final ArtifactScopeEnum s = checkScope( scope );
// system scope is historic only - and simple
// system scope is historic only - and simple
if ( id == system.id )
{
return scope.id == system.id;

26
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
View File

@ -1,18 +1,22 @@
package org.apache.maven.artifact.repository.metadata;
/*
* 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
* 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
* 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.
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.io.File;
@ -47,7 +51,7 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
/**
* @author Jason van Zyl
*/
@Component(role=RepositoryMetadataManager.class)
@Component( role = RepositoryMetadataManager.class )
public class DefaultRepositoryMetadataManager
extends AbstractLogEnabled
implements RepositoryMetadataManager

1
maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/MetadataBridge.java
View File

@ -26,7 +26,6 @@ import java.util.Map;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import org.codehaus.plexus.util.FileUtils;
import org.eclipse.aether.RepositoryException;
import org.eclipse.aether.metadata.AbstractMetadata;

104
maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
View File

@ -1,18 +1,22 @@
package org.apache.maven.artifact.resolver;
/*
* 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
* 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
* 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.
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.io.File;
@ -65,7 +69,7 @@ import org.eclipse.aether.resolution.ArtifactResult;
/**
* @author Jason van Zyl
*/
@Component(role = ArtifactResolver.class)
@Component( role = ArtifactResolver.class )
public class DefaultArtifactResolver
implements ArtifactResolver
{
@ -111,7 +115,8 @@ public class DefaultArtifactResolver
else
{
executor =
new ThreadPoolExecutor( threads, threads, 3, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new DaemonThreadCreator());
new ThreadPoolExecutor( 0, threads, 3, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(),
new DaemonThreadCreator() );
}
}
@ -151,19 +156,22 @@ public class DefaultArtifactResolver
}
}
public void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository, TransferListener resolutionListener )
public void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository, TransferListener resolutionListener )
throws ArtifactResolutionException, ArtifactNotFoundException
{
resolve( artifact, remoteRepositories, getSession( localRepository ) );
}
public void resolveAlways( Artifact artifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository )
public void resolveAlways( Artifact artifact, List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws ArtifactResolutionException, ArtifactNotFoundException
{
resolve( artifact, remoteRepositories, getSession( localRepository ) );
}
private void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories, RepositorySystemSession session )
private void resolve( Artifact artifact, List<ArtifactRepository> remoteRepositories,
RepositorySystemSession session )
throws ArtifactResolutionException, ArtifactNotFoundException
{
if ( artifact == null )
@ -249,52 +257,73 @@ public class DefaultArtifactResolver
}
}
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories,
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter )
throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository, remoteRepositories, source, filter );
return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository,
remoteRepositories, source, filter );
}
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source )
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
Map managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source )
throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, remoteRepositories, source, null );
return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository,
remoteRepositories, source, null );
}
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter )
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
Map managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter )
throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, remoteRepositories, source, filter, null );
return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository,
remoteRepositories, source, filter, null );
}
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository,
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository,
ArtifactMetadataSource source )
throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact, localRepository, remoteRepositories, source, null );
}
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, List<ArtifactRepository> remoteRepositories, ArtifactRepository localRepository,
ArtifactMetadataSource source, List<ResolutionListener> listeners )
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository,
ArtifactMetadataSource source,
List<ResolutionListener> listeners )
throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact, Collections.EMPTY_MAP, localRepository,
remoteRepositories, source, null, listeners );
}
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter, List<ResolutionListener> listeners )
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
Map managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners )
throws ArtifactResolutionException, ArtifactNotFoundException
{
return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository, remoteRepositories, source, filter, listeners, null );
return resolveTransitively( artifacts, originatingArtifact, managedVersions, localRepository,
remoteRepositories, source, filter, listeners, null );
}
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact, Map managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories, ArtifactMetadataSource source, ArtifactFilter filter, List<ResolutionListener> listeners,
public ArtifactResolutionResult resolveTransitively( Set<Artifact> artifacts, Artifact originatingArtifact,
Map managedVersions, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories,
ArtifactMetadataSource source, ArtifactFilter filter,
List<ResolutionListener> listeners,
List<ConflictResolver> conflictResolvers )
throws ArtifactResolutionException, ArtifactNotFoundException
{
@ -336,7 +365,7 @@ public class DefaultArtifactResolver
{
Artifact rootArtifact = request.getArtifact();
Set<Artifact> artifacts = request.getArtifactDependencies();
Map managedVersions = request.getManagedVersionMap();
Map<String, Artifact> managedVersions = request.getManagedVersionMap();
List<ResolutionListener> listeners = request.getListeners();
ArtifactFilter collectionFilter = request.getCollectionFilter();
ArtifactFilter resolutionFilter = request.getResolutionFilter();
@ -528,18 +557,18 @@ public class DefaultArtifactResolver
/**
* ThreadCreator for creating daemon threads with fixed ThreadGroup-name.
*/
final static class DaemonThreadCreator
static final class DaemonThreadCreator
implements ThreadFactory
{
static final String THREADGROUP_NAME = "org.apache.maven.artifact.resolver.DefaultArtifactResolver";
final static ThreadGroup group = new ThreadGroup( THREADGROUP_NAME );
static final ThreadGroup GROUP = new ThreadGroup( THREADGROUP_NAME );
final static AtomicInteger threadNumber = new AtomicInteger( 1 );
static final AtomicInteger THREAD_NUMBER = new AtomicInteger( 1 );
public Thread newThread( Runnable r )
{
Thread newThread = new Thread( group, r, "resolver-" + threadNumber.getAndIncrement() );
Thread newThread = new Thread( GROUP, r, "resolver-" + THREAD_NUMBER.getAndIncrement() );
newThread.setDaemon( true );
return newThread;
}
@ -574,6 +603,7 @@ public class DefaultArtifactResolver
public void run()
{
ClassLoader old = Thread.currentThread().getContextClassLoader();
try
{
Thread.currentThread().setContextClassLoader( classLoader );
@ -602,6 +632,8 @@ public class DefaultArtifactResolver
finally
{
latch.countDown();
Thread.currentThread().setContextClassLoader( old );
}
}

5
maven-compat/src/main/java/org/apache/maven/profiles/DefaultProfileManager.java
View File

@ -20,13 +20,10 @@ package org.apache.maven.profiles;
*/
import org.apache.maven.model.Activation;
import org.apache.maven.model.InputLocation;
import org.apache.maven.model.Profile;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.profile.DefaultProfileActivationContext;
import org.apache.maven.model.profile.ProfileActivationContext;
import org.apache.maven.model.profile.ProfileSelector;
import org.apache.maven.profiles.activation.ProfileActivationException;
import org.codehaus.plexus.MutablePlexusContainer;
@ -36,13 +33,11 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupExcepti
import org.codehaus.plexus.logging.Logger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import org.apache.maven.model.building.ModelProblem.Version;
import org.apache.maven.model.building.ModelProblemCollectorRequest;
@Deprecated

2
maven-compat/src/main/java/org/apache/maven/profiles/activation/SystemPropertyProfileActivator.java
View File

@ -63,7 +63,7 @@ public class SystemPropertyProfileActivator
+ profile.getId() + "'" );
}
if ( name.startsWith("!") )
if ( name.startsWith( "!" ) )
{
reverseName = true;
name = name.substring( 1 );

6
maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
View File

@ -283,7 +283,7 @@ public abstract class AbstractStringBasedModelInterpolator
pathTranslator ) );
}
@SuppressWarnings("unchecked")
@SuppressWarnings( "unchecked" )
protected String interpolateInternal( String src, List<ValueSource> valueSources,
List<InterpolationPostProcessor> postProcessors, boolean debug )
throws ModelInterpolationException
@ -296,7 +296,7 @@ public abstract class AbstractStringBasedModelInterpolator
Logger logger = getLogger();
String result = src;
synchronized( this )
synchronized ( this )
{
for ( ValueSource vs : valueSources )
@ -315,7 +315,7 @@ public abstract class AbstractStringBasedModelInterpolator
{
result = interpolator.interpolate( result, recursionInterceptor );
}
catch( InterpolationException e )
catch ( InterpolationException e )
{
throw new ModelInterpolationException( e.getMessage(), e );
}

4
maven-compat/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
View File

@ -19,15 +19,11 @@ package org.apache.maven.project.validation;
* under the License.
*/
import java.util.List;
import org.apache.maven.model.InputLocation;
import org.apache.maven.model.Model;
import org.apache.maven.model.building.DefaultModelBuildingRequest;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelProblem.Version;
import org.apache.maven.model.building.ModelProblemCollectorRequest;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;

4
maven-compat/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
View File

@ -41,8 +41,8 @@ public class MetadataGraphNode
public MetadataGraphNode()
{
inNodes = new ArrayList<MetadataGraphNode>(4);
exNodes = new ArrayList<MetadataGraphNode>(8);
inNodes = new ArrayList<MetadataGraphNode>( 4 );
exNodes = new ArrayList<MetadataGraphNode>( 8 );
}
public MetadataGraphNode( MavenArtifactMetadata metadata )

2
maven-compat/src/main/java/org/apache/maven/repository/legacy/repository/DefaultArtifactRepositoryFactory.java
View File

@ -43,7 +43,7 @@ public class DefaultArtifactRepositoryFactory
private String globalChecksumPolicy;
@Requirement( role = ArtifactRepositoryLayout.class )
private Map<String,ArtifactRepositoryLayout> repositoryLayouts;
private Map<String, ArtifactRepositoryLayout> repositoryLayouts;
public ArtifactRepositoryLayout getLayout( String layoutId )
throws UnknownRepositoryLayoutException

4
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/DefaultLegacyArtifactCollector.java
View File

@ -63,10 +63,10 @@ import org.codehaus.plexus.logging.Logger;
public class DefaultLegacyArtifactCollector
implements LegacyArtifactCollector
{
@Requirement(hint="nearest")
@Requirement( hint = "nearest" )
private ConflictResolver defaultConflictResolver;
@Requirement
@Requirement
private Logger logger;
@Requirement

11
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformation.java
View File

@ -38,18 +38,17 @@ public interface ArtifactTransformation
/**
* Take in a artifact and return the transformed artifact for locating in the remote repository. If no
* transformation has occured the original artifact is returned.
* transformation has occurred the original artifact is returned.
*
* @param artifact Artifact to be transformed.
* @param request the repositories to check
* @param localRepository the local repository
*/
void transformForResolve( Artifact artifact, RepositoryRequest request )
throws ArtifactResolutionException, ArtifactNotFoundException;
/**
* Take in a artifact and return the transformed artifact for locating in the remote repository. If no
* transformation has occured the original artifact is returned.
* transformation has occurred the original artifact is returned.
*
* @param artifact Artifact to be transformed.
* @param remoteRepositories the repositories to check
@ -62,7 +61,7 @@ public interface ArtifactTransformation
/**
* Take in a artifact and return the transformed artifact for locating in the local repository. If no
* transformation has occured the original artifact is returned.
* transformation has occurred the original artifact is returned.
*
* @param artifact Artifact to be transformed.
* @param localRepository the local repository it will be stored in
@ -72,8 +71,8 @@ public interface ArtifactTransformation
throws ArtifactInstallationException;
/**
* Take in a artifact and return the transformed artifact for distributing toa remote repository. If no
* transformation has occured the original artifact is returned.
* Take in a artifact and return the transformed artifact for distributing to remote repository. If no
* transformation has occurred the original artifact is returned.
*
* @param artifact Artifact to be transformed.
* @param remoteRepository the repository to deploy to

1
maven-compat/src/main/java/org/apache/maven/repository/legacy/resolver/transform/ArtifactTransformationManager.java
View File

@ -40,7 +40,6 @@ public interface ArtifactTransformationManager
*
* @param artifact Artifact to be transformed.
* @param request the repositories to check
* @param localRepository the local repository
*/
void transformForResolve( Artifact artifact, RepositoryRequest request )
throws ArtifactResolutionException, ArtifactNotFoundException;

16
maven-compat/src/main/java/org/apache/maven/repository/metadata/ArtifactMetadata.java
View File

@ -28,7 +28,6 @@ import org.apache.maven.artifact.ArtifactScopeEnum;
* Artifact Metadata that is resolved independent of Artifact itself.
*
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
*
*/
public class ArtifactMetadata
{
@ -291,7 +290,7 @@ public class ArtifactMetadata
return artifactExists;
}
public void setArtifactExists(boolean artifactExists)
public void setArtifactExists( boolean artifactExists )
{
this.artifactExists = artifactExists;
}
@ -302,7 +301,7 @@ public class ArtifactMetadata
return dependencies;
}
public void setDependencies(Collection<ArtifactMetadata> dependencies)
public void setDependencies( Collection<ArtifactMetadata> dependencies )
{
this.dependencies = dependencies;
}
@ -312,7 +311,7 @@ public class ArtifactMetadata
return artifactUri;
}
public void setArtifactUri(String artifactUri)
public void setArtifactUri( String artifactUri )
{
this.artifactUri = artifactUri;
}
@ -322,23 +321,28 @@ public class ArtifactMetadata
{
return why;
}
public void setWhy(String why)
public void setWhy( String why )
{
this.why = why;
}
//-------------------------------------------------------------------
public String getError()
{
return error;
}
public void setError(String error)
public void setError( String error )
{
this.error = error;
}
public boolean isError()
{
return error == null;
}
//------------------------------------------------------------------
public String getDependencyConflictId()
{

2
maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
View File

@ -294,7 +294,7 @@ public class MetadataGraph
//------------------------------------------------------------------------
public List<MetadataGraphEdge> getEdgesBetween( MetadataGraphVertex vFrom, MetadataGraphVertex vTo )
{
List<MetadataGraphEdge> edges = getIncidentEdges(vTo);
List<MetadataGraphEdge> edges = getIncidentEdges( vTo );
if ( edges == null || edges.isEmpty() )
{
return null;

10
maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
View File

@ -125,10 +125,10 @@ public class MetadataGraphEdge
this.depth = depth;
}
public boolean isResolved()
{
return resolved;
}
public boolean isResolved()
{
return resolved;
}
public void setResolved( boolean resolved )
{
@ -175,7 +175,7 @@ public class MetadataGraphEdge
this.target = target;
}
@Override
@Override
public String toString()
{
return "[ " + "FROM:("

2
maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
View File

@ -62,7 +62,7 @@ public class MetadataResolution
return artifactMetadata;
}
public void setArtifactMetadata(ArtifactMetadata artifactMetadata)
public void setArtifactMetadata( ArtifactMetadata artifactMetadata )
{
this.artifactMetadata = artifactMetadata;
}

123
maven-core/pom.xml
View File

@ -124,73 +124,62 @@
</models>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
<execution>
<id>create-noncanonicalrev</id>
<goals>
<goal>create-timestamp</goal>
</goals>
<configuration>
<timestampFormat>'NON-CANONICAL_'yyyy-MM-dd_HH-mm_'${user.name}'</timestampFormat>
<timestampPropertyName>nonCanonicalRevision</timestampPropertyName>
</configuration>
</execution>
<execution>
<id>create-buildnumber</id>
<goals>
<goal>create</goal>
</goals>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
<revisionOnScmFailure>${nonCanonicalRevision}</revisionOnScmFailure>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<versionRange>[1.2,)</versionRange>
<goals>
<goal>create-timestamp</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<profiles>
<profile>
<id>svn-buildnumber</id>
<activation>
<file>
<exists>.svn</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
<providerImplementations>
<svn>javasvn</svn>
</providerImplementations>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>non-canonical-buildnumber</id>
<activation>
<file>
<missing>.svn</missing>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<executions>
<execution>
<phase>generate-resources</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
<format>NON-CANONICAL_{0,date,yyyy-MM-dd_HH-mm}_{1}</format>
<items>
<item>timestamp</item>
<item>${user.name}</item>
</items>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

25
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View File

@ -88,9 +88,11 @@ import org.eclipse.aether.collection.DependencyManager;
import org.eclipse.aether.collection.DependencySelector;
import org.eclipse.aether.collection.DependencyTraverser;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.NoLocalRepositoryManagerException;
import org.eclipse.aether.repository.RepositoryPolicy;
import org.eclipse.aether.repository.WorkspaceReader;
import org.eclipse.aether.resolution.ResolutionErrorPolicy;
import org.eclipse.aether.spi.localrepo.LocalRepositoryManagerFactory;
import org.eclipse.aether.util.graph.manager.ClassicDependencyManager;
import org.eclipse.aether.util.graph.selector.AndDependencySelector;
import org.eclipse.aether.util.graph.selector.ExclusionDependencySelector;
@ -147,6 +149,9 @@ public class DefaultMaven
@Requirement
private RepositorySystem repoSystem;
@Requirement( optional = true, hint = "simple" )
private LocalRepositoryManagerFactory simpleLocalRepositoryManagerFactory;
@Requirement
private SettingsDecrypter settingsDecrypter;
@ -378,7 +383,25 @@ public class DefaultMaven
session.setArtifactTypeRegistry( RepositoryUtils.newArtifactTypeRegistry( artifactHandlerManager ) );
LocalRepository localRepo = new LocalRepository( request.getLocalRepository().getBasedir() );
session.setLocalRepositoryManager( repoSystem.newLocalRepositoryManager( localRepo ) );
if ( request.isUseLegacyLocalRepository() )
{
logger.warn( "Disabling enhanced local repository: using legacy is stronlgy discouraged to ensure build reproducibility." );
try
{
session.setLocalRepositoryManager( simpleLocalRepositoryManagerFactory.newInstance( localRepo ) );
}
catch ( NoLocalRepositoryManagerException e )
{
logger.warn( "Failed to configure legacy local repository: back to default" );
session.setLocalRepositoryManager( repoSystem.newLocalRepositoryManager( localRepo ) );
}
}
else
{
session.setLocalRepositoryManager( repoSystem.newLocalRepositoryManager( localRepo ) );
}
if ( request.getWorkspaceReader() != null )
{

12
maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
View File

@ -143,6 +143,8 @@ public class DefaultMavenExecutionRequest
*/
private boolean noSnapshotUpdates;
private boolean useSimpleLocalRepositoryManager = false;
public DefaultMavenExecutionRequest()
{
}
@ -1076,4 +1078,14 @@ public class DefaultMavenExecutionRequest
return this;
}
public boolean isUseLegacyLocalRepository()
{
return this.useSimpleLocalRepositoryManager;
}
public MavenExecutionRequest setUseLegacyLocalRepository( boolean useSimpleLocalRepositoryManager )
{
this.useSimpleLocalRepositoryManager = useSimpleLocalRepositoryManager;
return this;
}
}

3
maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
View File

@ -19,7 +19,6 @@ package org.apache.maven.execution;
* under the License.
*/
import java.util.ArrayList;
import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.List;
@ -39,7 +38,7 @@ public class DefaultMavenExecutionResult
private DependencyResolutionResult dependencyResolutionResult;
private List<Throwable> exceptions = new CopyOnWriteArrayList<Throwable>( );
private List<Throwable> exceptions = new CopyOnWriteArrayList<Throwable>();
private Map<MavenProject, BuildSummary> buildSummaries;

38
maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
View File

@ -45,45 +45,45 @@ public interface MavenExecutionRequest
// Logging
// ----------------------------------------------------------------------
final int LOGGING_LEVEL_DEBUG = Logger.LEVEL_DEBUG;
int LOGGING_LEVEL_DEBUG = Logger.LEVEL_DEBUG;
final int LOGGING_LEVEL_INFO = Logger.LEVEL_INFO;
int LOGGING_LEVEL_INFO = Logger.LEVEL_INFO;
final int LOGGING_LEVEL_WARN = Logger.LEVEL_WARN;
int LOGGING_LEVEL_WARN = Logger.LEVEL_WARN;
final int LOGGING_LEVEL_ERROR = Logger.LEVEL_ERROR;
int LOGGING_LEVEL_ERROR = Logger.LEVEL_ERROR;
final int LOGGING_LEVEL_FATAL = Logger.LEVEL_FATAL;
int LOGGING_LEVEL_FATAL = Logger.LEVEL_FATAL;
final int LOGGING_LEVEL_DISABLED = Logger.LEVEL_DISABLED;
int LOGGING_LEVEL_DISABLED = Logger.LEVEL_DISABLED;
// ----------------------------------------------------------------------
// Reactor Failure Mode
// ----------------------------------------------------------------------
final String REACTOR_FAIL_FAST = "FAIL_FAST";
String REACTOR_FAIL_FAST = "FAIL_FAST";
final String REACTOR_FAIL_AT_END = "FAIL_AT_END";
String REACTOR_FAIL_AT_END = "FAIL_AT_END";
final String REACTOR_FAIL_NEVER = "FAIL_NEVER";
String REACTOR_FAIL_NEVER = "FAIL_NEVER";
// ----------------------------------------------------------------------
// Reactor Make Mode
// ----------------------------------------------------------------------
final String REACTOR_MAKE_UPSTREAM = "make-upstream";
String REACTOR_MAKE_UPSTREAM = "make-upstream";
final String REACTOR_MAKE_DOWNSTREAM = "make-downstream";
String REACTOR_MAKE_DOWNSTREAM = "make-downstream";
final String REACTOR_MAKE_BOTH = "make-both";
String REACTOR_MAKE_BOTH = "make-both";
// ----------------------------------------------------------------------
// Artifact repository policies
// ----------------------------------------------------------------------
final String CHECKSUM_POLICY_FAIL = ArtifactRepositoryPolicy.CHECKSUM_POLICY_FAIL;
String CHECKSUM_POLICY_FAIL = ArtifactRepositoryPolicy.CHECKSUM_POLICY_FAIL;
final String CHECKSUM_POLICY_WARN = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
String CHECKSUM_POLICY_WARN = ArtifactRepositoryPolicy.CHECKSUM_POLICY_WARN;
// ----------------------------------------------------------------------
//
@ -283,4 +283,14 @@ public interface MavenExecutionRequest
ProjectBuildingRequest getProjectBuildingRequest();
/**
* @since 3.1
*/
boolean isUseLegacyLocalRepository();
/**
* @since 3.1
*/
MavenExecutionRequest setUseLegacyLocalRepository( boolean useLegacyLocalRepository );
}

6
maven-core/src/main/java/org/apache/maven/lifecycle/internal/BuilderCommon.java
View File

@ -134,7 +134,8 @@ public class BuilderCommon
}
public void handleBuildError( final ReactorContext buildContext, final MavenSession rootSession,
final MavenProject mavenProject, Exception e, final long buildStartTime )
final MavenSession currentSession, final MavenProject mavenProject, Exception e,
final long buildStartTime )
{
if ( e instanceof RuntimeException )
{
@ -147,7 +148,7 @@ public class BuilderCommon
buildContext.getResult().addBuildSummary( new BuildFailure( mavenProject, buildEndTime - buildStartTime, e ) );
eventCatapult.fire( ExecutionEvent.Type.ProjectFailed, rootSession, null, e );
eventCatapult.fire( ExecutionEvent.Type.ProjectFailed, currentSession, null, e );
if ( MavenExecutionRequest.REACTOR_FAIL_NEVER.equals( rootSession.getReactorFailureBehavior() ) )
{
@ -186,5 +187,4 @@ public class BuilderCommon
return project.getGroupId() + ':' + project.getArtifactId() + ':' + project.getVersion();
}
}

7
maven-core/src/main/java/org/apache/maven/lifecycle/internal/CurrentPhaseForThread.java
View File

@ -29,17 +29,16 @@ package org.apache.maven.lifecycle.internal;
*/
class CurrentPhaseForThread
{
private static final InheritableThreadLocal<String> threadPhase = new InheritableThreadLocal<String>();
private static final InheritableThreadLocal<String> THREAD_PHASE = new InheritableThreadLocal<String>();
public static void setPhase( String phase )
{
threadPhase.set( phase );
THREAD_PHASE.set( phase );
}
public static boolean isPhase( String phase )
{
return phase.equals( threadPhase.get() );
return phase.equals( THREAD_PHASE.get() );
}
}

46
maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
View File

@ -1,19 +1,24 @@
/*
* 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.
*/
package org.apache.maven.lifecycle.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@ -219,11 +224,10 @@ public class DefaultLifecycleExecutionPlanCalculator
if ( lifecycle == null )
{
throw new LifecyclePhaseNotFoundException(
"Unknown lifecycle phase \"" + lifecyclePhase + "\". You must specify a valid lifecycle phase" +
" or a goal in the format <plugin-prefix>:<goal> or" +
" <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: " +
defaultLifeCycles.getLifecyclePhaseList() + ".", lifecyclePhase );
throw new LifecyclePhaseNotFoundException( "Unknown lifecycle phase \"" + lifecyclePhase
+ "\". You must specify a valid lifecycle phase" + " or a goal in the format <plugin-prefix>:<goal> or"
+ " <plugin-group-id>:<plugin-artifact-id>[:<plugin-version>]:<goal>. Available lifecycle phases are: "
+ defaultLifeCycles.getLifecyclePhaseList() + ".", lifecyclePhase );
}
/*
@ -432,8 +436,8 @@ public class DefaultLifecycleExecutionPlanCalculator
{
parameterConfiguration = new Xpp3Dom( parameterConfiguration, parameter.getName() );
if ( StringUtils.isEmpty( parameterConfiguration.getAttribute( "implementation" ) ) &&
StringUtils.isNotEmpty( parameter.getImplementation() ) )
if ( StringUtils.isEmpty( parameterConfiguration.getAttribute( "implementation" ) )
&& StringUtils.isNotEmpty( parameter.getImplementation() ) )
{
parameterConfiguration.setAttribute( "implementation", parameter.getImplementation() );
}

4
maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecyclePluginAnalyzer.java
View File

@ -80,8 +80,8 @@ public class DefaultLifecyclePluginAnalyzer
{
if ( logger.isDebugEnabled() )
{
logger.debug( "Looking up lifecyle mappings for packaging " + packaging + " from " +
Thread.currentThread().getContextClassLoader() );
logger.debug( "Looking up lifecyle mappings for packaging " + packaging + " from "
+ Thread.currentThread().getContextClassLoader() );
}
LifecycleMapping lifecycleMappingForPackaging = lifecycleMappings.get( packaging );

4
maven-core/src/main/java/org/apache/maven/lifecycle/internal/ExecutionPlanItem.java
View File

@ -94,8 +94,8 @@ public class ExecutionPlanItem
@Override
public String toString()
{
return "ExecutionPlanItem{" + ", mojoExecution=" + mojoExecution + ", schedule=" + schedule + '}' +
super.toString();
return "ExecutionPlanItem{" + ", mojoExecution=" + mojoExecution + ", schedule=" + schedule + '}'
+ super.toString();
}
}

37
maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleDependencyResolver.java
View File

@ -1,20 +1,33 @@
package org.apache.maven.lifecycle.internal;
/*
* 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
* 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
* 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.
* 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.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
@ -37,8 +50,6 @@ import org.eclipse.aether.graph.DependencyNode;
import org.eclipse.aether.util.filter.AndDependencyFilter;
import org.eclipse.aether.util.filter.ScopeDependencyFilter;
import java.util.*;
/**
* Resolves dependencies for the artifacts in context of the lifecycle build
*
@ -49,7 +60,7 @@ import java.util.*;
* <p/>
* NOTE: This class is not part of any public api and can be changed or deleted without prior notice.
*/
@Component(role = LifecycleDependencyResolver.class)
@Component( role = LifecycleDependencyResolver.class )
public class LifecycleDependencyResolver
{

2
maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
View File

@ -92,7 +92,7 @@ public class LifecycleModuleBuilder
}
catch ( Exception e )
{
builderCommon.handleBuildError( reactorContext, rootSession, currentProject, e, buildStartTime );
builderCommon.handleBuildError( reactorContext, rootSession, session, currentProject, e, buildStartTime );
}
finally
{

16
maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleWeaveBuilder.java
View File

@ -212,7 +212,8 @@ public class LifecycleWeaveBuilder
{
Iterator<ExecutionPlanItem> planItems = executionPlan.iterator();
ExecutionPlanItem current = planItems.hasNext() ? planItems.next() : null;
ThreadLockedArtifact threadLockedArtifact = (ThreadLockedArtifact)projectBuild.getProject().getArtifact();
ThreadLockedArtifact threadLockedArtifact =
(ThreadLockedArtifact) projectBuild.getProject().getArtifact();
if ( threadLockedArtifact != null )
{
threadLockedArtifact.attachToThread();
@ -277,8 +278,8 @@ public class LifecycleWeaveBuilder
}
catch ( Exception e )
{
builderCommon.handleBuildError( reactorContext, rootSession, projectBuild.getProject(), e,
buildStartTime );
builderCommon.handleBuildError( reactorContext, rootSession, projectBuild.getSession(),
projectBuild.getProject(), e, buildStartTime );
}
finally
{
@ -375,13 +376,14 @@ public class LifecycleWeaveBuilder
return null;
}
private static boolean isThreadLockedAndEmpty(Artifact artifact){
return artifact instanceof ThreadLockedArtifact && !((ThreadLockedArtifact) artifact).hasReal();
private static boolean isThreadLockedAndEmpty( Artifact artifact )
{
return artifact instanceof ThreadLockedArtifact && !( (ThreadLockedArtifact) artifact ).hasReal();
}
private static Artifact findDependency( MavenProject project, Artifact upStreamArtifact )
{
if ( upStreamArtifact == null || isThreadLockedAndEmpty(upStreamArtifact))
if ( upStreamArtifact == null || isThreadLockedAndEmpty( upStreamArtifact ) )
{
return null;
}
@ -483,8 +485,6 @@ public class LifecycleWeaveBuilder
artifactInThis.setFile( upstream.getFile() );
artifactInThis.setRepository( upstream.getRepository() );
artifactInThis.setResolved( true ); // Or maybe upstream.isResolved()....
}
}
}

10
maven-core/src/main/java/org/apache/maven/lifecycle/internal/ThreadLockedArtifact.java
View File

@ -52,8 +52,8 @@ class ThreadLockedArtifact
public boolean hasReal()
{
return real != null &&
( !( real instanceof ThreadLockedArtifact ) || ( (ThreadLockedArtifact) real ).hasReal() );
return real != null
&& ( !( real instanceof ThreadLockedArtifact ) || ( (ThreadLockedArtifact) real ).hasReal() );
}
public String getGroupId()
@ -96,17 +96,17 @@ class ThreadLockedArtifact
return real.hasClassifier();
}
private static final InheritableThreadLocal<ThreadLockedArtifact> threadArtifact =
private static final InheritableThreadLocal<ThreadLockedArtifact> THREAD_ARTIFACT =
new InheritableThreadLocal<ThreadLockedArtifact>();
public void attachToThread()
{
threadArtifact.set( this );
THREAD_ARTIFACT.set( this );
}
public File getFile()
{
final ThreadLockedArtifact lockedArtifact = threadArtifact.get();
final ThreadLockedArtifact lockedArtifact = THREAD_ARTIFACT.get();
if ( lockedArtifact != null && this != lockedArtifact && mustLock() )
{
try

6
maven-core/src/main/java/org/apache/maven/model/plugin/DefaultLifecycleBindingsInjector.java
View File

@ -66,9 +66,9 @@ public class DefaultLifecycleBindingsInjector
if ( defaultPlugins == null )
{
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE)
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( "Unknown packaging: " + packaging )
.setLocation( model.getLocation( "packaging" )));
.setLocation( model.getLocation( "packaging" ) ) );
}
else if ( !defaultPlugins.isEmpty() )
{
@ -80,7 +80,7 @@ public class DefaultLifecycleBindingsInjector
}
}
private static class LifecycleBindingsMerger
protected static class LifecycleBindingsMerger
extends MavenModelMerger
{

24
maven-core/src/main/java/org/apache/maven/plugin/BuildPluginManager.java
View File

@ -1,18 +1,22 @@
package org.apache.maven.plugin;
/*
* 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
* 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
* 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.
* 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.List;

26
maven-core/src/main/java/org/apache/maven/plugin/DefaultBuildPluginManager.java
View File

@ -1,18 +1,22 @@
package org.apache.maven.plugin;
/*
* 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
* 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
* 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.
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.io.ByteArrayOutputStream;
@ -33,7 +37,7 @@ import org.eclipse.aether.repository.RemoteRepository;
// TODO: the antrun plugin has its own configurator, the only plugin that does. might need to think about how that works
// TODO: remove the coreArtifactFilterManager
@Component(role = BuildPluginManager.class)
@Component( role = BuildPluginManager.class )
public class DefaultBuildPluginManager
implements BuildPluginManager
{

4
maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
View File

@ -53,8 +53,8 @@ import org.codehaus.plexus.util.introspection.ReflectionValueExtractor;
* <tr><td><code>mojo.*</code></td> <td>(since Maven 3)</td><td></td></tr>
* <tr><td><code>plugin</code></td> <td>(since Maven 3)</td><td>{@link MojoExecution#getMojoDescriptor()}.{@link MojoDescriptor#getPluginDescriptor() getPluginDescriptor()}</td></tr>
* <tr><td><code>plugin.*</code></td> <td></td> <td></td></tr>
* <tr><td>system properties</td> <td></td> <td></td></tr>
* <tr><td>project properties</td> <td></td> <td></td></tr>
* <tr><td><code>*</code></td> <td></td> <td>system properties</td></tr>
* <tr><td><code>*</code></td> <td></td> <td>project properties</td></tr>
* </table>
* <i>Notice:</i> <code>reports</code> was supported in Maven 2.x but was removed in Maven 3
*

24
maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultLegacySupport.java
View File

@ -19,6 +19,7 @@ package org.apache.maven.plugin.internal;
* under the License.
*/
import java.util.concurrent.atomic.AtomicReference;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.LegacySupport;
import org.codehaus.plexus.component.annotations.Component;
@ -37,29 +38,30 @@ public class DefaultLegacySupport
implements LegacySupport
{
private static final ThreadLocal<MavenSession[]> session = new InheritableThreadLocal<MavenSession[]>();
private static final ThreadLocal<AtomicReference<MavenSession>> SESSION = new InheritableThreadLocal<AtomicReference<MavenSession>>();
public void setSession( MavenSession session )
{
if ( session == null )
AtomicReference<MavenSession> reference = DefaultLegacySupport.SESSION.get();
if ( reference != null )
{
MavenSession[] oldSession = DefaultLegacySupport.session.get();
if ( oldSession != null )
{
oldSession[0] = null;
DefaultLegacySupport.session.remove();
}
reference.set( null );
}
if ( session == null && reference != null )
{
DefaultLegacySupport.SESSION.remove();
}
else
{
DefaultLegacySupport.session.set( new MavenSession[] { session } );
DefaultLegacySupport.SESSION.set( new AtomicReference<MavenSession>( session ) );
}
}
public MavenSession getSession()
{
MavenSession[] currentSession = DefaultLegacySupport.session.get();
return currentSession != null ? currentSession[0] : null;
AtomicReference<MavenSession> currentSession = DefaultLegacySupport.SESSION.get();
return currentSession != null ? currentSession.get() : null;
}
public RepositorySystemSession getRepositorySession()

7
maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java
View File

@ -83,6 +83,7 @@ import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.configuration.PlexusConfigurationException;
import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.LoggerManager;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
@ -110,6 +111,9 @@ public class DefaultMavenPluginManager
@Requirement
private Logger logger;
@Requirement
private LoggerManager loggerManager;
@Requirement
private PlexusContainer container;
@ -508,7 +512,8 @@ public class DefaultMavenPluginManager
if ( mojo instanceof Mojo )
{
( (Mojo) mojo ).setLog( new DefaultLog( logger ) );
Logger mojoLogger = loggerManager.getLoggerForComponent( mojoDescriptor.getImplementation() );
( (Mojo) mojo ).setLog( new DefaultLog( mojoLogger ) );
}
Xpp3Dom dom = mojoExecution.getConfiguration();

2
maven-core/src/main/java/org/apache/maven/plugin/internal/PluginDependenciesResolver.java
View File

@ -50,7 +50,7 @@ public interface PluginDependenciesResolver
* @return The resolved plugin artifact, never {@code null}.
* @throws PluginResolutionException If the plugin artifact could not be resolved.
*/
public Artifact resolve( Plugin plugin, List<RemoteRepository> repositories, RepositorySystemSession session )
Artifact resolve( Plugin plugin, List<RemoteRepository> repositories, RepositorySystemSession session )
throws PluginResolutionException;
/**

6
maven-core/src/main/java/org/apache/maven/plugin/prefix/PluginPrefixResult.java
View File

@ -1,7 +1,5 @@
package org.apache.maven.plugin.prefix;
import org.eclipse.aether.repository.ArtifactRepository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@ -11,7 +9,7 @@ import org.eclipse.aether.repository.ArtifactRepository;
* "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
* 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
@ -21,6 +19,8 @@ import org.eclipse.aether.repository.ArtifactRepository;
* under the License.
*/
import org.eclipse.aether.repository.ArtifactRepository;
/**
* Describes the result of a plugin prefix resolution request.
*

18
maven-core/src/main/java/org/apache/maven/project/DefaultModelBuildingListener.java
View File

@ -97,9 +97,9 @@ class DefaultModelBuildingListener
}
catch ( Exception e )
{
event.getProblems().add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE)
event.getProblems().add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( "Invalid plugin repository: " + e.getMessage() )
.setException( e ));
.setException( e ) );
}
project.setPluginArtifactRepositories( pluginRepositories );
@ -115,15 +115,15 @@ class DefaultModelBuildingListener
}
catch ( PluginResolutionException e )
{
event.getProblems().add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE)
.setMessage( "Unresolveable build extension: " + e.getMessage())
.setException( e ));
event.getProblems().add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( "Unresolveable build extension: " + e.getMessage() )
.setException( e ) );
}
catch ( PluginVersionResolutionException e )
{
event.getProblems().add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE)
event.getProblems().add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( "Unresolveable build extension: " + e.getMessage() )
.setException( e ));
.setException( e ) );
}
projectBuildingHelper.selectProjectRealm( project );
@ -138,9 +138,9 @@ class DefaultModelBuildingListener
}
catch ( Exception e )
{
event.getProblems().add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE)
event.getProblems().add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( "Invalid artifact repository: " + e.getMessage() )
.setException( e ));
.setException( e ) );
}
project.setRemoteArtifactRepositories( remoteRepositories );
}

24
maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
View File

@ -1,18 +1,22 @@
package org.apache.maven.project;
/*
* 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
* 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
* 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.
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.io.File;

26
maven-core/src/main/java/org/apache/maven/project/MavenProject.java
View File

@ -1,18 +1,22 @@
package org.apache.maven.project;
/*
* 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
* 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
* 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.
* 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.RepositoryUtils;
@ -1477,7 +1481,7 @@ public class MavenProject
for ( int ax = 0; ax < attachedArtifacts.size(); ax++ )
{
Artifact a = attachedArtifacts.get( ax );
if ( a.equals( artifact ))
if ( a.equals( artifact ) )
{
if ( logger != null )
{

2
maven-core/src/main/java/org/apache/maven/project/ProjectBuildingRequest.java
View File

@ -79,7 +79,7 @@ public interface ProjectBuildingRequest
*/
Properties getUserProperties();
void setProject(MavenProject mavenProject);
void setProject( MavenProject mavenProject );
MavenProject getProject();

12
maven-core/src/main/java/org/apache/maven/repository/RepositorySystem.java
View File

@ -42,17 +42,17 @@ import org.eclipse.aether.RepositorySystemSession;
*/
public interface RepositorySystem
{
final String DEFAULT_LOCAL_REPO_ID = "local";
String DEFAULT_LOCAL_REPO_ID = "local";
final String userHome = System.getProperty( "user.home" );
String userHome = System.getProperty( "user.home" );
final File userMavenConfigurationHome = new File( userHome, ".m2" );
File userMavenConfigurationHome = new File( userHome, ".m2" );
final File defaultUserLocalRepository = new File( userMavenConfigurationHome, "repository" );
File defaultUserLocalRepository = new File( userMavenConfigurationHome, "repository" );
final String DEFAULT_REMOTE_REPO_ID = "central";
String DEFAULT_REMOTE_REPO_ID = "central";
final String DEFAULT_REMOTE_REPO_URL = "http://repo.maven.apache.org/maven2";
String DEFAULT_REMOTE_REPO_URL = "http://repo.maven.apache.org/maven2";
Artifact createArtifact( String groupId, String artifactId, String version, String packaging );

4
maven-core/src/main/resources/META-INF/plexus/components.xml
View File

@ -129,10 +129,10 @@ under the License.
</phases>
<default-phases>
<site>
org.apache.maven.plugins:maven-site-plugin:3.1:site
org.apache.maven.plugins:maven-site-plugin:3.2:site
</site>
<site-deploy>
org.apache.maven.plugins:maven-site-plugin:3.1:deploy
org.apache.maven.plugins:maven-site-plugin:3.2:deploy
</site-deploy>
</default-phases>
<!-- END SNIPPET: site -->

2
maven-core/src/main/resources/META-INF/plexus/default-bindings.xml
View File

@ -258,7 +258,7 @@ Mappings to default lifecycle, specific for each packaging.
org.apache.maven.plugins:maven-surefire-plugin:2.12.4:test
</test>
<package>
org.apache.maven.plugins:maven-war-plugin:2.3:war
org.apache.maven.plugins:maven-war-plugin:2.2:war
</package>
<install>
org.apache.maven.plugins:maven-install-plugin:2.4:install

8
maven-core/src/site/apt/index.apt
View File

@ -26,4 +26,10 @@ Maven Core
({{{./xref/org/apache/maven/plugin/internal/DefaultMavenPluginManager.html}source}}),
* {{{./apidocs/org/apache/maven/plugin/PluginParameterExpressionEvaluator.html}PluginParameterExpressionEvaluator}}, used to
evaluate plugin parameters values during Mojo configuration.
evaluate plugin parameters values during Mojo configuration,
* {{{/guides/mini/guide-maven-classloading.html}classloader hierarchy}} done by <<<ClassRealmManager>>> component
({{{./apidocs/org/apache/maven/classrealm/ClassRealmManager.html}javadoc}}),
with its <<<DefaultClassRealmManager>>> implementation
({{{./xref/org/apache/maven/classrealm/DefaultClassRealmManager.html}source}}), using
{{{http://plexus.codehaus.org/plexus-classworlds/}Plexus Classworlds}}.

74
maven-core/src/test/java/org/apache/maven/plugin/internal/DefaultLegacySupportTest.java Normal file
View File

@ -0,0 +1,74 @@
package org.apache.maven.plugin.internal;
/*
* 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 junit.framework.TestCase;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenSession;
import java.util.concurrent.CountDownLatch;
/**
* @author Kristian Rosenvold
*/
public class DefaultLegacySupportTest extends TestCase {
final CountDownLatch latch = new CountDownLatch(1);
final DefaultLegacySupport defaultLegacySupport = new DefaultLegacySupport();
public void testSetSession() throws Exception {
MavenExecutionRequest mavenExecutionRequest = new DefaultMavenExecutionRequest();
MavenSession m1 = new MavenSession(null, null, mavenExecutionRequest, null);
defaultLegacySupport.setSession(m1);
MyRunnable myRunnable = new MyRunnable();
Thread thread = new Thread(myRunnable);
thread.start();
MavenSession m2 = new MavenSession(null, null, mavenExecutionRequest, null);
defaultLegacySupport.setSession(m2);
latch.countDown();
thread.join();
assertNull( myRunnable.getSession());
}
class MyRunnable implements Runnable {
private volatile MavenSession session;
public void run() {
try
{
latch.await();
}
catch (InterruptedException ingore)
{
// Test may fail if we get interrupted
}
session = defaultLegacySupport.getSession();
}
public MavenSession getSession() {
return session;
}
}
}

10
maven-embedder/pom.xml
View File

@ -74,6 +74,16 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<optional>true</optional>
</dependency>
<!-- CLI -->
<dependency>
<groupId>commons-cli</groupId>

4
maven-embedder/src/main/java/org/apache/maven/cli/CLIManager.java
View File

@ -97,6 +97,8 @@ public class CLIManager
public static final String THREADS = "T";
public static final String LEGACY_LOCAL_REPOSITORY ="llr";
protected Options options;
@SuppressWarnings( "static-access" )
@ -133,9 +135,9 @@ public class CLIManager
options.addOption( OptionBuilder.withLongOpt( "encrypt-master-password" ).hasArg().withDescription( "Encrypt master security password" ).create( ENCRYPT_MASTER_PASSWORD ) );
options.addOption( OptionBuilder.withLongOpt( "encrypt-password" ).hasArg().withDescription( "Encrypt server password" ).create( ENCRYPT_PASSWORD ) );
options.addOption( OptionBuilder.withLongOpt( "threads" ).hasArg().withDescription( "Thread count, for instance 2.0C where C is core multiplied" ).create( THREADS ) );
options.addOption( OptionBuilder.withLongOpt( "legacy-local-repository" ).withDescription( "Use Maven 2 Legacy Local Repository behaviour, ie no use of _maven.repositories. Can also be activated by using -Dmaven.legacyLocalRepo=true" ).create( LEGACY_LOCAL_REPOSITORY ) );
// Adding this back in for compatibility with the verifier that hard codes this option.
options.addOption( OptionBuilder.withLongOpt( "no-plugin-registry" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "npr" ) );
options.addOption( OptionBuilder.withLongOpt( "check-plugin-updates" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "cpu" ) );
options.addOption( OptionBuilder.withLongOpt( "update-plugins" ).withDescription( "Ineffective, only kept for backward compatibility" ).create( "up" ) );

14
maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
View File

@ -53,11 +53,15 @@ public final class CLIReportingUtils
Properties properties = getBuildProperties();
StringBuffer version = new StringBuffer();
version.append( createMavenVersionString( properties ) ).append( LS );
version.append( reduce( properties.getProperty( "distributionShortName" ) + " home: " + System.getProperty( "maven.home", "<unknown maven home>" ) ) ).append( LS );
version.append( "Java version: " + System.getProperty( "java.version", "<unknown java version>" ) + ", vendor: " + System.getProperty( "java.vendor", "<unknown vendor>" ) ).append( LS );
version.append( reduce( properties.getProperty( "distributionShortName" ) + " home: "
+ System.getProperty( "maven.home", "<unknown maven home>" ) ) ).append( LS );
version.append( "Java version: " + System.getProperty( "java.version", "<unknown java version>" )
+ ", vendor: " + System.getProperty( "java.vendor", "<unknown vendor>" ) ).append( LS );
version.append( "Java home: " + System.getProperty( "java.home", "<unknown java home>" ) ).append( LS );
version.append( "Default locale: " + Locale.getDefault() + ", platform encoding: " + System.getProperty( "file.encoding", "<unknown encoding>" ) ).append( LS );
version.append( "OS name: \"" + Os.OS_NAME + "\", version: \"" + Os.OS_VERSION + "\", arch: \"" + Os.OS_ARCH + "\", family: \"" + Os.OS_FAMILY + "\"" );
version.append( "Default locale: " + Locale.getDefault() + ", platform encoding: "
+ System.getProperty( "file.encoding", "<unknown encoding>" ) ).append( LS );
version.append( "OS name: \"" + Os.OS_NAME + "\", version: \"" + Os.OS_VERSION + "\", arch: \"" + Os.OS_ARCH
+ "\", family: \"" + Os.OS_FAMILY + "\"" );
return version.toString();
}
@ -79,7 +83,7 @@ public final class CLIReportingUtils
if ( rev != null || timestamp != null )
{
msg += " (";
msg += ( rev != null ? "r" + rev : "" );
msg += ( rev != null ? rev : "" );
if ( timestamp != null )
{
SimpleDateFormat fmt = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ssZ" );

80
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View File

@ -39,7 +39,10 @@ import org.apache.maven.InternalErrorException;
import org.apache.maven.Maven;
import org.apache.maven.cli.event.DefaultEventSpyContext;
import org.apache.maven.cli.event.ExecutionEventLogger;
import org.apache.maven.cli.logging.Slf4jConfiguration;
import org.apache.maven.cli.logging.Slf4jConfigurationFactory;
import org.apache.maven.cli.logging.Slf4jLoggerManager;
import org.apache.maven.cli.logging.Slf4jStdoutLogger;
import org.apache.maven.cli.transfer.ConsoleMavenTransferListener;
import org.apache.maven.cli.transfer.QuietMavenTransferListener;
import org.apache.maven.cli.transfer.Slf4jMavenTransferListener;
@ -207,6 +210,7 @@ public class MavenCli
settings( cliRequest );
populateRequest( cliRequest );
encryption( cliRequest );
repository( cliRequest );
return execute( cliRequest );
}
catch ( ExitException e )
@ -232,7 +236,7 @@ public class MavenCli
}
finally
{
if (localContainer != null)
if ( localContainer != null )
{
localContainer.dispose();
}
@ -261,6 +265,12 @@ public class MavenCli
private void cli( CliRequest cliRequest )
throws Exception
{
//
// Parsing errors can happen during the processing of the arguments and we prefer not having to check if the logger is null
// and construct this so we can use an SLF4J logger everywhere.
//
slf4jLogger = new Slf4jStdoutLogger();
CLIManager cliManager = new CLIManager();
try
@ -287,36 +297,40 @@ public class MavenCli
}
}
//
// All logging is handled by SFL4J
//
/**
* configure logging
*/
private void logging( CliRequest cliRequest )
{
cliRequest.debug = cliRequest.commandLine.hasOption( CLIManager.DEBUG );
cliRequest.quiet = !cliRequest.debug && cliRequest.commandLine.hasOption( CLIManager.QUIET );
cliRequest.showErrors = cliRequest.debug || cliRequest.commandLine.hasOption( CLIManager.ERRORS );
slf4jLoggerFactory = LoggerFactory.getILoggerFactory();
Slf4jConfiguration slf4jConfiguration = Slf4jConfigurationFactory.getConfiguration( slf4jLoggerFactory );
if ( cliRequest.debug )
{
cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_DEBUG );
System.setProperty( "org.slf4j.simpleLogger.defaultLogLevel", "debug" );
slf4jConfiguration.setRootLoggerLevel( Slf4jConfiguration.Level.DEBUG );
}
else if ( cliRequest.quiet )
{
cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_ERROR );
System.setProperty( "org.slf4j.simpleLogger.defaultLogLevel", "error" );
slf4jConfiguration.setRootLoggerLevel( Slf4jConfiguration.Level.ERROR );
}
else
{
cliRequest.request.setLoggingLevel( MavenExecutionRequest.LOGGING_LEVEL_INFO );
System.setProperty( "org.slf4j.simpleLogger.defaultLogLevel", "info" );
slf4jConfiguration.setRootLoggerLevel( Slf4jConfiguration.Level.INFO );
}
if ( cliRequest.commandLine.hasOption( CLIManager.LOG_FILE ) )
{
File logFile = new File( cliRequest.commandLine.getOptionValue( CLIManager.LOG_FILE ) );
logFile = resolveFile( logFile, cliRequest.workingDirectory );
System.setProperty( "org.slf4j.simpleLogger.logFile", logFile.getAbsolutePath() );
// redirect stdout and stderr to file
try
{
PrintStream ps = new PrintStream( new FileOutputStream( logFile ) );
@ -331,8 +345,9 @@ public class MavenCli
}
}
slf4jConfiguration.activate();
plexusLoggerManager = new Slf4jLoggerManager();
slf4jLoggerFactory = LoggerFactory.getILoggerFactory();
slf4jLogger = slf4jLoggerFactory.getLogger( this.getClass().getName() );
}
@ -376,29 +391,27 @@ public class MavenCli
DefaultPlexusContainer container = null;
ContainerConfiguration cc = new DefaultContainerConfiguration()
.setClassWorld( cliRequest.classWorld )
.setRealm( setupContainerRealm( cliRequest ) )
.setClassPathScanning( PlexusConstants.SCANNING_INDEX )
.setAutoWiring( true )
.setName( "maven" );
ContainerConfiguration cc = new DefaultContainerConfiguration()
.setClassWorld( cliRequest.classWorld )
.setRealm( setupContainerRealm( cliRequest ) )
.setClassPathScanning( PlexusConstants.SCANNING_INDEX )
.setAutoWiring( true )
.setName( "maven" );
container = new DefaultPlexusContainer( cc, new AbstractModule()
container = new DefaultPlexusContainer( cc, new AbstractModule()
{
protected void configure()
{
bind( ILoggerFactory.class ).toInstance( slf4jLoggerFactory );
}
} );
protected void configure()
{
bind( ILoggerFactory.class ).toInstance( slf4jLoggerFactory );
}
// NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for lookups
container.setLookupRealm( null );
} );
container.setLoggerManager( plexusLoggerManager );
// NOTE: To avoid inconsistencies, we'll use the TCCL exclusively for lookups
container.setLookupRealm( null );
container.setLoggerManager( plexusLoggerManager );
customizeContainer( container );
customizeContainer( container );
container.getLoggerManager().setThresholds( cliRequest.request.getLoggingLevel() );
@ -526,6 +539,15 @@ public class MavenCli
}
}
private void repository( CliRequest cliRequest )
throws Exception
{
if ( cliRequest.commandLine.hasOption( CLIManager.LEGACY_LOCAL_REPOSITORY ) || Boolean.getBoolean( "maven.legacyLocalRepo" ) )
{
cliRequest.request.setUseLegacyLocalRepository( true );
}
}
private int execute( CliRequest cliRequest )
{
eventSpyDispatcher.onEvent( cliRequest.request );
@ -887,7 +909,7 @@ public class MavenCli
transferListener = getBatchTransferListener();
}
ExecutionListener executionListener = new ExecutionEventLogger( slf4jLogger );
ExecutionListener executionListener = new ExecutionEventLogger();
executionListener = eventSpyDispatcher.chainListener( executionListener );
String alternatePomFile = null;
@ -1153,7 +1175,7 @@ public class MavenCli
protected TransferListener getBatchTransferListener()
{
return new Slf4jMavenTransferListener( slf4jLogger );
return new Slf4jMavenTransferListener();
}
protected void customizeContainer( PlexusContainer container )

9
maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
View File

@ -31,9 +31,10 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.project.MavenProject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Logs execution events to a user-supplied logger.
* Logs execution events to logger, eventually user-supplied.
*
* @author Benjamin Bentmann
*/
@ -44,6 +45,12 @@ public class ExecutionEventLogger
private static final int LINE_LENGTH = 72;
public ExecutionEventLogger()
{
logger = LoggerFactory.getLogger( ExecutionEventLogger.class );
}
// TODO should we deprecate?
public ExecutionEventLogger( Logger logger )
{
if ( logger == null )

44
maven-embedder/src/main/java/org/apache/maven/cli/logging/BaseSlf4jConfiguration.java Normal file
View File

@ -0,0 +1,44 @@
package org.apache.maven.cli.logging;
/*
* 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.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Abstract implementation.
*
* @author Hervé Boutemy
*/
public class BaseSlf4jConfiguration
implements Slf4jConfiguration
{
private final Logger logger = LoggerFactory.getLogger( BaseSlf4jConfiguration.class );
public void setRootLoggerLevel( Level level )
{
logger.warn( "setRootLoggerLevel: operation not supported" );
}
public void activate()
{
logger.warn( "reset(): operation not supported" );
}
}

187
maven-embedder/src/main/java/org/apache/maven/cli/logging/PrintStreamLogger.java
View File

@ -1,187 +0,0 @@
package org.apache.maven.cli.logging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.io.PrintStream;
import org.apache.maven.Maven;
import org.codehaus.plexus.logging.AbstractLogger;
import org.codehaus.plexus.logging.Logger;
/**
* Logs to a user-supplied {@link PrintStream}.
*
* @author Benjamin Bentmann
*/
public class PrintStreamLogger
extends AbstractLogger
{
public interface Provider
{
PrintStream getStream();
}
private Provider provider;
private static final String FATAL_ERROR = "[FATAL] ";
private static final String ERROR = "[ERROR] ";
private static final String WARNING = "[WARNING] ";
private static final String INFO = "[INFO] ";
private static final String DEBUG = "[DEBUG] ";
public PrintStreamLogger( Provider provider )
{
super( Logger.LEVEL_INFO, Maven.class.getName() );
if ( provider == null )
{
throw new IllegalArgumentException( "output stream provider missing" );
}
this.provider = provider;
}
public PrintStreamLogger( PrintStream out )
{
super( Logger.LEVEL_INFO, Maven.class.getName() );
setStream( out );
}
public void setStream( final PrintStream out )
{
if ( out == null )
{
throw new IllegalArgumentException( "output stream missing" );
}
this.provider = new Provider()
{
public PrintStream getStream()
{
return out;
}
};
}
public void debug( String message, Throwable throwable )
{
if ( isDebugEnabled() )
{
PrintStream out = provider.getStream();
out.print( DEBUG );
out.println( message );
if ( null != throwable )
{
throwable.printStackTrace( out );
}
}
}
public void info( String message, Throwable throwable )
{
if ( isInfoEnabled() )
{
PrintStream out = provider.getStream();
out.print( INFO );
out.println( message );
if ( null != throwable )
{
throwable.printStackTrace( out );
}
}
}
public void warn( String message, Throwable throwable )
{
if ( isWarnEnabled() )
{
PrintStream out = provider.getStream();
out.print( WARNING );
out.println( message );
if ( null != throwable )
{
throwable.printStackTrace( out );
}
}
}
public void error( String message, Throwable throwable )
{
if ( isErrorEnabled() )
{
PrintStream out = provider.getStream();
out.print( ERROR );
out.println( message );
if ( null != throwable )
{
throwable.printStackTrace( out );
}
}
}
public void fatalError( String message, Throwable throwable )
{
if ( isFatalErrorEnabled() )
{
PrintStream out = provider.getStream();
out.print( FATAL_ERROR );
out.println( message );
if ( null != throwable )
{
throwable.printStackTrace( out );
}
}
}
public void close()
{
PrintStream out = provider.getStream();
if ( out == System.out || out == System.err )
{
out.flush();
}
else
{
out.close();
}
}
public Logger getChildLogger( String arg0 )
{
return this;
}
}

43
maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfiguration.java Normal file
View File

@ -0,0 +1,43 @@
package org.apache.maven.cli.logging;
/*
* 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.
*/
/**
* Interface for configuration operations on loggers, which are not available in slf4j, then require per-slf4f-binding
* implementation.
*
* @author Hervé Boutemy
*/
public interface Slf4jConfiguration
{
public static enum Level { DEBUG, INFO, ERROR }
/**
* Set root logging level.
*
* @param level the level
*/
void setRootLoggerLevel( Level level );
/**
* Activate logging implementation configuration (if necessary).
*/
void activate();
}

81
maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jConfigurationFactory.java Normal file
View File

@ -0,0 +1,81 @@
package org.apache.maven.cli.logging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.io.IOException;
import java.net.URL;
import java.util.Enumeration;
import java.util.Properties;
import org.codehaus.plexus.util.PropertyUtils;
import org.slf4j.ILoggerFactory;
/**
* Slf4jConfiguration factory, loading implementations from <code>META-INF/maven/slf4j-configuration.properties</code>
* configuration files in class loader.
*
* @author Hervé Boutemy
*/
public class Slf4jConfigurationFactory
{
public static final String RESOURCE = "META-INF/maven/slf4j-configuration.properties";
public static Slf4jConfiguration getConfiguration( ILoggerFactory loggerFactory )
{
try
{
Enumeration<URL> resources = Slf4jConfigurationFactory.class.getClassLoader().getResources( RESOURCE );
String key = loggerFactory.getClass().getCanonicalName();
while ( resources.hasMoreElements() )
{
URL resource = resources.nextElement();
Properties conf = PropertyUtils.loadProperties( resource.openStream() );
String impl = conf.getProperty( key );
if ( impl != null )
{
return (Slf4jConfiguration) Class.forName( impl ).newInstance();
}
}
}
catch ( IOException e )
{
e.printStackTrace();
}
catch ( InstantiationException e )
{
e.printStackTrace();
}
catch ( IllegalAccessException e )
{
e.printStackTrace();
}
catch ( ClassNotFoundException e )
{
e.printStackTrace();
}
return new BaseSlf4jConfiguration();
}
}

4
maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jLogger.java
View File

@ -114,7 +114,7 @@ public class Slf4jLogger
}
/**
* <b>Warning</b>: ignored (always return <code>0</code>).
* <b>Warning</b>: ignored (always return <code>0 == Logger.LEVEL_DEBUG</code>).
*/
public int getThreshold()
{
@ -129,7 +129,7 @@ public class Slf4jLogger
}
/**
* <b>Warning</b>: ignored (always return <code>0</code>).
* <b>Warning</b>: ignored (always return <code>null</code>).
*/
public Logger getChildLogger( String name )
{

303
maven-embedder/src/main/java/org/apache/maven/cli/logging/Slf4jStdoutLogger.java Normal file
View File

@ -0,0 +1,303 @@
package org.apache.maven.cli.logging;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import java.io.PrintStream;
import org.slf4j.Logger;
import org.slf4j.Marker;
public class Slf4jStdoutLogger
implements Logger
{
private static final String ERROR = "[ERROR] ";
private PrintStream out = System.out;
//
// These are the only methods we need in our primordial logger
//
public void error( String msg )
{
out.print( ERROR );
out.println( msg );
}
public void error( String msg, Throwable t )
{
error( msg );
if ( null != t )
{
t.printStackTrace( out );
}
}
//
// Don't need any of this
//
public String getName()
{
return null;
}
public boolean isTraceEnabled()
{
return false;
}
public void trace( String msg )
{
}
public void trace( String format, Object arg )
{
}
public void trace( String format, Object arg1, Object arg2 )
{
}
public void trace( String format, Object... arguments )
{
}
public void trace( String msg, Throwable t )
{
}
public boolean isTraceEnabled( Marker marker )
{
return false;
}
public void trace( Marker marker, String msg )
{
}
public void trace( Marker marker, String format, Object arg )
{
}
public void trace( Marker marker, String format, Object arg1, Object arg2 )
{
}
public void trace( Marker marker, String format, Object... argArray )
{
}
public void trace( Marker marker, String msg, Throwable t )
{
}
public boolean isDebugEnabled()
{
return false;
}
public void debug( String msg )
{
}
public void debug( String format, Object arg )
{
}
public void debug( String format, Object arg1, Object arg2 )
{
}
public void debug( String format, Object... arguments )
{
}
public void debug( String msg, Throwable t )
{
}
public boolean isDebugEnabled( Marker marker )
{
return false;
}
public void debug( Marker marker, String msg )
{
}
public void debug( Marker marker, String format, Object arg )
{
}
public void debug( Marker marker, String format, Object arg1, Object arg2 )
{
}
public void debug( Marker marker, String format, Object... arguments )
{
}
public void debug( Marker marker, String msg, Throwable t )
{
}
public boolean isInfoEnabled()
{
return false;
}
public void info( String msg )
{
}
public void info( String format, Object arg )
{
}
public void info( String format, Object arg1, Object arg2 )
{
}
public void info( String format, Object... arguments )
{
}
public void info( String msg, Throwable t )
{
}
public boolean isInfoEnabled( Marker marker )
{
return false;
}
public void info( Marker marker, String msg )
{
}
public void info( Marker marker, String format, Object arg )
{
}
public void info( Marker marker, String format, Object arg1, Object arg2 )
{
}
public void info( Marker marker, String format, Object... arguments )
{
}
public void info( Marker marker, String msg, Throwable t )
{
}
public boolean isWarnEnabled()
{
return false;
}
public void warn( String msg )
{
}
public void warn( String format, Object arg )
{
}
public void warn( String format, Object... arguments )
{
}
public void warn( String format, Object arg1, Object arg2 )
{
}
public void warn( String msg, Throwable t )
{
}
public boolean isWarnEnabled( Marker marker )
{
return false;
}
public void warn( Marker marker, String msg )
{
}
public void warn( Marker marker, String format, Object arg )
{
}
public void warn( Marker marker, String format, Object arg1, Object arg2 )
{
}
public void warn( Marker marker, String format, Object... arguments )
{
}
public void warn( Marker marker, String msg, Throwable t )
{
}
public boolean isErrorEnabled()
{
return false;
}
public void error( String format, Object arg )
{
}
public void error( String format, Object arg1, Object arg2 )
{
}
public void error( String format, Object... arguments )
{
}
public boolean isErrorEnabled( Marker marker )
{
return false;
}
public void error( Marker marker, String msg )
{
}
public void error( Marker marker, String format, Object arg )
{
}
public void error( Marker marker, String format, Object arg1, Object arg2 )
{
}
public void error( Marker marker, String format, Object... arguments )
{
}
public void error( Marker marker, String msg, Throwable t )
{
}
}

58
maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Log4j2Configuration.java Normal file
View File

@ -0,0 +1,58 @@
package org.apache.maven.cli.logging.impl;
/*
* 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.cli.logging.BaseSlf4jConfiguration;
/**
* Configuration for slf4j-log4j2.
*
* @author Hervé Boutemy
*/
public class Log4j2Configuration
extends BaseSlf4jConfiguration
{
@Override
public void setRootLoggerLevel( Level level )
{
String value = "info";
switch ( level )
{
case DEBUG:
value = "debug";
break;
case INFO:
value = "info";
break;
case ERROR:
value = "error";
break;
}
System.setProperty( "maven.logging.root.level", value );
}
@Override
public void activate()
{
// no op
}
}

60
maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/LogbackConfiguration.java Normal file
View File

@ -0,0 +1,60 @@
package org.apache.maven.cli.logging.impl;
/*
* 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.cli.logging.BaseSlf4jConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Configuration for slf4j-logback.
*
* @author Hervé Boutemy
*/
public class LogbackConfiguration
extends BaseSlf4jConfiguration
{
@Override
public void setRootLoggerLevel( Level level )
{
ch.qos.logback.classic.Level value = ch.qos.logback.classic.Level.INFO;
switch ( level )
{
case DEBUG:
value = ch.qos.logback.classic.Level.DEBUG;
break;
case INFO:
value = ch.qos.logback.classic.Level.INFO;
break;
case ERROR:
value = ch.qos.logback.classic.Level.ERROR;
break;
}
( (ch.qos.logback.classic.Logger) LoggerFactory.getLogger( Logger.ROOT_LOGGER_NAME ) ).setLevel( value );
}
@Override
public void activate()
{
// no op
}
}

62
maven-embedder/src/main/java/org/apache/maven/cli/logging/impl/Slf4jSimpleConfiguration.java Normal file
View File

@ -0,0 +1,62 @@
package org.apache.maven.cli.logging.impl;
/*
* 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.cli.logging.BaseSlf4jConfiguration;
import org.slf4j.MavenSlf4jFriend;
import org.slf4j.impl.MavenSlf4jSimpleFriend;
/**
* Configuration for slf4j-simple.
*
* @author Hervé Boutemy
*/
public class Slf4jSimpleConfiguration
extends BaseSlf4jConfiguration
{
@Override
public void setRootLoggerLevel( Level level )
{
String value = "info";
switch ( level )
{
case DEBUG:
value = "debug";
break;
case INFO:
value = "info";
break;
case ERROR:
value = "error";
break;
}
System.setProperty( "org.slf4j.simpleLogger.defaultLogLevel", value );
}
@Override
public void activate()
{
// property for root logger level or System.out redirection need to be taken into account
MavenSlf4jFriend.reset();
MavenSlf4jSimpleFriend.init();
}
}

9
maven-embedder/src/main/java/org/apache/maven/cli/transfer/Slf4jMavenTransferListener.java
View File

@ -28,13 +28,20 @@ import org.eclipse.aether.transfer.TransferCancelledException;
import org.eclipse.aether.transfer.TransferEvent;
import org.eclipse.aether.transfer.TransferResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class Slf4jMavenTransferListener
extends AbstractTransferListener
{
protected Logger out;
protected final Logger out;
public Slf4jMavenTransferListener()
{
this.out = LoggerFactory.getLogger( Slf4jMavenTransferListener.class );
}
// TODO should we deprecate?
public Slf4jMavenTransferListener( Logger out )
{
this.out = out;

35
maven-embedder/src/main/java/org/slf4j/MavenSlf4jFriend.java Normal file
View File

@ -0,0 +1,35 @@
package org.slf4j;
/*
* 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.
*/
/**
* Utility for Maven to access Slf4j internals through package access.
* Use with precaution, since this is not normally intended for production use.
*/
public class MavenSlf4jFriend
{
/**
* Reset Slf4j internal state.
*/
public static void reset()
{
LoggerFactory.reset();
}
}

32
maven-embedder/src/main/java/org/slf4j/impl/MavenSlf4jSimpleFriend.java Normal file
View File

@ -0,0 +1,32 @@
package org.slf4j.impl;
/*
* 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.
*/
/**
* Utility for Maven to access Slf4j-Simple internals through package access.
* Use with precaution, since this is not normally intended for production use.
*/
public class MavenSlf4jSimpleFriend
{
public static void init()
{
SimpleLogger.init();
}
}

5
maven-embedder/src/main/resources/META-INF/maven/slf4j-configuration.properties Normal file
View File

@ -0,0 +1,5 @@
# key = Slf4j effective logger factory implementation
# value = corresponding o.a.m.cli.logging.Slf4jConfiguration class
org.slf4j.impl.SimpleLoggerFactory org.apache.maven.cli.logging.impl.Slf4jSimpleConfiguration
org.slf4j.helpers.Log4JLoggerFactory org.apache.maven.cli.logging.impl.Log4j2Configuration
ch.qos.logback.classic.LoggerContext org.apache.maven.cli.logging.impl.LogbackConfiguration

5
maven-embedder/src/site/apt/logging.apt
View File

@ -22,7 +22,7 @@ Maven Logging
* Getting Logger Instance
Plexus Logger can be injected in Plexus component using Plexus annotations
Plexus Logger and LoggerManager can be injected in Plexus component using Plexus annotations
<<<<<<< HEAD
+------
@ -39,6 +39,9 @@ public class DefaultMyComponent
{
@Requirement
private Logger logger;
@Requirement
private LoggerManager loggerManager;
}
<<<<<<< HEAD
+------

124
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
View File

@ -278,6 +278,8 @@ public class DefaultModelBuilder
modelNormalizer.mergeDuplicates( tmpModel, request, problems );
profileActivationContext.setProjectProperties( tmpModel.getProperties() );
List<Profile> activePomProfiles =
profileSelector.getActiveProfiles( rawModel.getProfiles(), profileActivationContext, problems );
currentData.setActiveProfiles( activePomProfiles );
@ -317,7 +319,7 @@ public class DefaultModelBuilder
}
message += currentData.getId();
problems.add( new ModelProblemCollectorRequest(ModelProblem.Severity.FATAL, ModelProblem.Version.BASE).setMessage(message));
problems.add( new ModelProblemCollectorRequest( ModelProblem.Severity.FATAL, ModelProblem.Version.BASE ).setMessage( message ) );
throw problems.newModelBuildingException();
}
}
@ -409,7 +411,7 @@ public class DefaultModelBuilder
modelValidator.validateEffectiveModel( resultModel, request, problems );
if ( hasModelErrors(problems) )
if ( hasModelErrors( problems ) )
{
throw problems.newModelBuildingException();
}
@ -471,15 +473,15 @@ public class DefaultModelBuilder
if ( pomFile != null )
{
problems.add( new ModelProblemCollectorRequest(Severity.ERROR, Version.V20)
.setMessage("Malformed POM " + modelSource.getLocation() + ": " + e.getMessage())
.setException(e ));
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.V20 )
.setMessage( "Malformed POM " + modelSource.getLocation() + ": " + e.getMessage() )
.setException( e ) );
}
else
{
problems.add( new ModelProblemCollectorRequest(Severity.WARNING, Version.V20)
.setMessage("Malformed POM " + modelSource.getLocation() + ": " + e.getMessage())
.setException(e));
problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V20 )
.setMessage( "Malformed POM " + modelSource.getLocation() + ": " + e.getMessage() )
.setException( e ) );
}
}
@ -491,9 +493,9 @@ public class DefaultModelBuilder
}
catch ( ModelParseException e )
{
problems.add( new ModelProblemCollectorRequest(Severity.FATAL, Version.BASE)
.setMessage("Non-parseable POM " + modelSource.getLocation() + ": " + e.getMessage())
.setException(e));
problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE )
.setMessage( "Non-parseable POM " + modelSource.getLocation() + ": " + e.getMessage() )
.setException( e ) );
throw problems.newModelBuildingException();
}
catch ( IOException e )
@ -511,9 +513,9 @@ public class DefaultModelBuilder
msg = e.getClass().getSimpleName();
}
}
problems.add( new ModelProblemCollectorRequest(Severity.FATAL, Version.BASE)
.setMessage("Non-readable POM " + modelSource.getLocation() + ": " + msg)
.setException(e ));
problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE )
.setMessage( "Non-readable POM " + modelSource.getLocation() + ": " + msg )
.setException( e ) );
throw problems.newModelBuildingException();
}
@ -522,7 +524,7 @@ public class DefaultModelBuilder
problems.setSource( model );
modelValidator.validateRawModel( model, request, problems );
if ( hasFatalErrors(problems) )
if ( hasFatalErrors( problems ) )
{
throw problems.newModelBuildingException();
}
@ -562,10 +564,10 @@ public class DefaultModelBuilder
}
catch ( InvalidRepositoryException e )
{
problems.add( new ModelProblemCollectorRequest(Severity.ERROR, Version.BASE)
.setMessage( "Invalid repository " + repository.getId() + ": " + e.getMessage())
.setLocation(repository.getLocation( "" ))
.setException(e) );
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( "Invalid repository " + repository.getId() + ": " + e.getMessage() )
.setLocation( repository.getLocation( "" ) )
.setException( e ) );
}
}
}
@ -617,9 +619,9 @@ public class DefaultModelBuilder
if ( versions.get( key ) == null && managedVersions.get( key ) == null )
{
InputLocation location = plugins.get( key ).getLocation( "" );
problems.add( new ModelProblemCollectorRequest(Severity.WARNING, Version.V20)
.setMessage( "'build.plugins.plugin.version' for " + key + " is missing.")
.setLocation(location));
problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V20 )
.setMessage( "'build.plugins.plugin.version' for " + key + " is missing." )
.setLocation( location ) );
}
}
}
@ -694,10 +696,10 @@ public class DefaultModelBuilder
if ( !"pom".equals( parentModel.getPackaging() ) )
{
problems.add( new ModelProblemCollectorRequest(Severity.ERROR, Version.BASE)
.setMessage( "Invalid packaging for parent POM " + ModelProblemUtils.toSourceHint( parentModel ) + ", must be \"pom\" but is \""
+ parentModel.getPackaging() + "\"")
.setLocation(parentModel.getLocation( "packaging" )));
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( "Invalid packaging for parent POM " + ModelProblemUtils.toSourceHint( parentModel )
+ ", must be \"pom\" but is \"" + parentModel.getPackaging() + "\"" )
.setLocation( parentModel.getLocation( "packaging" ) ) );
}
}
else
@ -749,9 +751,9 @@ public class DefaultModelBuilder
buffer.append( ", please verify your project structure" );
problems.setSource( childModel );
problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.BASE)
.setMessage( buffer.toString())
.setLocation( parent.getLocation( "" )));
problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.BASE )
.setMessage( buffer.toString() )
.setLocation( parent.getLocation( "" ) ) );
return null;
}
if ( version == null || !version.equals( parent.getVersion() ) )
@ -843,10 +845,10 @@ public class DefaultModelBuilder
}
}
problems.add( new ModelProblemCollectorRequest(Severity.FATAL, Version.BASE)
.setMessage( buffer.toString())
.setLocation(parent.getLocation( "" ))
.setException(e));
problems.add( new ModelProblemCollectorRequest( Severity.FATAL, Version.BASE )
.setMessage( buffer.toString() )
.setLocation( parent.getLocation( "" ) )
.setException( e ) );
throw problems.newModelBuildingException();
}
@ -912,23 +914,26 @@ public class DefaultModelBuilder
if ( groupId == null || groupId.length() <= 0 )
{
problems.add( new ModelProblemCollectorRequest(Severity.ERROR, Version.BASE)
.setMessage( "'dependencyManagement.dependencies.dependency.groupId' for " + dependency.getManagementKey() + " is missing.")
.setLocation( dependency.getLocation( "" )));
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( "'dependencyManagement.dependencies.dependency.groupId' for "
+ dependency.getManagementKey() + " is missing." )
.setLocation( dependency.getLocation( "" ) ) );
continue;
}
if ( artifactId == null || artifactId.length() <= 0 )
{
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE)
.setMessage( "'dependencyManagement.dependencies.dependency.artifactId' for " + dependency.getManagementKey() + " is missing.")
.setLocation( dependency.getLocation( "" )));
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( "'dependencyManagement.dependencies.dependency.artifactId' for "
+ dependency.getManagementKey() + " is missing." )
.setLocation( dependency.getLocation( "" ) ) );
continue;
}
if ( version == null || version.length() <= 0 )
{
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE)
.setMessage( "'dependencyManagement.dependencies.dependency.version' for " + dependency.getManagementKey() + " is missing.")
.setLocation( dependency.getLocation( "" )));
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( "'dependencyManagement.dependencies.dependency.version' for "
+ dependency.getManagementKey() + " is missing." )
.setLocation( dependency.getLocation( "" ) ) );
continue;
}
@ -942,7 +947,7 @@ public class DefaultModelBuilder
message += modelId + " -> ";
}
message += imported;
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).setMessage( message ));
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).setMessage( message ) );
continue;
}
@ -976,8 +981,8 @@ public class DefaultModelBuilder
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( buffer.toString() )
.setLocation( dependency.getLocation( "" ))
.setException( e ));
.setLocation( dependency.getLocation( "" ) )
.setException( e ) );
continue;
}
@ -1076,22 +1081,29 @@ public class DefaultModelBuilder
&& ( version == null || message.contains( version ) );
}
protected boolean hasModelErrors(ModelProblemCollectorExt problems) {
if (problems instanceof DefaultModelProblemCollector) {
return ((DefaultModelProblemCollector)problems).hasErrors();
} else {
//the default execution path only knows the DefaultModelProblemCollector,
protected boolean hasModelErrors( ModelProblemCollectorExt problems )
{
if ( problems instanceof DefaultModelProblemCollector )
{
return ( (DefaultModelProblemCollector) problems ).hasErrors();
}
else
{
// the default execution path only knows the DefaultModelProblemCollector,
// only reason it's not in signature is because it's package private
throw new IllegalStateException();
}
}
protected boolean hasFatalErrors(ModelProblemCollectorExt problems) {
if (problems instanceof DefaultModelProblemCollector) {
return ((DefaultModelProblemCollector)problems).hasFatalErrors();
} else {
//the default execution path only knows the DefaultModelProblemCollector,
protected boolean hasFatalErrors( ModelProblemCollectorExt problems )
{
if ( problems instanceof DefaultModelProblemCollector )
{
return ( (DefaultModelProblemCollector) problems ).hasFatalErrors();
}
else
{
// the default execution path only knows the DefaultModelProblemCollector,
// only reason it's not in signature is because it's package private
throw new IllegalStateException();
}

3
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblem.java
View File

@ -146,7 +146,8 @@ public class DefaultModelProblem
return severity;
}
public Version getVersion() {
public Version getVersion()
{
return version;
}

7
maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelProblemCollector.java
View File

@ -23,10 +23,7 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Set;
import org.apache.maven.model.InputLocation;
import org.apache.maven.model.Model;
import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelProblem.Version;
import org.apache.maven.model.io.ModelParseException;
/**
@ -174,7 +171,9 @@ class DefaultModelProblemCollector
column = e.getColumnNumber();
}
ModelProblem problem = new DefaultModelProblem( req.getMessage(), req.getSeverity(), req.getVersion(), source, line, column, modelId, req.getException() );
ModelProblem problem =
new DefaultModelProblem( req.getMessage(), req.getSeverity(), req.getVersion(), source, line, column,
modelId, req.getException() );
add( problem );
}

3
maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblem.java
View File

@ -41,7 +41,8 @@ public interface ModelProblem
}
enum Version {
enum Version
{
//based on ModeBuildingResult.validationLevel
BASE,
V20,

3
maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollector.java
View File

@ -19,9 +19,6 @@ package org.apache.maven.model.building;
* under the License.
*/
import java.util.List;
import org.apache.maven.model.InputLocation;
/**
* Collects problems that are encountered during model building. The primary purpose of this component is to account for
* the fact that the problem reporter has/should not have information about the calling context and hence cannot provide

50
maven-model-builder/src/main/java/org/apache/maven/model/building/ModelProblemCollectorRequest.java
View File

@ -1,20 +1,24 @@
/*
* Copyright 2012 The Apache Software Foundation.
*
* Licensed 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.
*/
package org.apache.maven.model.building;
/*
* 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.InputLocation;
import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelProblem.Version;
@ -38,17 +42,17 @@ public final class ModelProblemCollectorRequest
* @param severity
* @param version
*/
public ModelProblemCollectorRequest(Severity severity, Version version)
public ModelProblemCollectorRequest( Severity severity, Version version )
{
this.severity = severity;
this.version = version;
if (severity == null)
if ( severity == null )
{
throw new IllegalStateException("No severity declared");
throw new IllegalStateException( "No severity declared" );
}
if (version == null)
if ( version == null )
{
throw new IllegalStateException("No version declared.");
throw new IllegalStateException( "No version declared." );
}
}
@ -67,7 +71,7 @@ public final class ModelProblemCollectorRequest
return exception;
}
public ModelProblemCollectorRequest setException(Exception exception)
public ModelProblemCollectorRequest setException( Exception exception )
{
this.exception = exception;
return this;
@ -78,7 +82,7 @@ public final class ModelProblemCollectorRequest
return message;
}
public ModelProblemCollectorRequest setMessage(String message)
public ModelProblemCollectorRequest setMessage( String message )
{
this.message = message;
return this;
@ -89,7 +93,7 @@ public final class ModelProblemCollectorRequest
return location;
}
public ModelProblemCollectorRequest setLocation(InputLocation location)
public ModelProblemCollectorRequest setLocation( InputLocation location )
{
this.location = location;
return this;

19
maven-model-builder/src/main/java/org/apache/maven/model/inheritance/DefaultInheritanceAssembler.java
View File

@ -58,12 +58,17 @@ public class DefaultInheritanceAssembler
/**
* Calculates the relative path from the base directory of the parent to the parent directory of the base directory
* of the child. The general idea is to adjust inherited URLs to match the project layout (in SCM). This calculation
* is only a heuristic based on our conventions. In detail, the algo relies on the following assumptions. The parent
* uses aggregation and refers to the child via the modules section. The module path to the child is considered to
* point at the POM rather than its base directory if the path ends with ".xml" (ignoring case). The name of the
* child's base directory matches the artifact id of the child. Note that for the sake of independence from the user
* environment, the filesystem is intentionally not used for the calculation.
* of the child. The general idea is to adjust inherited URLs to match the project layout (in SCM).
*
* <p>This calculation is only a heuristic based on our conventions.
* In detail, the algo relies on the following assumptions: <ul>
* <li>The parent uses aggregation and refers to the child via the modules section</li>
* <li>The module path to the child is considered to
* point at the POM rather than its base directory if the path ends with ".xml" (ignoring case)</li>
* <li>The name of the child's base directory matches the artifact id of the child.</li>
* </ul>
* Note that for the sake of independence from the user
* environment, the filesystem is intentionally not used for the calculation.</p>
*
* @param child The child model, must not be <code>null</code>.
* @param parent The parent model, may be <code>null</code>.
@ -119,7 +124,7 @@ public class DefaultInheritanceAssembler
return adjustment;
}
private static class InheritanceModelMerger
protected static class InheritanceModelMerger
extends MavenModelMerger
{

4
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/AbstractStringBasedModelInterpolator.java
View File

@ -45,7 +45,6 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblem.Version;
import org.apache.maven.model.building.ModelProblemCollectorRequest;
@ -244,7 +243,8 @@ public abstract class AbstractStringBasedModelInterpolator
}
catch ( InterpolationException e )
{
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE ).setMessage( e.getMessage() ).setException( e ));
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( e.getMessage() ).setException( e ) );
}
interpolator.clearFeedback();

3
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/ProblemDetectingValueSource.java
View File

@ -20,7 +20,6 @@ package org.apache.maven.model.interpolation;
*/
import java.util.List;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblem.Severity;
@ -65,7 +64,7 @@ class ProblemDetectingValueSource
{
msg += " Please use ${" + newPrefix + expression.substring( bannedPrefix.length() ) + "} instead.";
}
problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V20 ).setMessage( msg ));
problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V20 ).setMessage( msg ) );
}
return value;

10
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
View File

@ -49,7 +49,7 @@ public class StringSearchModelInterpolator
extends AbstractStringBasedModelInterpolator
{
private static final Map<Class<?>, InterpolateObjectAction.CacheItem> cachedEntries =
private static final Map<Class<?>, InterpolateObjectAction.CacheItem> CACHED_ENTRIES =
new ConcurrentHashMap<Class<?>, InterpolateObjectAction.CacheItem>( 80, 0.75f, 2 );
// Empirical data from 3.x, actual =40
@ -161,11 +161,11 @@ public class StringSearchModelInterpolator
private CacheItem getCacheEntry( Class<?> cls )
{
CacheItem cacheItem = cachedEntries.get( cls );
CacheItem cacheItem = CACHED_ENTRIES.get( cls );
if ( cacheItem == null )
{
cacheItem = new CacheItem( cls );
cachedEntries.put( cls, cacheItem );
CACHED_ENTRIES.put( cls, cacheItem );
}
return cacheItem;
}
@ -247,7 +247,7 @@ public class StringSearchModelInterpolator
}
else if ( Collection.class.isAssignableFrom( type ) )
{
throw new RuntimeException("We dont interpolate into collections, use a list instead");
throw new RuntimeException( "We dont interpolate into collections, use a list instead" );
}
else if ( Map.class.isAssignableFrom( type ) )
{
@ -278,7 +278,7 @@ public class StringSearchModelInterpolator
}
}
static abstract class CacheField
abstract static class CacheField
{
protected final Field field;

2
maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultDependencyManagementInjector.java
View File

@ -50,7 +50,7 @@ public class DefaultDependencyManagementInjector
merger.mergeManagedDependencies( model );
}
private static class ManagementModelMerger
protected static class ManagementModelMerger
extends MavenModelMerger
{

2
maven-model-builder/src/main/java/org/apache/maven/model/management/DefaultPluginManagementInjector.java
View File

@ -53,7 +53,7 @@ public class DefaultPluginManagementInjector
merger.mergeManagedBuildPlugins( model );
}
private static class ManagementModelMerger
protected static class ManagementModelMerger
extends MavenModelMerger
{

31
maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
View File

@ -52,7 +52,8 @@ import org.apache.maven.model.Scm;
import org.apache.maven.model.Site;
/**
* The domain-specific model merger for the Maven POM.
* The domain-specific model merger for the Maven POM, overriding generic code from parent class when necessary with
* more adapted algorithms.
*
* @author Benjamin Bentmann
*/
@ -631,45 +632,45 @@ public class MavenModelMerger
}
@Override
protected Object getPluginKey( Plugin object )
protected Object getPluginKey( Plugin plugin )
{
return object.getKey();
return plugin.getKey();
}
@Override
protected Object getPluginExecutionKey( PluginExecution object )
protected Object getPluginExecutionKey( PluginExecution pluginExecution )
{
return object.getId();
return pluginExecution.getId();
}
@Override
protected Object getReportPluginKey( ReportPlugin object )
protected Object getReportPluginKey( ReportPlugin reportPlugin )
{
return object.getKey();
return reportPlugin.getKey();
}
@Override
protected Object getReportSetKey( ReportSet object )
protected Object getReportSetKey( ReportSet reportSet )
{
return object.getId();
return reportSet.getId();
}
@Override
protected Object getRepositoryBaseKey( RepositoryBase object )
protected Object getRepositoryBaseKey( RepositoryBase repositoryBase )
{
return object.getId();
return repositoryBase.getId();
}
@Override
protected Object getExtensionKey( Extension object )
protected Object getExtensionKey( Extension extension )
{
return object.getGroupId() + ':' + object.getArtifactId();
return extension.getGroupId() + ':' + extension.getArtifactId();
}
@Override
protected Object getExclusionKey( Exclusion object )
protected Object getExclusionKey( Exclusion exclusion )
{
return object.getGroupId() + ':' + object.getArtifactId();
return exclusion.getGroupId() + ':' + exclusion.getArtifactId();
}
private String appendPath( String parentPath, Map<Object, Object> context )

2
maven-model-builder/src/main/java/org/apache/maven/model/normalization/DefaultModelNormalizer.java
View File

@ -93,7 +93,7 @@ public class DefaultModelNormalizer
}
}
private static class DuplicateMerger
protected static class DuplicateMerger
extends MavenModelMerger
{

6
maven-model-builder/src/main/java/org/apache/maven/model/plugin/DefaultReportingConverter.java
View File

@ -108,9 +108,9 @@ public class DefaultReportingConverter
&& request.getValidationLevel() >= ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_3_1 )
{
problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V31)
.setMessage( "The <reporting> section is deprecated, please move the reports to the <configuration> section of the new Maven Site Plugin.")
.setLocation( reporting.getLocation( "" ) ));
problems.add( new ModelProblemCollectorRequest( Severity.WARNING, Version.V31 )
.setMessage( "The <reporting> section is deprecated, please move the reports to the <configuration> section of the new Maven Site Plugin." )
.setLocation( reporting.getLocation( "" ) ) );
}
for ( ReportPlugin plugin : reporting.getPlugins() )

45
maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileActivationContext.java
View File

@ -21,6 +21,8 @@ package org.apache.maven.model.profile;
import java.io.File;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@ -42,6 +44,8 @@ public class DefaultProfileActivationContext
private Map<String, String> userProperties = Collections.emptyMap();
private Map<String, String> projectProperties = Collections.emptyMap();
private File projectDirectory;
public List<String> getActiveProfileIds()
@ -106,7 +110,7 @@ public class DefaultProfileActivationContext
* @param systemProperties The system properties, may be {@code null}.
* @return This context, never {@code null}.
*/
@SuppressWarnings( "unchecked" )
@SuppressWarnings("unchecked")
public DefaultProfileActivationContext setSystemProperties( Properties systemProperties )
{
if ( systemProperties != null )
@ -155,7 +159,7 @@ public class DefaultProfileActivationContext
* @param userProperties The user properties, may be {@code null}.
* @return This context, never {@code null}.
*/
@SuppressWarnings( "unchecked" )
@SuppressWarnings("unchecked")
public DefaultProfileActivationContext setUserProperties( Properties userProperties )
{
if ( userProperties != null )
@ -201,7 +205,7 @@ public class DefaultProfileActivationContext
* Sets the base directory of the current project.
*
* @param projectDirectory The base directory of the current project, may be {@code null} if profile activation
* happens in the context of metadata retrieval rather than project building.
* happens in the context of metadata retrieval rather than project building.
* @return This context, never {@code null}.
*/
public DefaultProfileActivationContext setProjectDirectory( File projectDirectory )
@ -211,4 +215,39 @@ public class DefaultProfileActivationContext
return this;
}
public Map<String, String> getProjectProperties()
{
return projectProperties;
}
public DefaultProfileActivationContext setProjectProperties( Properties projectProperties )
{
if ( projectProperties != null )
{
this.projectProperties = Collections.unmodifiableMap( toMap( projectProperties ) );
}
else
{
this.projectProperties = Collections.emptyMap();
}
return this;
}
private Map<String, String> toMap( Properties properties )
{
if ( properties == null )
{
return Collections.emptyMap();
}
Map<String, String> map = new HashMap<String, String>();
Enumeration keys = properties.keys();
while ( keys.hasMoreElements() )
{
String key = (String) keys.nextElement();
map.put( key, properties.getProperty( key ) );
}
return map;
}
}

2
maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileInjector.java
View File

@ -71,7 +71,7 @@ public class DefaultProfileInjector
}
}
private static class ProfileModelMerger
protected static class ProfileModelMerger
extends MavenModelMerger
{

8
maven-model-builder/src/main/java/org/apache/maven/model/profile/DefaultProfileSelector.java
View File

@ -115,10 +115,10 @@ public class DefaultProfileSelector
}
catch ( RuntimeException e )
{
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE)
.setMessage( "Failed to determine activation for profile " + profile.getId())
.setLocation( profile.getLocation( "" ))
.setException( e ));
problems.add( new ModelProblemCollectorRequest( Severity.ERROR, Version.BASE )
.setMessage( "Failed to determine activation for profile " + profile.getId() )
.setLocation( profile.getLocation( "" ) )
.setException( e ) );
return false;
}
}

7
maven-model-builder/src/main/java/org/apache/maven/model/profile/ProfileActivationContext.java
View File

@ -69,4 +69,11 @@ public interface ProfileActivationContext
*/
File getProjectDirectory();
/**
* Gets current calculated project properties
*
* @return The project properties, never {@code null}.
*/
Map<String, String> getProjectProperties();
}

2
maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/FileProfileActivator.java
View File

@ -118,6 +118,8 @@ public class FileProfileActivator
return false;
}
interpolator.addValueSource( new MapBasedValueSource( context.getProjectProperties() ) );
interpolator.addValueSource( new MapBasedValueSource( context.getUserProperties() ) );
interpolator.addValueSource( new MapBasedValueSource( context.getSystemProperties() ) );

Some files were not shown because too many files have changed in this diff Show More