This is an automated email from the git hooks/post-receive script. grinorcole-guest pushed a commit to branch master in repository qpid-java.
commit 61ff41776b5b8418871407e5177510d492ec5dfd Author: Christopher Hoskin <[email protected]> Date: Sat Oct 8 14:47:56 2016 +0100 Add DEP-3 headers to patches --- ...ate-expired-certificates-embedded-in-unit.patch | 5 +++++ debian/patches/bcel.patch | 7 +++++++ debian/patches/pom.patch | 24 ++++++++++++++++++++-- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/debian/patches/0001-NO-JIRA-Update-expired-certificates-embedded-in-unit.patch b/debian/patches/0001-NO-JIRA-Update-expired-certificates-embedded-in-unit.patch index b5efea9..4ce695f 100644 --- a/debian/patches/0001-NO-JIRA-Update-expired-certificates-embedded-in-unit.patch +++ b/debian/patches/0001-NO-JIRA-Update-expired-certificates-embedded-in-unit.patch @@ -1,3 +1,8 @@ +Subject: Update expired certificates embedded in unit test case SSLUtilTest +Origin: commit:https://github.com/apache/qpid-java/commit/e987c569f5ee9de46a32071ad0bb11f03ee3d381 +Reviewed-by: Christopher Hoskin <[email protected]> +Last-Update: 2016-10-08 + From e987c569f5ee9de46a32071ad0bb11f03ee3d381 Mon Sep 17 00:00:00 2001 From: Keith Wall <[email protected]> Date: Fri, 2 Sep 2016 14:33:41 +0000 diff --git a/debian/patches/bcel.patch b/debian/patches/bcel.patch index 15e717a..0c85e72 100644 --- a/debian/patches/bcel.patch +++ b/debian/patches/bcel.patch @@ -1,3 +1,10 @@ +Subject: Rename of BCEL constant classes + org.apache.bcel.Constants has been depredated in favour of + org.apache.bcel.Const +Forwarded: No +Author: Christopher Hoskin <[email protected]> +Last-Update: 2016-10-08 + --- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java +++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java @@ -20,10 +20,10 @@ diff --git a/debian/patches/pom.patch b/debian/patches/pom.patch index ae5e025..4df76b5 100644 --- a/debian/patches/pom.patch +++ b/debian/patches/pom.patch @@ -1,3 +1,23 @@ +Subject: Patch ./pom.xml to build and test on Sid + Comment out modules: + * jdbc-provider-bone broker plugin (depends on BoneCP which is not packaged + and has been depricated by upstream in favour of HikariCP) + * jca/rar (depends on maven-rar-plugin, not packaged) + * bdbstore, bdbstore/systests (depends on Oracle Berkeley DB Java Edition v5, + Sid has v3 packaged) + Exclude from compilation: + * GeronimoTransactionManagerLocator.java (Depends on Geronimo classes not + packaged for Debian) + * VirtualHostMessageStoreTest.java (Depends indirectly on Berkeley DB) + Exclude tests: + * StartupAppenderTest.java - test fails, needs investigation + * AppenderUtilsTest.java - test fails, needs investigation + Set useIncrementalCompilation to false (workaround for + https://issues.apache.org/jira/browse/MCOMPILER-236). +Forwarded: not-needed +Author: Christopher Hoskin <[email protected]> +Last-Update: 2016-10-08 + --- a/pom.xml +++ b/pom.xml @@ -173,7 +173,7 @@ @@ -37,10 +57,10 @@ + <useIncrementalCompilation>false</useIncrementalCompilation> + <excludes> + <exclude>**/org/apache/qpid/ra/tm/GeronimoTransactionManagerLocator.java</exclude> -+ <exclude>**/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java</exclude> ++ <!--exclude>**/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java</exclude--> + </excludes> + <testExcludes> -+ <exclude>**/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java</exclude> ++ <!--exclude>**/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java</exclude--> + </testExcludes> </configuration> </plugin> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/qpid-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
