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 2015/11/09 22:48:44 UTC
svn commit: r1713552 - in /maven/plugins/trunk/maven-ear-plugin/src:
main/java/org/apache/maven/plugin/ear/ site/apt/
Author: khmarbaise
Date: Mon Nov 9 21:48:43 2015
New Revision: 1713552
URL: http://svn.apache.org/viewvc?rev=1713552&view=rev
Log:
[MEAR-207] Remove the JavaModule/Ejb3Module which are marked deprecated
Removed:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/Ejb3Module.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/JavaModule.java
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt.vm
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java?rev=1713552&r1=1713551&r2=1713552&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarModuleFactory.java Mon Nov 9 21:48:43 2015
@@ -45,7 +45,6 @@ public final class EarModuleFactory
List<String> temp = new ArrayList<String>();
temp.add( "jar" );
temp.add( "ejb" );
- temp.add( "ejb3" );
temp.add( "par" );
temp.add( "ejb-client" );
temp.add( "app-client" );
@@ -96,10 +95,6 @@ public final class EarModuleFactory
{
return new EjbModule( artifact );
}
- else if ( "ejb3".equals( artifactType ) )
- {
- return new Ejb3Module( artifact );
- }
else if ( "par".equals( artifactType ) )
{
return new ParModule( artifact );
Modified: maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java?rev=1713552&r1=1713551&r2=1713552&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java Mon Nov 9 21:48:43 2015
@@ -417,14 +417,6 @@ public class EarMojo
for ( EarModule module : getModules() )
{
- if ( module instanceof JavaModule )
- {
- getLog().warn( "JavaModule is deprecated (" + module + "), please use JarModule instead." );
- }
- if ( module instanceof Ejb3Module )
- {
- getLog().warn( "Ejb3Module is deprecated (" + module + "), please use EjbModule instead." );
- }
final File sourceFile = module.getArtifact().getFile();
final File destinationFile = buildDestinationFile( getWorkDirectory(), module.getUri() );
if ( !sourceFile.isFile() )
Modified: maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt.vm?rev=1713552&r1=1713551&r2=1713552&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt.vm (original)
+++ maven/plugins/trunk/maven-ear-plugin/src/site/apt/modules.apt.vm Mon Nov 9 21:48:43 2015
@@ -32,9 +32,7 @@ EAR Modules
* {{{ejbModule}ejbModule}}
- * {{{ejbModule}ejb3Module}} (deprecated. ejbModule provides the same functionality)
-
- * {{{jarModule}jarModule}} (previously know as javaModule and deprecated)
+ * {{{jarModule}jarModule}}
* {{{parModule}parModule}}