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 f7400eaa8fc923a38d63eaa811cd342a517821f4 Author: Markus Koschany <[email protected]> Date: Sun May 31 13:48:11 2015 +0200 Remove SLF4j-1.7.patch --- debian/patches/SLF4j-1.7.patch | 25 ------------------------- debian/patches/series | 1 - 2 files changed, 26 deletions(-) diff --git a/debian/patches/SLF4j-1.7.patch b/debian/patches/SLF4j-1.7.patch deleted file mode 100644 index d86c00a..0000000 --- a/debian/patches/SLF4j-1.7.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Marek Goldmann <[email protected]> -Date: Sun, 3 May 2015 12:34:54 +0200 -Subject: SLF4j-1.7 - -This patch was taken from Fedora courtesy of Marek Goldmann. -http://pkgs.fedoraproject.org/cgit/jboss-logging.git/tree/0001-SLF4j-1.7-upgrade.patch -It 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 0eedf16..4434838 100644 ---- a/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java -+++ b/src/main/java/org/jboss/logging/Slf4jLoggerProvider.java -@@ -55,6 +55,6 @@ final class Slf4jLoggerProvider extends AbstractLoggerProvider implements Logger - - @SuppressWarnings({ "unchecked" }) - public Map<String, Object> getMdcMap() { -- return MDC.getCopyOfContextMap(); -+ return (Map) MDC.getCopyOfContextMap(); - } - } diff --git a/debian/patches/series b/debian/patches/series index 7efb3c3..2775e34 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -SLF4j-1.7.patch disable-apiviz-plugin.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
