This is an automated email from the git hooks/post-receive script. faux-guest pushed a commit to branch master in repository libnanoxml2-java.
commit 4638f355a554711ffc9fc58548c5ee9466b984e2 Author: Chris West (Faux) <[email protected]> Date: Fri Sep 8 13:23:44 2017 +0100 update -source for java 9 Actual build fails due to bnd(1) problem on my builder, but I believe that to be unrelated to this package. --- debian/changelog | 8 + debian/patches/01-fix-java9-build.patch | 250 ++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 4 +- 4 files changed, 261 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e1228f9..d98be71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +libnanoxml2-java (2.2.3.dfsg-6) UNRELEASED; urgency=medium + + * Update to -source 1.8 to allow build with Java 9: + - change -source arguments + - rename all the "enum" variables to "enu" + + -- Chris West (Faux) <[email protected]> Fri, 08 Sep 2017 13:16:03 +0100 + libnanoxml2-java (2.2.3.dfsg-5) unstable; urgency=medium * Team upload diff --git a/debian/patches/01-fix-java9-build.patch b/debian/patches/01-fix-java9-build.patch new file mode 100644 index 0000000..b9bfcc4 --- /dev/null +++ b/debian/patches/01-fix-java9-build.patch @@ -0,0 +1,250 @@ +--- a/Sources/Lite/nanoxml/XMLElement.java ++++ b/Sources/Lite/nanoxml/XMLElement.java +@@ -478,9 +478,9 @@ + this.children = new Vector(); + this.entities = entities; + this.lineNr = 0; +- Enumeration enum = this.entities.keys(); +- while (enum.hasMoreElements()) { +- Object key = enum.nextElement(); ++ Enumeration enu = this.entities.keys(); ++ while (enu.hasMoreElements()) { ++ Object key = enu.nextElement(); + Object value = this.entities.get(key); + if (value instanceof String) { + value = ((String) value).toCharArray(); +@@ -2168,10 +2168,10 @@ + writer.write('<'); + writer.write(this.name); + if (! this.attributes.isEmpty()) { +- Enumeration enum = this.attributes.keys(); +- while (enum.hasMoreElements()) { ++ Enumeration enu = this.attributes.keys(); ++ while (enu.hasMoreElements()) { + writer.write(' '); +- String key = (String) enum.nextElement(); ++ String key = (String) enu.nextElement(); + String value = (String) this.attributes.get(key); + writer.write(key); + writer.write('='); writer.write('"'); +@@ -2189,9 +2189,9 @@ + writer.write('/'); writer.write('>'); + } else { + writer.write('>'); +- Enumeration enum = this.enumerateChildren(); +- while (enum.hasMoreElements()) { +- XMLElement child = (XMLElement) enum.nextElement(); ++ Enumeration enu = this.enumerateChildren(); ++ while (enu.hasMoreElements()) { ++ XMLElement child = (XMLElement) enu.nextElement(); + child.write(writer); + } + writer.write('<'); writer.write('/'); +--- a/Sources/Java/net/n3/nanoxml/NonValidator.java ++++ b/Sources/Java/net/n3/nanoxml/NonValidator.java +@@ -587,10 +587,10 @@ + int lineNr) + { + Properties props = (Properties) this.currentElements.pop(); +- Enumeration enum = props.keys(); ++ Enumeration enu = props.keys(); + +- while (enum.hasMoreElements()) { +- String key = (String) enum.nextElement(); ++ while (enu.hasMoreElements()) { ++ String key = (String) enu.nextElement(); + extraAttributes.put(key, props.get(key)); + } + } +--- a/Sources/Java/net/n3/nanoxml/XMLElement.java ++++ b/Sources/Java/net/n3/nanoxml/XMLElement.java +@@ -484,9 +484,9 @@ + * @return the child element, or null if no such child was found. + */ + public IXMLElement getFirstChildNamed(String name) { +- Enumeration enum = this.children.elements(); +- while (enum.hasMoreElements()) { +- IXMLElement child = (IXMLElement) enum.nextElement(); ++ Enumeration enu = this.children.elements(); ++ while (enu.hasMoreElements()) { ++ IXMLElement child = (IXMLElement) enu.nextElement(); + String childName = child.getFullName(); + if ((childName != null) && childName.equals(name)) { + return child; +@@ -506,9 +506,9 @@ + */ + public IXMLElement getFirstChildNamed(String name, + String namespace) { +- Enumeration enum = this.children.elements(); +- while (enum.hasMoreElements()) { +- IXMLElement child = (IXMLElement) enum.nextElement(); ++ Enumeration enu = this.children.elements(); ++ while (enu.hasMoreElements()) { ++ IXMLElement child = (IXMLElement) enu.nextElement(); + String str = child.getName(); + boolean found = (str != null) && (str.equals(name)); + str = child.getNamespace(); +@@ -534,9 +534,9 @@ + */ + public Vector getChildrenNamed(String name) { + Vector result = new Vector(this.children.size()); +- Enumeration enum = this.children.elements(); +- while (enum.hasMoreElements()) { +- IXMLElement child = (IXMLElement) enum.nextElement(); ++ Enumeration enu = this.children.elements(); ++ while (enu.hasMoreElements()) { ++ IXMLElement child = (IXMLElement) enu.nextElement(); + String childName = child.getFullName(); + if ((childName != null) && childName.equals(name)) { + result.addElement(child); +@@ -557,9 +557,9 @@ + public Vector getChildrenNamed(String name, + String namespace) { + Vector result = new Vector(this.children.size()); +- Enumeration enum = this.children.elements(); +- while (enum.hasMoreElements()) { +- IXMLElement child = (IXMLElement) enum.nextElement(); ++ Enumeration enu = this.children.elements(); ++ while (enu.hasMoreElements()) { ++ IXMLElement child = (IXMLElement) enu.nextElement(); + String str = child.getName(); + boolean found = (str != null) && (str.equals(name)); + str = child.getNamespace(); +@@ -585,9 +585,9 @@ + * @return the attribute, or null if the attribute does not exist. + */ + private XMLAttribute findAttribute(String fullName) { +- Enumeration enum = this.attributes.elements(); +- while (enum.hasMoreElements()) { +- XMLAttribute attr = (XMLAttribute) enum.nextElement(); ++ Enumeration enu = this.attributes.elements(); ++ while (enu.hasMoreElements()) { ++ XMLAttribute attr = (XMLAttribute) enu.nextElement(); + if (attr.getFullName().equals(fullName)) { + return attr; + } +@@ -606,9 +606,9 @@ + */ + private XMLAttribute findAttribute(String name, + String namespace) { +- Enumeration enum = this.attributes.elements(); +- while (enum.hasMoreElements()) { +- XMLAttribute attr = (XMLAttribute) enum.nextElement(); ++ Enumeration enu = this.attributes.elements(); ++ while (enu.hasMoreElements()) { ++ XMLAttribute attr = (XMLAttribute) enu.nextElement(); + boolean found = attr.getName().equals(name); + if (namespace == null) { + found &= (attr.getNamespace() == null); +@@ -860,9 +860,9 @@ + */ + public Enumeration enumerateAttributeNames() { + Vector result = new Vector(); +- Enumeration enum = this.attributes.elements(); +- while (enum.hasMoreElements()) { +- XMLAttribute attr = (XMLAttribute) enum.nextElement(); ++ Enumeration enu = this.attributes.elements(); ++ while (enu.hasMoreElements()) { ++ XMLAttribute attr = (XMLAttribute) enu.nextElement(); + result.addElement(attr.getFullName()); + } + return result.elements(); +@@ -897,9 +897,9 @@ + */ + public Properties getAttributes() { + Properties result = new Properties(); +- Enumeration enum = this.attributes.elements(); +- while (enum.hasMoreElements()) { +- XMLAttribute attr = (XMLAttribute) enum.nextElement(); ++ Enumeration enu = this.attributes.elements(); ++ while (enu.hasMoreElements()) { ++ XMLAttribute attr = (XMLAttribute) enu.nextElement(); + result.put(attr.getFullName(), attr.getValue()); + } + return result; +@@ -915,9 +915,9 @@ + */ + public Properties getAttributesInNamespace(String namespace) { + Properties result = new Properties(); +- Enumeration enum = this.attributes.elements(); +- while (enum.hasMoreElements()) { +- XMLAttribute attr = (XMLAttribute) enum.nextElement(); ++ Enumeration enu = this.attributes.elements(); ++ while (enu.hasMoreElements()) { ++ XMLAttribute attr = (XMLAttribute) enu.nextElement(); + if (namespace == null) { + if (attr.getNamespace() == null) { + result.put(attr.getName(), attr.getValue()); +@@ -1007,9 +1007,9 @@ + if (this.attributes.size() != elt.getAttributeCount()) { + return false; + } +- Enumeration enum = this.attributes.elements(); +- while (enum.hasMoreElements()) { +- XMLAttribute attr = (XMLAttribute) enum.nextElement(); ++ Enumeration enu = this.attributes.elements(); ++ while (enu.hasMoreElements()) { ++ XMLAttribute attr = (XMLAttribute) enu.nextElement(); + if (! elt.hasAttribute(attr.getName(), attr.getNamespace())) { + return false; + } +--- a/Sources/Java/net/n3/nanoxml/XMLWriter.java ++++ b/Sources/Java/net/n3/nanoxml/XMLWriter.java +@@ -182,10 +182,10 @@ + } + } + +- Enumeration enum = xml.enumerateAttributeNames(); ++ Enumeration enu = xml.enumerateAttributeNames(); + +- while (enum.hasMoreElements()) { +- String key = (String) enum.nextElement(); ++ while (enu.hasMoreElements()) { ++ String key = (String) enu.nextElement(); + int index = key.indexOf(':'); + + if (index >= 0) { +@@ -203,10 +203,10 @@ + } + } + +- enum = xml.enumerateAttributeNames(); ++ enu = xml.enumerateAttributeNames(); + +- while (enum.hasMoreElements()) { +- String key = (String) enum.nextElement(); ++ while (enu.hasMoreElements()) { ++ String key = (String) enu.nextElement(); + String value = xml.getAttribute(key, null); + this.writer.print(" " + key + "=\""); + this.writeEncoded(value); +@@ -229,10 +229,10 @@ + writer.println(); + } + +- enum = xml.enumerateChildren(); ++ enu = xml.enumerateChildren(); + +- while (enum.hasMoreElements()) { +- IXMLElement child = (IXMLElement) enum.nextElement(); ++ while (enu.hasMoreElements()) { ++ IXMLElement child = (IXMLElement) enu.nextElement(); + this.write(child, prettyPrint, indent + 4, + collapseEmptyElements); + } +--- a/Sources/Java/net/n3/nanoxml/StdXMLParser.java ++++ b/Sources/Java/net/n3/nanoxml/StdXMLParser.java +@@ -492,10 +492,10 @@ + extraAttributes, + this.reader.getSystemID(), + this.reader.getLineNr()); +- Enumeration enum = extraAttributes.keys(); ++ Enumeration enu = extraAttributes.keys(); + +- while (enum.hasMoreElements()) { +- String key = (String) enum.nextElement(); ++ while (enu.hasMoreElements()) { ++ String key = (String) enu.nextElement(); + String value = extraAttributes.getProperty(key); + attrNames.addElement(key); + attrValues.addElement(value); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..50cd5c4 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-fix-java9-build.patch diff --git a/debian/rules b/debian/rules index 202c412..48d9abf 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ export DH_OPTIONS JAVA_HOME?=/usr/lib/jvm/default-java -JFLAGS?=-source 1.4 -nowarn +JFLAGS?=-source 1.8 -nowarn SRCDIR := $(shell echo ./$(word $(words ${MAKEFILE_LIST}), ${MAKEFILE_LIST}) | \ sed -r "s/debian\/rules$$//") @@ -33,7 +33,7 @@ override_dh_auto_build: mv $(SAX).tmp $(SAX) ${JAVA_HOME}/bin/javadoc -author -link /usr/share/doc/default-jdk-doc/api -quiet \ - -sourcepath Sources/Java/:Sources/Lite/:Sources/SAX/ -source 1.4 \ + -sourcepath Sources/Java/:Sources/Lite/:Sources/SAX/ -source 1.8 \ nanoxml net.n3.nanoxml net.n3.nanoxml.sax -d api override_dh_auto_test: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnanoxml2-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
