You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/11/16 16:20:34 UTC
svn commit: r1542525 - in /maven/plugins/trunk/maven-ear-plugin/src:
it/same-artifactId/ it/same-artifactId/app/ it/same-artifactId/business/
it/same-artifactId/business/service/ it/same-artifactId/business/service/src/
it/same-artifactId/business/serv...
Author: rfscholte
Date: Sat Nov 16 15:20:33 2013
New Revision: 1542525
URL: http://svn.apache.org/r1542525
Log:
[MEAR-167] Classes from different modules with the same artifactId are merged when skinnyWars set to TRUE
Added:
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/app/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/app/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/com/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/com/example/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/com/example/B.java
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/com/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/com/example/ (with props)
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/com/example/A.java
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/pom.xml
maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/verify.groovy
Modified:
maven/plugins/trunk/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/EarMojo.java
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/app/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/app/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/app/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/app/pom.xml?rev=1542525&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/app/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/app/pom.xml Sat Nov 16 15:20:33 2013
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>root</artifactId>
+ <groupId>main</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>app</artifactId>
+ <packaging>ear</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>@project.version@</version>
+ <configuration>
+ <skinnyWars>true</skinnyWars>
+ <modules>
+ <ejbModule>
+ <groupId>main.root.ejb</groupId>
+ <artifactId>service</artifactId>
+ <uri>service1.jar</uri>
+ </ejbModule>
+ <ejbModule>
+ <groupId>main.root.business</groupId>
+ <artifactId>service</artifactId>
+ <uri>service2.jar</uri>
+ </ejbModule>
+ </modules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>main.root.ejb</groupId>
+ <artifactId>service</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>main.root.business</groupId>
+ <artifactId>service</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/pom.xml?rev=1542525&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/pom.xml Sat Nov 16 15:20:33 2013
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>root</artifactId>
+ <groupId>main</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>main.root</groupId>
+ <artifactId>business</artifactId>
+ <packaging>pom</packaging>
+ <modules>
+ <module>service</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/pom.xml?rev=1542525&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/pom.xml Sat Nov 16 15:20:33 2013
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>business</artifactId>
+ <groupId>main.root</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>main.root.business</groupId>
+ <artifactId>service</artifactId>
+
+</project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/com/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/com/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/com/example/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/com/example/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/com/example/B.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/com/example/B.java?rev=1542525&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/com/example/B.java (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/business/service/src/main/java/com/example/B.java Sat Nov 16 15:20:33 2013
@@ -0,0 +1,29 @@
+package com.example;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class B {
+
+ public void doSmth() { }
+
+}
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/pom.xml?rev=1542525&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/pom.xml Sat Nov 16 15:20:33 2013
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>root</artifactId>
+ <groupId>main</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>main.root</groupId>
+ <artifactId>ejb</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>service</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/pom.xml?rev=1542525&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/pom.xml Sat Nov 16 15:20:33 2013
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>ejb</artifactId>
+ <groupId>main.root</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>main.root.ejb</groupId>
+ <artifactId>service</artifactId>
+
+</project>
\ No newline at end of file
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/com/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/com/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/com/example/
------------------------------------------------------------------------------
--- bugtraq:logregex (added)
+++ bugtraq:logregex Sat Nov 16 15:20:33 2013
@@ -0,0 +1 @@
+MEAR-\d+
Propchange: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/com/example/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/com/example/A.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/com/example/A.java?rev=1542525&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/com/example/A.java (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/ejb/service/src/main/java/com/example/A.java Sat Nov 16 15:20:33 2013
@@ -0,0 +1,29 @@
+package com.example;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class A {
+
+ public void doSomething() { }
+
+}
Added: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/pom.xml?rev=1542525&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/pom.xml (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/pom.xml Sat Nov 16 15:20:33 2013
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>main</groupId>
+ <artifactId>root</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>app</module>
+ <module>ejb</module>
+ <module>business</module>
+ </modules>
+
+</project>
\ No newline at end of file
Added: maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/verify.groovy?rev=1542525&view=auto
==============================================================================
--- maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/verify.groovy (added)
+++ maven/plugins/trunk/maven-ear-plugin/src/it/same-artifactId/verify.groovy Sat Nov 16 15:20:33 2013
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ def service1 = new File( basedir, "app/target/app-1.0-SNAPSHOT/service1.jar" ).toURL().toString();
+ assert new URL( "jar:${service1}!/com/example/A.class" ).content != null
+ try
+ {
+ new URL( "jar:${service1}!/com/example/B.class" ).content
+ assert false : "service1.jar should not contain com.example.B.class"
+ }
+ catch( FileNotFoundException e)
+ {
+ }
+
+ def service2 = new File( basedir, "app/target/app-1.0-SNAPSHOT/service2.jar" ).toURL().toString();
+ assert new URL( "jar:${service2}!/com/example/B.class").content != null
+ try
+ {
+ new URL( "jar:${service2}!/com/example/A.class").content
+ assert false : "service2.jar should not contain com.example.A.class"
+ }
+ catch( FileNotFoundException e)
+ {
+ }
+
\ No newline at end of file
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=1542525&r1=1542524&r2=1542525&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 Sat Nov 16 15:20:33 2013
@@ -658,8 +658,9 @@ public class EarMojo
if ( original.isFile() )
{
// Create a temporary work directory
+ // MEAR-167 use uri as directory to prevent merging of artifacts with the same name
workDirectory =
- new File( new File( generatedDescriptorLocation, "temp" ), module.getArtifact().getArtifactId() );
+ new File( new File( generatedDescriptorLocation, "temp" ), module.getUri() );
workDirectory.mkdirs();
getLog().debug( "Created a temporary work directory: " + workDirectory.getAbsolutePath() );
@@ -667,6 +668,7 @@ public class EarMojo
zipUnArchiver.setSourceFile( original );
zipUnArchiver.setDestDirectory( workDirectory );
zipUnArchiver.extract();
+
}
else
{