This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository apache-log4j2.
commit ae40b1fca01b530b915fda76700aac0708388c11 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 8 15:03:38 2016 +0200 Fixed the compatibility with jackson and mongodb --- debian/changelog | 4 +++- debian/patches/02-jackson-compatibility.patch | 14 ++++++++++++++ debian/patches/03-mongodb-compatibility.patch | 14 ++++++++++++++ debian/patches/series | 2 ++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0d14e0a..7549fa3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -apache-log4j2 (2.4-3) UNRELEASED; urgency=medium +apache-log4j2 (2.4.1-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Fixed the compatibility with jackson and mongodb * Exclude the minified JavaScript files from the upstream tarball -- Emmanuel Bourg <[email protected]> Fri, 08 Jul 2016 14:59:30 +0200 diff --git a/debian/patches/02-jackson-compatibility.patch b/debian/patches/02-jackson-compatibility.patch new file mode 100644 index 0000000..8fa65be --- /dev/null +++ b/debian/patches/02-jackson-compatibility.patch @@ -0,0 +1,14 @@ +Description: Fixes the compatibility with the version of jackson in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/InputStreamLogEventBridge.java ++++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/InputStreamLogEventBridge.java +@@ -45,7 +45,7 @@ + this.bufferSize = bufferSize; + this.charset = charset; + this.eventEndMarker = eventEndMarker; +- this.objectReader = mapper.readerFor(Log4jLogEvent.class); ++ this.objectReader = mapper.reader(Log4jLogEvent.class); + } + + abstract protected int[] getEventIndices(final String text, int beginIndex); diff --git a/debian/patches/03-mongodb-compatibility.patch b/debian/patches/03-mongodb-compatibility.patch new file mode 100644 index 0000000..ba1b6de --- /dev/null +++ b/debian/patches/03-mongodb-compatibility.patch @@ -0,0 +1,14 @@ +Description: Fixes the compatibility with the version of the MongoDB driver in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java ++++ b/log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/mongodb/MongoDbProvider.java +@@ -160,7 +160,7 @@ + if (Strings.isNotEmpty(userName) && Strings.isNotEmpty(password)) { + description += ", username=" + userName + ", passwordHash=" + + NameUtil.md5(password + MongoDbProvider.class.getName()); +- credentials.add(MongoCredential.createCredential(userName, databaseName, password.toCharArray())); ++ credentials.add(MongoCredential.createMongoCRCredential(userName, databaseName, password.toCharArray())); + } + try { + if (Strings.isNotEmpty(server)) { diff --git a/debian/patches/series b/debian/patches/series index 037b703..a5195ad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ 01-disable-kafka-appender.patch +02-jackson-compatibility.patch +03-mongodb-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-log4j2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
