You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ma...@apache.org on 2012/08/20 00:20:12 UTC
svn commit: r1374872 - in /ant/ivy/core/branches/2.3.x: ./ CHANGES.txt
src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
Author: maartenc
Date: Sun Aug 19 22:20:12 2012
New Revision: 1374872
URL: http://svn.apache.org/viewvc?rev=1374872&view=rev
Log:
FIX: Maven 'hk2-jar' packaging is now supported (IVY-1357) (merged from trunk)
Modified:
ant/ivy/core/branches/2.3.x/ (props changed)
ant/ivy/core/branches/2.3.x/CHANGES.txt
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
Propchange: ant/ivy/core/branches/2.3.x/
------------------------------------------------------------------------------
Merged /ant/ivy/core/trunk:r1374871
Modified: ant/ivy/core/branches/2.3.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/CHANGES.txt?rev=1374872&r1=1374871&r2=1374872&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.3.x/CHANGES.txt Sun Aug 19 22:20:12 2012
@@ -129,6 +129,7 @@ for detailed view of each issue, please
2.3.x
=====================================
+- 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: NullPointerExeption in AbstractOSGiResolver (IVY-1343) (thanks to Thomas Kurpick)
Modified: ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java?rev=1374872&r1=1374871&r2=1374872&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java (original)
+++ ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java Sun Aug 19 22:20:12 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 {