You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/03/17 21:03:14 UTC
ant-ivy git commit: Bad merge…
Repository: ant-ivy
Updated Branches:
refs/heads/master bc290628c -> 70d8de7ba
Bad merge…
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/70d8de7b
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/70d8de7b
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/70d8de7b
Branch: refs/heads/master
Commit: 70d8de7ba4d82013b0178c871f414693f3debb56
Parents: bc29062
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sat Mar 17 22:03:01 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sat Mar 17 22:03:01 2018 +0100
----------------------------------------------------------------------
src/java/org/apache/ivy/util/XMLHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/70d8de7b/src/java/org/apache/ivy/util/XMLHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/XMLHelper.java b/src/java/org/apache/ivy/util/XMLHelper.java
index f733ad8..6284123 100644
--- a/src/java/org/apache/ivy/util/XMLHelper.java
+++ b/src/java/org/apache/ivy/util/XMLHelper.java
@@ -116,8 +116,8 @@ public abstract class XMLHelper {
parse(xmlURL, schema, handler, null);
}
- public static void parse(URL xmlURL, URL schema, DefaultHandler handler, LexicalHandler lHandler)
@SuppressWarnings("deprecation")
+ public static void parse(URL xmlURL, URL schema, DefaultHandler handler, LexicalHandler lHandler)
throws SAXException, IOException, ParserConfigurationException {
InputStream xmlStream = URLHandlerRegistry.getDefault().openStream(xmlURL);
try {