[MSHARED-512] Remove @Deprecated marked code which has been missed.
o Removed classpathMavenRepositoryLayout can be replaced by
using calling setClasspathLayoutType and using the appropriate
expression. See setCustomClasspathLayout().
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk/maven-archiver@1738433 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java b/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java
index 8236c68..45984f8 100644
--- a/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java
+++ b/src/main/java/org/apache/maven/archiver/ManifestConfiguration.java
@@ -70,15 +70,6 @@
*/
private boolean addDefaultImplementationEntries;
- /**
- * The created Class-Path entry will contains paths that follow the Maven 2 repository layout:
- * $groupId[0]/../${groupId[n]/$artifactId/$version/{fileName}
- *
- * @since 2.3
- * @deprecated Use {@link ManifestConfiguration#classpathLayoutType} instead.
- */
- private boolean classpathMavenRepositoryLayout = false;
-
private String classpathLayoutType = CLASSPATH_LAYOUT_TYPE_SIMPLE;
private String customClasspathLayout;
@@ -134,17 +125,6 @@
}
/**
- * @deprecated Use {@link ManifestConfiguration#getClasspathLayoutType()}, and compare to
- * CLASSPATH_LAYOUT_TYPE_SIMPLE or CLASSPATH_LAYOUT_TYPE_REPOSITORY, also declared in
- * {@link ManifestConfiguration}.
- * @return The state of classpath Maven repository layout.
- */
- public boolean isClasspathMavenRepositoryLayout()
- {
- return classpathMavenRepositoryLayout;
- }
-
- /**
* @param addClasspath turn on addClasspath or off.
*/
public void setAddClasspath( boolean addClasspath )
@@ -177,17 +157,6 @@
}
/**
- * @deprecated Use {@link ManifestConfiguration#setClasspathLayoutType(String)}, and use
- * CLASSPATH_LAYOUT_TYPE_SIMPLE, CLASSPATH_LAYOUT_TYPE_CUSTOM, or CLASSPATH_LAYOUT_TYPE_REPOSITORY, also
- * declared in {@link ManifestConfiguration}.
- * @param classpathMavenRepositoryLayout true/false classpath maven repository
- */
- public void setClasspathMavenRepositoryLayout( boolean classpathMavenRepositoryLayout )
- {
- this.classpathMavenRepositoryLayout = classpathMavenRepositoryLayout;
- }
-
- /**
* @param classpathPrefix The prefix.
*/
public void setClasspathPrefix( String classpathPrefix )
@@ -238,7 +207,7 @@
public String getClasspathLayoutType()
{
// CHECKSTYLE_OFF: LineLength
- return CLASSPATH_LAYOUT_TYPE_SIMPLE.equals( classpathLayoutType ) && classpathMavenRepositoryLayout ? CLASSPATH_LAYOUT_TYPE_REPOSITORY
+ return CLASSPATH_LAYOUT_TYPE_SIMPLE.equals( classpathLayoutType ) ? CLASSPATH_LAYOUT_TYPE_REPOSITORY
: classpathLayoutType;
// CHECKSTYLE_ON: LineLength
}
@@ -284,6 +253,14 @@
* </ol>
* <br>
* <b>NOTE:</b> If you specify a layout type of 'custom' you MUST set this layout expression.
+ * You can take a look at
+ * <ol>
+ * <li>{@link MavenArchiver#SIMPLE_LAYOUT}</li>
+ * <li>{@link MavenArchiver#SIMPLE_LAYOUT_NONUNIQUE}</li>
+ * <li>{@link MavenArchiver#REPOSITORY_LAYOUT}</li>
+ * <li>{@link MavenArchiver#REPOSITORY_LAYOUT_NONUNIQUE}</li>
+ * </ol>
+ * how such an expression looks like.
* @param customClasspathLayout The custom classpath layout.
*/
public void setCustomClasspathLayout( String customClasspathLayout )
diff --git a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
index 223a269..db7e4f2 100644
--- a/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
+++ b/src/test/java/org/apache/maven/archiver/MavenArchiverTest.java
@@ -598,6 +598,8 @@
config.getManifest().setAddDefaultSpecificationEntries( true );
config.getManifest().setMainClass( "org.apache.maven.Foo" );
config.getManifest().setAddClasspath( true );
+ config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM );
+ config.getManifest().setCustomClasspathLayout( "${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}" );
archiver.createArchive( session, project, config );
assertTrue( jarFile.exists() );
final Manifest manifest = getJarFileManifest( jarFile );
@@ -631,6 +633,8 @@
config.getManifest().setAddDefaultSpecificationEntries( true );
config.getManifest().setMainClass( "org.apache.maven.Foo" );
config.getManifest().setAddClasspath( true );
+ config.getManifest().setClasspathLayoutType( ManifestConfiguration.CLASSPATH_LAYOUT_TYPE_CUSTOM );
+ config.getManifest().setCustomClasspathLayout( "${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}" );
archiver.createArchive( session, project, config );
assertTrue( jarFile.exists() );
