You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2014/10/26 20:01:23 UTC
svn commit: r1634380 - in /maven/shared/trunk/maven-archiver: ./
src/main/java/org/apache/maven/archiver/
src/test/java/org/apache/maven/archiver/
Author: michaelo
Date: Sun Oct 26 19:01:23 2014
New Revision: 1634380
URL: http://svn.apache.org/r1634380
Log:
[MSHARED-373] Upgrade Maven baseline to 2.2.1
- Added missing generics
- Worked out some TODOs
- Used some 2.1.1 methods
Modified:
maven/shared/trunk/maven-archiver/pom.xml
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiver.java
maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MockArtifact.java
Modified: maven/shared/trunk/maven-archiver/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/pom.xml?rev=1634380&r1=1634379&r2=1634380&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/pom.xml (original)
+++ maven/shared/trunk/maven-archiver/pom.xml Sun Oct 26 19:01:23 2014
@@ -54,7 +54,7 @@
</distributionManagement>
<properties>
- <mavenVersion>2.0.6</mavenVersion>
+ <mavenVersion>2.2.1</mavenVersion>
</properties>
<dependencies>
Modified: maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java?rev=1634380&r1=1634379&r2=1634380&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java (original)
+++ maven/shared/trunk/maven-archiver/src/main/java/org/apache/maven/archiver/MavenArchiveConfiguration.java Sun Oct 26 19:01:23 2014
@@ -139,12 +139,12 @@ public class MavenArchiveConfiguration
return manifestEntries.isEmpty();
}
- public Map<String,String> getManifestEntries()
+ public Map<String, String> getManifestEntries()
{
return manifestEntries;
}
- public void setManifestEntries( Map manifestEntries )
+ public void setManifestEntries( Map<String, String> manifestEntries )
{
this.manifestEntries = manifestEntries;
}
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=1634380&r1=1634379&r2=1634380&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 Sun Oct 26 19:01:23 2014
@@ -166,7 +166,6 @@ public class MavenArchiver
*
* @todo Add user attributes list and user groups list
*/
- @SuppressWarnings ({ "JavaDoc", "UnusedDeclaration" })
public Manifest getManifest( MavenProject project, ManifestConfiguration config )
throws ManifestException, DependencyResolutionRequiredException
{
@@ -473,7 +472,6 @@ public class MavenArchiver
}
}
- @SuppressWarnings ("UnusedDeclaration")
public JarArchiver getArchiver()
{
return archiver;
@@ -505,8 +503,16 @@ public class MavenArchiver
{
// we have to clone the project instance so we can write out the pom with the deployment version,
// without impacting the main project instance...
- // TODO use clone() in Maven 2.0.9+
- MavenProject workingProject = new MavenProject( project );
+ MavenProject workingProject = null;
+ try
+ {
+ workingProject = (MavenProject) project.clone();
+ }
+ catch (CloneNotSupportedException e)
+ {
+ // Should never happen
+ throw new ArchiverException( "Failed to clone Maven project", e );
+ }
boolean forced = archiveConfiguration.isForced();
if ( archiveConfiguration.isAddMavenDescriptor() )
@@ -592,7 +598,7 @@ public class MavenArchiver
archiver.createArchive();
}
- private void addCreatedByEntry( MavenSession session, Manifest m, Map entries )
+ private void addCreatedByEntry( MavenSession session, Manifest m, Map<String, String> entries )
throws ManifestException
{
String createdBy = "Apache Maven";
Modified: maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java?rev=1634380&r1=1634379&r2=1634380&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java (original)
+++ maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java Sun Oct 26 19:01:23 2014
@@ -57,7 +57,6 @@ import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-@SuppressWarnings( "ResultOfMethodCallIgnored" )
public class MavenArchiverTest
extends TestCase
{
@@ -182,7 +181,7 @@ public class MavenArchiverTest
MavenProject project = new MavenProject( model )
{
- public List getRuntimeClasspathElements()
+ public List<String> getRuntimeClasspathElements()
{
return Collections.singletonList( tempFile.getAbsolutePath() );
}
@@ -234,7 +233,7 @@ public class MavenArchiverTest
jarFile.setLastModified( System.currentTimeMillis() - 60000L );
long time = jarFile.lastModified();
- List files = FileUtils.getFiles( new File( "target/maven-archiver" ), "**/**", null, true );
+ List<File> files = FileUtils.getFiles( new File( "target/maven-archiver" ), "**/**", null, true );
for ( Object file : files )
{
File f = (File) file;
@@ -270,7 +269,7 @@ public class MavenArchiverTest
assertTrue( jarFile.exists() );
jar = new JarFile( jarFile );
- Map entries = jar.getManifest().getMainAttributes();
+ Map<Object, Object> entries = jar.getManifest().getMainAttributes();
assertFalse( entries.containsKey( Attributes.Name.IMPLEMENTATION_VERSION ) ); // "Implementation-Version"
}
finally
@@ -308,7 +307,7 @@ public class MavenArchiverTest
jar = new JarFile( jarFile );
- Map entries = jar.getManifest().getMainAttributes();
+ Map<Object, Object> entries = jar.getManifest().getMainAttributes();
assertTrue( entries.containsKey( Attributes.Name.IMPLEMENTATION_VERSION ) );
assertEquals( "0.1", entries.get( Attributes.Name.IMPLEMENTATION_VERSION ) );
@@ -439,7 +438,8 @@ public class MavenArchiverTest
config.getManifest().setAddDefaultSpecificationEntries( true );
//noinspection deprecation
- archiver.createArchive( project, config );
+ MavenSession session = getDummySessionWithoutMavenVersion();
+ archiver.createArchive( session, project, config );
assertTrue( jarFile.exists() );
Attributes manifest = getJarFileManifest( jarFile ).getMainAttributes();
@@ -539,7 +539,7 @@ public class MavenArchiverTest
assertTrue( jarFile.exists() );
final Manifest manifest = getJarFileManifest( jarFile );
- Map entries = manifest.getMainAttributes();
+ Map<Object, Object> entries = manifest.getMainAttributes();
assertEquals( "Apache Maven", entries.get( new Attributes.Name( "Created-By" ) ) );
}
@@ -574,7 +574,6 @@ public class MavenArchiverTest
assertEquals( "The value of the attribute is wrong.", "value", attribute );
}
- @SuppressWarnings( "ResultOfMethodCallIgnored" )
public void testDefaultClassPathValue()
throws Exception
{
@@ -602,14 +601,12 @@ public class MavenArchiverTest
assertEquals( "dummy3-2.0.jar", classPathEntries[2] );
}
- @SuppressWarnings( "ResultOfMethodCallIgnored" )
private void deleteAndAssertNotPresent( File jarFile )
{
jarFile.delete();
assertFalse( jarFile.exists() );
}
- @SuppressWarnings( "ResultOfMethodCallIgnored" )
public void testDefaultClassPathValue_WithSnapshot()
throws Exception
{
@@ -849,6 +846,7 @@ public class MavenArchiverTest
artifact.setGroupId( "org.apache.dummy" );
artifact.setArtifactId( "dummy" );
artifact.setVersion( "0.1" );
+ artifact.setBaseVersion( "0.1" );
artifact.setType( "jar" );
artifact.setArtifactHandler( new DefaultArtifactHandler( "jar" ) );
project.setArtifact( artifact );
@@ -907,6 +905,7 @@ public class MavenArchiverTest
artifact.setGroupId( "org.apache.dummy" );
artifact.setArtifactId( "dummy" );
artifact.setVersion( "0.1" );
+ artifact.setBaseVersion( "0.1" );
artifact.setType( "jar" );
artifact.setArtifactHandler( new DefaultArtifactHandler( "jar" ) );
project.setArtifact( artifact );
@@ -1042,7 +1041,7 @@ public class MavenArchiverTest
ArtifactRepository localRepo = null;
EventDispatcher eventDispatcher = null;
ReactorManager reactorManager = null;
- List goals = null;
+ List<?> goals = null;
String executionRootDir = null;
Date startTime = new Date();
Modified: maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MockArtifact.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MockArtifact.java?rev=1634380&r1=1634379&r2=1634380&view=diff
==============================================================================
--- maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MockArtifact.java (original)
+++ maven/shared/trunk/maven-archiver/src/test/java/org/apache/maven/archiver/MockArtifact.java Sun Oct 26 19:01:23 2014
@@ -53,7 +53,7 @@ class MockArtifact
private String classifier;
private String baseVersion;
-
+
private ArtifactHandler artifactHandler;
private boolean snapshot;
@@ -77,7 +77,7 @@ class MockArtifact
{
this.version = string;
}
-
+
public void setSnapshotVersion( String snapshotVersion, String baseVersion )
{
snapshot = true;
@@ -142,7 +142,13 @@ class MockArtifact
// TODO
}
- public Collection getMetadataList()
+ public ArtifactMetadata getMetadata( Class<?> metadataClass )
+ {
+ // TODO
+ return null;
+ }
+
+ public Collection<ArtifactMetadata> getMetadataList()
{
// TODO
return null; //To change body of implemented methods use File | Settings | File Templates.
@@ -195,13 +201,13 @@ class MockArtifact
return artifactHandler;
}
- public List getDependencyTrail()
+ public List<String> getDependencyTrail()
{
// TODO
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- public void setDependencyTrail( List list )
+ public void setDependencyTrail( List<String> list )
{
//To change body of implemented methods use File | Settings | File Templates.
// TODO
@@ -264,13 +270,13 @@ class MockArtifact
//To change body of implemented methods use File | Settings | File Templates.
}
- public List getAvailableVersions()
+ public List<ArtifactVersion> getAvailableVersions()
{
// TODO
return null; //To change body of implemented methods use File | Settings | File Templates.
}
- public void setAvailableVersions( List list )
+ public void setAvailableVersions( List<ArtifactVersion> list )
{
// TODO
//To change body of implemented methods use File | Settings | File Templates.
@@ -327,7 +333,7 @@ class MockArtifact
this.scope = string;
}
- public int compareTo( Object o )
+ public int compareTo( Artifact o )
{
// TODO
return 0; //To change body of implemented methods use File | Settings | File Templates.