This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository jboss-logging.
commit 33198a4317f7255bc0dbda0fc946524bb7b9fc0f Author: Markus Koschany <[email protected]> Date: Sun May 31 13:50:57 2015 +0200 Rebase SLF4j-1.7.patch --- debian/patches/SLF4j-1.7.patch | 23 +++++++++++++++++++++++ debian/patches/disable-apiviz-plugin.patch | 2 +- debian/patches/series | 1 + 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/debian/patches/SLF4j-1.7.patch b/debian/patches/SLF4j-1.7.patch new file mode 100644 index 0000000..103f484 --- /dev/null +++ b/debian/patches/SLF4j-1.7.patch @@ -0,0 +1,23 @@ +From: Markus Koschany <[email protected]> +Date: Sun, 31 May 2015 13:49:55 +0200 +Subject: SLF4j-1.7 + +This patch allows jboss-logging to compile with the latest version of SLF4j. +Forwarded: no +--- + src/main/java/org/jboss/logging/Slf4jLoggerProvider.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java b/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java +index c4893e9..3790b5d 100644 +--- a/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java ++++ b/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java +@@ -62,7 +62,7 @@ final class Slf4jLoggerProvider extends AbstractLoggerProvider implements Logger + + public Map<String, Object> getMdcMap() { + @SuppressWarnings({"unchecked"}) +- final Map<String, Object> map = MDC.getCopyOfContextMap(); ++ final Map<String, Object> map = (Map) MDC.getCopyOfContextMap(); + return map == null ? Collections.<String, Object>emptyMap() : map; + } + } diff --git a/debian/patches/disable-apiviz-plugin.patch b/debian/patches/disable-apiviz-plugin.patch index 3e20688..253aa33 100644 --- a/debian/patches/disable-apiviz-plugin.patch +++ b/debian/patches/disable-apiviz-plugin.patch @@ -8,7 +8,7 @@ Forwarded: not-needed 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml -index 04dec9a..01548e1 100644 +index 69eb428..f0bf132 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ diff --git a/debian/patches/series b/debian/patches/series index 2775e34..6530426 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ disable-apiviz-plugin.patch +SLF4j-1.7.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jboss-logging.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
