Author: hboutemy
Date: Thu Oct 30 07:37:49 2014
New Revision: 1635416
URL: http://svn.apache.org/r1635416
Log:
upgraded parent pom
Modified:
maven/shared/trunk/maven-archiver/pom.xml
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
Modified: maven/shared/trunk/maven-archiver/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/pom.xml?rev=1635416&r1=1635415&r2=1635416&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/pom.xml (original)
+++ maven/shared/trunk/maven-archiver/pom.xml Thu Oct 30 07:37:49 2014
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-components</artifactId>
- <version>20</version>
+ <version>21</version>
<relativePath>../maven-shared-components/pom.xml</relativePath>
</parent>
Modified:
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java?rev=1635416&r1=1635415&r2=1635416&view=diff
==============================================================================
---
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
(original)
+++
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
Thu Oct 30 07:37:49 2014
@@ -300,34 +300,30 @@ public class MavenArchiver
else
{
List<ValueSource> valueSources = new
ArrayList<ValueSource>();
- valueSources.add( new PrefixedObjectValueSource(
ARTIFACT_EXPRESSION_PREFIXES, artifact, true ) );
- valueSources.add( new PrefixedObjectValueSource(
-
ARTIFACT_EXPRESSION_PREFIXES,
-
artifact == null ? null
-
: artifact.getArtifactHandler(),
+
+ valueSources.add( new PrefixedObjectValueSource(
ARTIFACT_EXPRESSION_PREFIXES, artifact,
true
) );
+ valueSources.add( new PrefixedObjectValueSource(
ARTIFACT_EXPRESSION_PREFIXES,
+
artifact.getArtifactHandler(), true ) );
Properties extraExpressions = new Properties();
- if ( artifact != null )
+ // FIXME: This query method SHOULD NOT affect the
internal
+ // state of the artifact version, but it does.
+ if ( !artifact.isSnapshot() )
{
- // FIXME: This query method SHOULD NOT affect the
internal
- // state of the artifact version, but it does.
- if ( !artifact.isSnapshot() )
- {
- extraExpressions.setProperty( "baseVersion",
artifact.getVersion() );
- }
+ extraExpressions.setProperty( "baseVersion",
artifact.getVersion() );
+ }
- extraExpressions.setProperty( "groupIdPath",
artifact.getGroupId().replace( '.', '/' ) );
- if ( StringUtils.isNotEmpty(
artifact.getClassifier() ) )
- {
- extraExpressions.setProperty(
"dashClassifier", "-" + artifact.getClassifier() );
- extraExpressions.setProperty(
"dashClassifier?", "-" + artifact.getClassifier() );
- }
- else
- {
- extraExpressions.setProperty(
"dashClassifier", "" );
- extraExpressions.setProperty(
"dashClassifier?", "" );
- }
+ extraExpressions.setProperty( "groupIdPath",
artifact.getGroupId().replace( '.', '/' ) );
+ if ( StringUtils.isNotEmpty( artifact.getClassifier()
) )
+ {
+ extraExpressions.setProperty( "dashClassifier",
"-" + artifact.getClassifier() );
+ extraExpressions.setProperty( "dashClassifier?",
"-" + artifact.getClassifier() );
+ }
+ else
+ {
+ extraExpressions.setProperty( "dashClassifier", ""
);
+ extraExpressions.setProperty( "dashClassifier?",
"" );
}
valueSources.add( new PrefixedPropertiesValueSource(
ARTIFACT_EXPRESSION_PREFIXES,
extraExpressions, true ) );
@@ -360,7 +356,8 @@ public class MavenArchiver
// here we must find the Artifact in the
project Artifacts to generate the maven layout
if ( config.isUseUniqueVersions() )
{
- classpath.append(
interpolator.interpolate( REPOSITORY_LAYOUT, recursionInterceptor ) );
+ classpath.append(
interpolator.interpolate( REPOSITORY_LAYOUT,
+
recursionInterceptor ) );
}
else
{
@@ -372,9 +369,9 @@ public class MavenArchiver
{
if ( layout == null )
{
- throw new ManifestException(
-
ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM
- + "
layout type was declared, but custom layout expression was not specified. Check
your <archive><manifest><customLayout/> element." );
+ throw new ManifestException(
ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM
+ + " layout type was declared, but
custom layout expression was not"
+ + " specified. Check your
<archive><manifest><customLayout/> element." );
}
classpath.append( interpolator.interpolate(
layout, recursionInterceptor ) );
