Author: tmancill Date: 2013-11-21 06:33:57 +0000 (Thu, 21 Nov 2013) New Revision: 17467
Added: trunk/libbtm-java/debian/patches/fix-jms-proper-usage-mock-test.patch trunk/libbtm-java/debian/patches/transition-to-openjdk7.patch Modified: trunk/libbtm-java/debian/changelog trunk/libbtm-java/debian/compat trunk/libbtm-java/debian/control trunk/libbtm-java/debian/patches/series trunk/libbtm-java/debian/rules Log: packaging updates for 2.1.4 Modified: trunk/libbtm-java/debian/changelog =================================================================== --- trunk/libbtm-java/debian/changelog 2013-11-21 00:31:20 UTC (rev 17466) +++ trunk/libbtm-java/debian/changelog 2013-11-21 06:33:57 UTC (rev 17467) @@ -1,11 +1,16 @@ -libbtm-java (2.1.2-2) UNRELEASED; urgency=low +libbtm-java (2.1.4-1) unstable; urgency=low - [ by sponsor Steffen Moeller ] - * Added DMUA flag. + * Team upload. + * New upstream release. + * Add and freshen patch for FTBFS with JDK 7. (Closes: #706702) + - Thanks to Shuxiong Ye + * Add fix-jms-proper-usage-mock-test.patch to address FTBFS test failure. + * Bump Standards-Version to 3.9.5. + * Bump debian/compat and debhelper dependency to 9. + * Update Vcs fields to canonical URLs. - -- Brian Thomason <[email protected]> Fri, 23 Dec 2011 23:56:40 +0100 + -- tony mancill <[email protected]> Mon, 18 Nov 2013 06:35:15 +0000 - libbtm-java (2.1.2-1) unstable; urgency=low [ by sponsor Steffen Moeller ] Modified: trunk/libbtm-java/debian/compat =================================================================== --- trunk/libbtm-java/debian/compat 2013-11-21 00:31:20 UTC (rev 17466) +++ trunk/libbtm-java/debian/compat 2013-11-21 06:33:57 UTC (rev 17467) @@ -1 +1 @@ -7 +9 Modified: trunk/libbtm-java/debian/control =================================================================== --- trunk/libbtm-java/debian/control 2013-11-21 00:31:20 UTC (rev 17466) +++ trunk/libbtm-java/debian/control 2013-11-21 06:33:57 UTC (rev 17467) @@ -2,15 +2,15 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Torsten Werner <[email protected]>, Brian Thomason <[email protected]> -Build-Depends: debhelper (>= 7.0.50~), maven-repo-helper, default-jdk, ant, +Uploaders: Torsten Werner <[email protected]>, + Brian Thomason <[email protected]> +Build-Depends: debhelper (>= 9), maven-repo-helper, default-jdk, ant, libgeronimo-jta-1.1-spec-java, libgeronimo-jms-1.1-spec-java, libslf4j-java, libmockito-java, junit, ant-optional -Standards-Version: 3.9.2 -DM-upload-allowed: yes +Standards-Version: 3.9.5 Homepage: http://docs.codehaus.org/display/BTM/Home -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libbtm-java -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libbtm-java/ +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libbtm-java +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libbtm-java/ Package: libbtm-java Architecture: all Added: trunk/libbtm-java/debian/patches/fix-jms-proper-usage-mock-test.patch =================================================================== --- trunk/libbtm-java/debian/patches/fix-jms-proper-usage-mock-test.patch (rev 0) +++ trunk/libbtm-java/debian/patches/fix-jms-proper-usage-mock-test.patch 2013-11-21 06:33:57 UTC (rev 17467) @@ -0,0 +1,20 @@ +Description: work-around for test failure due to parent class being + called for each setUp(). +Author: tony mancill <[email protected]> + +--- a/test/bitronix/tm/mock/JmsProperUsageMockTest.java ++++ b/test/bitronix/tm/mock/JmsProperUsageMockTest.java +@@ -101,9 +101,11 @@ + assertEquals(Status.STATUS_COMMITTING, ((JournalLogEvent) orderedEvents.get(i++)).getStatus()); + assertEquals(true, ((XAResourceCommitEvent) orderedEvents.get(i++)).isOnePhase()); + assertEquals(Status.STATUS_COMMITTED, ((JournalLogEvent) orderedEvents.get(i++)).getStatus()); +- } + +- public void testSerialization() throws Exception { ++ // setUp/tearDown cannot be called twice ++ //} ++ ++ //public void testSerialization() throws Exception { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream(baos); + oos.writeObject(poolingConnectionFactory1); Modified: trunk/libbtm-java/debian/patches/series =================================================================== --- trunk/libbtm-java/debian/patches/series 2013-11-21 00:31:20 UTC (rev 17466) +++ trunk/libbtm-java/debian/patches/series 2013-11-21 06:33:57 UTC (rev 17467) @@ -1 +1,3 @@ add-pom-file.patch +transition-to-openjdk7.patch +fix-jms-proper-usage-mock-test.patch Added: trunk/libbtm-java/debian/patches/transition-to-openjdk7.patch =================================================================== --- trunk/libbtm-java/debian/patches/transition-to-openjdk7.patch (rev 0) +++ trunk/libbtm-java/debian/patches/transition-to-openjdk7.patch 2013-11-21 06:33:57 UTC (rev 17467) @@ -0,0 +1,80 @@ +Description: Address FTBFS with JDK 7 +Author: Shuxiong Ye <[email protected]> +Forwarded: http://bitronix-transaction-manager.10986.n7.nabble.com/libbtm-java-2-1-2-Fail-to-build-from-source-with-Java7-td1499.html + +--- a/src/bitronix/tm/resource/jdbc/PoolingDataSource.java ++++ b/src/bitronix/tm/resource/jdbc/PoolingDataSource.java +@@ -47,6 +47,7 @@ + import java.lang.reflect.Proxy; + import java.sql.Connection; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + import java.util.Iterator; + import java.util.List; + import java.util.concurrent.CopyOnWriteArrayList; +@@ -404,4 +405,10 @@ + public void reset() throws Exception { + pool.reset(); + } ++ ++ @Override ++ public java.util.logging.Logger getParentLogger() ++ throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- a/src/bitronix/tm/resource/jdbc/lrc/LrcXADataSource.java ++++ b/src/bitronix/tm/resource/jdbc/lrc/LrcXADataSource.java +@@ -29,6 +29,7 @@ + import java.sql.Connection; + import java.sql.Driver; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + import java.util.Properties; + + /** +@@ -127,4 +128,10 @@ + public String toString() { + return "a JDBC LrcXADataSource on " + driverClassName + " with URL " + url; + } ++ ++ @Override ++ public java.util.logging.Logger getParentLogger() ++ throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- a/test/bitronix/tm/mock/resource/jdbc/MockDriver.java ++++ b/test/bitronix/tm/mock/resource/jdbc/MockDriver.java +@@ -24,6 +24,7 @@ + import java.sql.SQLException; + import java.sql.Connection; + import java.sql.DriverPropertyInfo; ++import java.sql.SQLFeatureNotSupportedException; + import java.util.Properties; + + /** +@@ -55,4 +56,10 @@ + public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException { + return new DriverPropertyInfo[0]; + } ++ ++ @Override ++ public java.util.logging.Logger getParentLogger() ++ throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } +--- a/test/bitronix/tm/mock/resource/jdbc/MockitoXADataSource.java ++++ b/test/bitronix/tm/mock/resource/jdbc/MockitoXADataSource.java +@@ -218,4 +218,10 @@ + public void setUselessThing(Object uselessThing) { + this.uselessThing = uselessThing; + } ++ ++ @Override ++ public java.util.logging.Logger getParentLogger() ++ throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException(); ++ } + } Modified: trunk/libbtm-java/debian/rules =================================================================== --- trunk/libbtm-java/debian/rules 2013-11-21 00:31:20 UTC (rev 17466) +++ trunk/libbtm-java/debian/rules 2013-11-21 06:33:57 UTC (rev 17467) @@ -7,6 +7,10 @@ D := /usr/share/java/ export CLASSPATH := $(D)slf4j-api.jar:$(D)geronimo-jms_1.1_spec-1.1.jar:$(D)geronimo-jta-1.0.1b-spec.jar:$(D)mockito-core.jar +# use this CP in order to get test output logging during the build +# you will also need to install liblogback-java +#export CLASSPATH := $(D)slf4j-api.jar:$(D)geronimo-jms_1.1_spec-1.1.jar:$(D)geronimo-jta-1.0.1b-spec.jar:$(D)mockito-core.jar:$(D)logback-classic.jar:$(D)logback-core.jar + %: dh $@ _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
