Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package ini4j. The package was patched last June to compile with Java 8, but the patch broke a major functionality of the library (removing an element from the ini configuration no longer work). The version 0.5.2-SNAPSHOT-5 fixes this issue and enables the unit tests to ensure the Java 8 compatibility patch doesn't break the expected behavior of the library. Thank you unblock ini4j/0.5.2-SNAPSHOT-5 diff -Nru ini4j-0.5.2-SNAPSHOT/debian/changelog ini4j-0.5.2-SNAPSHOT/debian/changelog --- ini4j-0.5.2-SNAPSHOT/debian/changelog 2014-04-15 15:20:57.000000000 +0200 +++ ini4j-0.5.2-SNAPSHOT/debian/changelog 2014-12-04 13:53:54.000000000 +0100 @@ -1,3 +1,12 @@ +ini4j (0.5.2-SNAPSHOT-5) unstable; urgency=medium + + * Team upload. + * Fixed the Java 8 compatibility patch (Closes: #772010) + * Enabled the unit tests + * Standards-Version updated to 3.9.6 (no changes) + + -- Emmanuel Bourg <[email protected]> Thu, 04 Dec 2014 13:53:51 +0100 + ini4j (0.5.2-SNAPSHOT-4) unstable; urgency=medium * Team upload. diff -Nru ini4j-0.5.2-SNAPSHOT/debian/control ini4j-0.5.2-SNAPSHOT/debian/control --- ini4j-0.5.2-SNAPSHOT/debian/control 2014-04-15 15:20:57.000000000 +0200 +++ ini4j-0.5.2-SNAPSHOT/debian/control 2014-12-04 13:50:47.000000000 +0100 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Marek Slama <[email protected]>, Andres Mejia <[email protected]> -Build-Depends: cdbs, debhelper (>= 9), maven-debian-helper, default-jdk, libmaven-javadoc-plugin-java -Standards-Version: 3.9.5 +Build-Depends: cdbs, debhelper (>= 9), maven-debian-helper, default-jdk, libmaven-javadoc-plugin-java, junit4, libbsh-java, libeasymock-java +Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/ini4j.git Vcs-Git: git://anonscm.debian.org/pkg-java/ini4j.git Homepage: http://www.ini4j.org diff -Nru ini4j-0.5.2-SNAPSHOT/debian/maven.cleanIgnoreRules ini4j-0.5.2-SNAPSHOT/debian/maven.cleanIgnoreRules --- ini4j-0.5.2-SNAPSHOT/debian/maven.cleanIgnoreRules 2014-04-15 15:39:43.000000000 +0200 +++ ini4j-0.5.2-SNAPSHOT/debian/maven.cleanIgnoreRules 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ - diff -Nru ini4j-0.5.2-SNAPSHOT/debian/maven.ignoreRules ini4j-0.5.2-SNAPSHOT/debian/maven.ignoreRules --- ini4j-0.5.2-SNAPSHOT/debian/maven.ignoreRules 2014-04-15 15:39:43.000000000 +0200 +++ ini4j-0.5.2-SNAPSHOT/debian/maven.ignoreRules 2014-12-04 13:49:43.000000000 +0100 @@ -1,7 +1,6 @@ com.google.code.maven-license-plugin maven-license-plugin * * * * jetty jetty * * * * -junit junit * * * * net.sf.retrotranslator retrotranslator-runtime * * * * org.apache.maven.plugins maven-antrun-plugin * * * * org.apache.maven.plugins maven-assembly-plugin * * * * @@ -14,11 +13,8 @@ org.apache.maven.plugins maven-project-info-reports-plugin * * * * org.apache.maven.plugins maven-site-plugin * * * * org.apache.maven.plugins maven-source-plugin * * * * -org.apache.maven.plugins maven-surefire-plugin * * * * -org.beanshell bsh * * * * org.codehaus.mojo cobertura-maven-plugin * * * * org.codehaus.mojo retrotranslator-maven-plugin * * * * org.codehaus.mojo taglist-maven-plugin * * * * org.codehaus.mojo wagon-maven-plugin * * * * -org.easymock easymock * * * * org.easymock easymockclassextension * * * * diff -Nru ini4j-0.5.2-SNAPSHOT/debian/maven.properties ini4j-0.5.2-SNAPSHOT/debian/maven.properties --- ini4j-0.5.2-SNAPSHOT/debian/maven.properties 2014-04-15 15:20:57.000000000 +0200 +++ ini4j-0.5.2-SNAPSHOT/debian/maven.properties 2014-12-04 13:40:17.000000000 +0100 @@ -2,5 +2,4 @@ # For example: # maven.test.skip=true -maven.test.skip=true project.build.sourceEncoding=UTF-8 diff -Nru ini4j-0.5.2-SNAPSHOT/debian/maven.publishedRules ini4j-0.5.2-SNAPSHOT/debian/maven.publishedRules --- ini4j-0.5.2-SNAPSHOT/debian/maven.publishedRules 2014-04-15 15:39:43.000000000 +0200 +++ ini4j-0.5.2-SNAPSHOT/debian/maven.publishedRules 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ - diff -Nru ini4j-0.5.2-SNAPSHOT/debian/maven.rules ini4j-0.5.2-SNAPSHOT/debian/maven.rules --- ini4j-0.5.2-SNAPSHOT/debian/maven.rules 2014-04-15 15:39:43.000000000 +0200 +++ ini4j-0.5.2-SNAPSHOT/debian/maven.rules 2014-12-04 13:51:27.000000000 +0100 @@ -1 +1,3 @@ +junit junit jar s/4\..*/4.x/ * * + diff -Nru ini4j-0.5.2-SNAPSHOT/debian/patches/01-java8-compatibility.patch ini4j-0.5.2-SNAPSHOT/debian/patches/01-java8-compatibility.patch --- ini4j-0.5.2-SNAPSHOT/debian/patches/01-java8-compatibility.patch 2014-04-15 15:20:57.000000000 +0200 +++ ini4j-0.5.2-SNAPSHOT/debian/patches/01-java8-compatibility.patch 2014-12-04 13:48:04.000000000 +0100 @@ -1,7 +1,7 @@ Description: Changes the return type of the org.ini4j.Profile.remove(Object, Object) method to fix a conflict with the method Map.remove(Object, Object) added in Java 8. Author: Emmanuel Bourg <[email protected]> -Forwarded: no +Bug: http://sourceforge.net/p/ini4j/bugs/47/ --- a/src/main/java/org/ini4j/Profile.java +++ b/src/main/java/org/ini4j/Profile.java @@ -43,7 +43,7 @@ @@ -15,7 +15,7 @@ { --- a/src/main/java/org/ini4j/BasicProfile.java +++ b/src/main/java/org/ini4j/BasicProfile.java -@@ -139,11 +139,11 @@ +@@ -139,11 +139,18 @@ return remove((Object) section.getName()); } @@ -23,9 +23,33 @@ + @Override public boolean remove(Object sectionName, Object optionName) { Section sec = get(sectionName); - +- - return (sec == null) ? null : sec.remove(optionName); -+ return (sec == null) ? false : true; ++ if (sec == null || !sec.containsKey(optionName)) ++ { ++ return false; ++ } ++ else ++ { ++ sec.remove(optionName); ++ return true; ++ } } boolean isTreeMode() +--- a/src/test/java/org/ini4j/BasicProfileTest.java ++++ b/src/test/java/org/ini4j/BasicProfileTest.java +@@ -86,10 +86,10 @@ + prof.add(SECTION, Dwarf.PROP_FORTUNE_NUMBER, DwarfsData.sneezy.fortuneNumber[2]); + prof.add(SECTION, Dwarf.PROP_FORTUNE_NUMBER, DwarfsData.sneezy.fortuneNumber[3]); + Helper.assertEquals(DwarfsData.sneezy, prof.get(SECTION).as(Dwarf.class)); +- assertNotNull(prof.remove(SECTION, Dwarf.PROP_FORTUNE_NUMBER)); ++ assertTrue(prof.remove(SECTION, Dwarf.PROP_FORTUNE_NUMBER)); + assertEquals(0, prof.get(SECTION).length(Dwarf.PROP_FORTUNE_NUMBER)); + assertNotNull(prof.remove(SECTION)); +- assertNull(prof.remove(SECTION, Dwarf.PROP_FORTUNE_NUMBER)); ++ assertFalse(prof.remove(SECTION, Dwarf.PROP_FORTUNE_NUMBER)); + } + + @Test public void testFirstUpper() + diff -Nru ini4j-0.5.2-SNAPSHOT/debian/patches/02-fix-tests-cleanup.patch ini4j-0.5.2-SNAPSHOT/debian/patches/02-fix-tests-cleanup.patch --- ini4j-0.5.2-SNAPSHOT/debian/patches/02-fix-tests-cleanup.patch 1970-01-01 01:00:00.000000000 +0100 +++ ini4j-0.5.2-SNAPSHOT/debian/patches/02-fix-tests-cleanup.patch 2014-12-04 13:48:15.000000000 +0100 @@ -0,0 +1,14 @@ +Description: Clear the missing system properties to avoid test failures in ConfigTest +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/src/test/java/org/ini4j/test/Helper.java ++++ b/src/test/java/org/ini4j/test/Helper.java +@@ -56,6 +56,8 @@ + public static final float DELTA = 0.00000001f; + private static final String[] CONFIG_PROPERTIES = + { ++ Config.PROP_EMPTY_SECTION, Config.PROP_PATH_SEPARATOR, Config.PROP_PROPERTY_FIRST_UPPER, ++ Config.PROP_COMMENT, Config.PROP_HEADER_COMMENT, Config.PROP_TREE, + Config.PROP_EMPTY_OPTION, Config.PROP_GLOBAL_SECTION, Config.PROP_GLOBAL_SECTION_NAME, Config.PROP_INCLUDE, + Config.PROP_LOWER_CASE_OPTION, Config.PROP_LOWER_CASE_SECTION, Config.PROP_MULTI_OPTION, Config.PROP_MULTI_SECTION, + Config.PROP_STRICT_OPERATOR, Config.PROP_UNNAMED_SECTION, Config.PROP_ESCAPE diff -Nru ini4j-0.5.2-SNAPSHOT/debian/patches/series ini4j-0.5.2-SNAPSHOT/debian/patches/series --- ini4j-0.5.2-SNAPSHOT/debian/patches/series 2014-04-15 15:20:57.000000000 +0200 +++ ini4j-0.5.2-SNAPSHOT/debian/patches/series 2014-12-04 13:27:17.000000000 +0100 @@ -1 +1,2 @@ 01-java8-compatibility.patch +02-fix-tests-cleanup.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: https://lists.debian.org/[email protected]
