natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IVY-1441: In IvyDE, Ivy fails to parse ivy-settings.xml file if it contains <pgp> element (thanks to Gregory Amerson) 

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1528936 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nicolas Lalevee 2013-10-03 16:59:02 +00:00
parent e1fc87d2d5
commit d7b7c8a845
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -151,6 +151,7 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
- IMPROVEMENT: add support for source bundles from p2 repositories
- IMPROVEMENT: add support for source URI from OBR repositories
- FIX: In IvyDE, Ivy fails to parse ivy-settings.xml file if it contains <pgp> element (thanks to Gregory Amerson) (IVY-1441)
- FIX: ParseException when "Bundle-Description" is present in OSGI MANIFEST.MF (IVY-1438)
- FIX: NIO FileLocker released locks too early (IVY-1424) (thanks to Charles Duffy)
- FIX: Ssh Resolver doesn't work with Java 7 (IVY-1408) (thanks to Mykhailo Delegan)

8
META-INF/MANIFEST.MF
View File

@ -7,7 +7,7 @@ Bundle-SymbolicName: org.apache.ivy
Bundle-Vendor: Apache Software Foundation
Bundle-DocURL: http://ant.apache.org/ivy/
Import-Package: com.jcraft.jsch;resolution:=optional,
javax.crypto,
javax.crypto;resolution:=optional,
javax.swing;resolution:=optional,
javax.swing.event;resolution:=optional,
javax.xml.parsers,
@ -15,6 +15,7 @@ Import-Package: com.jcraft.jsch;resolution:=optional,
javax.xml.transform.sax,
javax.xml.transform.stream,
org.apache.commons.httpclient;resolution:=optional,
org.apache.commons.httpclient.auth;resolution:=optional,
org.apache.commons.httpclient.methods;resolution:=optional,
org.apache.commons.httpclient.params;resolution:=optional,
org.apache.commons.httpclient.protocol;resolution:=optional,
@ -32,8 +33,13 @@ Import-Package: com.jcraft.jsch;resolution:=optional,
org.apache.tools.ant.filters;resolution:=optional,
org.apache.tools.ant.taskdefs;resolution:=optional,
org.apache.tools.ant.types;resolution:=optional,
org.apache.tools.ant.types.resources;resolution:=optional,
org.apache.tools.ant.util;resolution:=optional,
org.apache.webdav;resolution:=optional,
org.bouncycastle.bcpg;resolution:=optional,
org.bouncycastle.jce.provider;resolution:=optional,
org.bouncycastle.openpgp;resolution:=optional,
org.w3c.dom;resolution:=optional,
org.xml.sax,
org.xml.sax.ext,
org.xml.sax.helpers