Author: maartenc
Date: Sun Aug 19 22:16:55 2012
New Revision: 1374871
URL: http://svn.apache.org/viewvc?rev=1374871&view=rev
Log:
FIX: Maven 'hk2-jar' packaging is now supported (IVY-1357)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=1374871&r1=1374870&r2=1374871&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Sun Aug 19 22:16:55 2012
@@ -130,6 +130,7 @@ for detailed view of each issue, please
trunk
=====================================
+- FIX: Maven 'hk2-jar' packaging is now supported (IVY-1357)
- FIX: Maven 'orbit' and 'pear' packaging is now supported (IVY-899)
- FIX: Memory leak and infinite loop in ModuleId.java (IVY-1362)
- FIX: Unnecessary warning when parent ivy.xml is not found (IVY-1346)
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java?rev=1374871&r1=1374870&r2=1374871&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
Sun Aug 19 22:16:55 2012
@@ -116,7 +116,7 @@ public class PomModuleDescriptorBuilder
private static final String EXTRA_INFO_DELIMITER = "__";
private static final Collection/*<String>*/ JAR_PACKAGINGS = Arrays.asList(
new String[] {"ejb", "bundle", "maven-plugin",
"eclipse-plugin",
- "jbi-component", "jbi-shared-library", "orbit"});
+ "jbi-component", "jbi-shared-library", "orbit",
"hk2-jar"});
static interface ConfMapper {
