You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2017/04/26 18:22:07 UTC
svn commit: r1792789 - in /maven/plugins/trunk/maven-ear-plugin/src:
main/java/org/apache/maven/plugins/ear/EarMojo.java
test/resources/projects/project-016/pom.xml
Author: khmarbaise
Date: Wed Apr 26 18:22:07 2017
New Revision: 1792789
URL: http://svn.apache.org/viewvc?rev=1792789&view=rev
Log:
[MEAR-228] Remove manifestFile parameter
o Removed manifestFile and fixed IT according to the
change to use archive configuration instead.
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/pom.xml
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarMojo.java?rev=1792789&r1=1792788&r2=1792789&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugins/ear/EarMojo.java Wed Apr 26 18:22:07 2017
@@ -146,13 +146,6 @@ public class EarMojo
private boolean skipClassPathModification;
/**
- * The location of the manifest file to be used within the EAR file. If no value if specified, the default location
- * in the workDirectory is taken. If the file does not exist, a manifest will be generated automatically.
- */
- @Parameter
- private File manifestFile;
-
- /**
* The location of a custom application.xml file to be used within the EAR file.
*/
@Parameter
@@ -379,9 +372,6 @@ public class EarMojo
archiver.setArchiver( theJarArchiver );
archiver.setOutputFile( earFile );
- // Include custom manifest if necessary
- includeCustomManifestFile();
-
getLog().debug( "Excluding " + Arrays.asList( getPackagingExcludes() ) + " from the generated EAR." );
getLog().debug( "Including " + Arrays.asList( getPackagingIncludes() ) + " in the generated EAR." );
@@ -602,24 +592,6 @@ public class EarMojo
return new File( buildDir, uri );
}
- private void includeCustomManifestFile()
- {
- if ( manifestFile == null )
- {
- manifestFile = new File( getWorkDirectory(), "META-INF/MANIFEST.MF" );
- }
-
- if ( !manifestFile.exists() )
- {
- getLog().info( "Could not find manifest file: " + manifestFile + " - Generating one" );
- }
- else
- {
- getLog().info( "Including custom manifest file [" + manifestFile + "]" );
- archive.setManifestFile( manifestFile );
- }
- }
-
/**
* Returns the EAR file to generate, based on an optional classifier.
*
Modified: maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/pom.xml?rev=1792789&r1=1792788&r2=1792789&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/pom.xml (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/test/resources/projects/project-016/pom.xml Wed Apr 26 18:22:07 2017
@@ -41,7 +41,9 @@ under the License.
<artifactId>maven-ear-plugin</artifactId>
<version>@project.version@</version>
<configuration>
- <manifestFile>src/main/ear/MANIFEST.MF</manifestFile>
+ <archive>
+ <manifestFile>src/main/ear/MANIFEST.MF</manifestFile>
+ </archive>
<version>1.3</version>
</configuration>
</plugin>