svn commit: r1641409 - in /maven/plugins/trunk/maven-ejb-plugin: pom.xml src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBasicStub.java

[khmarbaise]

Author: khmarbaise
Date: Mon Nov 24 15:20:24 2014
New Revision: 1641409

URL: http://svn.apache.org/r1641409
Log:
[MEJB-77] Upgrade maven-archiver to 2.6
 - In accordance with the unit tests i have to fix the
   Stub implementation of MavenProjectBasicStub otherwise
   the tests will fail.

Modified:
    maven/plugins/trunk/maven-ejb-plugin/pom.xml
    
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBasicStub.java

Modified: maven/plugins/trunk/maven-ejb-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/pom.xml?rev=1641409&r1=1641408&r2=1641409&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ejb-plugin/pom.xml Mon Nov 24 15:20:24 2014
@@ -60,7 +60,7 @@ under the License.
   </distributionManagement>
 
   <properties>
-    <mavenArchiverVersion>2.5</mavenArchiverVersion>
+    <mavenArchiverVersion>2.6</mavenArchiverVersion>
     <mavenFilteringVersion>1.3</mavenFilteringVersion>
     <mavenVersion>2.2.1</mavenVersion>
   </properties>

Modified: 
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBasicStub.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBasicStub.java?rev=1641409&r1=1641408&r2=1641409&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBasicStub.java
 (original)
+++ 
maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugin/ejb/stub/MavenProjectBasicStub.java
 Mon Nov 24 15:20:24 2014
@@ -117,12 +117,17 @@ public class MavenProjectBasicStub
 
     public String getGroupId()
     {
-        return "org.apache.maven.plugin.test";
+        String groupId = getModel().getGroupId();
+        if ( ( groupId == null ) && ( getModel().getParent() != null ) )
+        {
+            groupId = getModel().getParent().getGroupId();
+        }
+        return groupId;
     }
 
     public String getArtifactId()
     {
-        return "maven-resource-plugin-test#" + identifier;
+        return getModel().getArtifactId();
     }
 
     public String getPackaging()