svn commit: r1528936 - in /ant/ivy/core/trunk: CHANGES.txt META-INF/MANIFEST.MF

[hi...@apache.org]

Author: hibou
Date: Thu Oct  3 16:59:02 2013
New Revision: 1528936

URL: http://svn.apache.org/r1528936
Log:
IVY-1441: In IvyDE, Ivy fails to parse ivy-settings.xml file if it contains <pgp> element (thanks to Gregory Amerson)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/META-INF/MANIFEST.MF

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=1528936&r1=1528935&r2=1528936&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Thu Oct  3 16:59:02 2013
@@ -151,6 +151,7 @@ for detailed view of each issue, please 
 - 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)

Modified: ant/ivy/core/trunk/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/META-INF/MANIFEST.MF?rev=1528936&r1=1528935&r2=1528936&view=diff
==============================================================================
--- ant/ivy/core/trunk/META-INF/MANIFEST.MF (original)
+++ ant/ivy/core/trunk/META-INF/MANIFEST.MF Thu Oct  3 16:59:02 2013
@@ -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;resoluti
  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;resoluti
  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