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 c907e8d84a195f4df692cb9c7b67cb1fdabdd2a6
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Fri Mar 16 16:38:09 2018 +0100
Refreshed the patches
---
debian/changelog | 4 +++-
debian/patches/01-disable-kafka-appender.patch | 28 +++++++++++++++-----------
debian/patches/02-jackson-compatibility.patch | 14 -------------
debian/patches/03-mongodb-compatibility.patch | 18 ++++++++---------
debian/patches/series | 1 -
5 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7006f75..d23b05b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-apache-log4j2 (2.8.2-3) UNRELEASED; urgency=medium
+apache-log4j2 (2.9.0-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release
+ - Refreshed the patches
* Standards-Version updated to 4.1.3
* Switch to debhelper level 11
* Removed the Maven wrapper from the upstream tarball
diff --git a/debian/patches/01-disable-kafka-appender.patch
b/debian/patches/01-disable-kafka-appender.patch
index 78c15ab..578e707 100644
--- a/debian/patches/01-disable-kafka-appender.patch
+++ b/debian/patches/01-disable-kafka-appender.patch
@@ -3,15 +3,19 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
-@@ -341,6 +341,11 @@
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler.plugin.version}</version>
-+ <configuration>
-+ <excludes>
-+ <exclude>**/kafka/**</exclude>
-+ </excludes>
-+ </configuration>
- <executions>
- <execution>
- <!-- disable annotation processing for first pass -->
+@@ -351,6 +351,7 @@
+ <configuration>
+ <excludes>
+ <exclude>module-info.java</exclude>
++ <exclude>**/kafka/**</exclude>
+ </excludes>
+ <proc>none</proc>
+ </configuration>
+@@ -365,6 +366,7 @@
+ <configuration>
+ <excludes>
+ <exclude>module-info.java</exclude>
++ <exclude>**/kafka/**</exclude>
+ </excludes>
+ <proc>only</proc>
+ </configuration>
diff --git a/debian/patches/02-jackson-compatibility.patch
b/debian/patches/02-jackson-compatibility.patch
deleted file mode 100644
index 8fa65be..0000000
--- a/debian/patches/02-jackson-compatibility.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fixes the compatibility with the version of jackson in Debian
-Author: Emmanuel Bourg <ebo...@apache.org>
-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
index d8695fc..d098e04 100644
--- a/debian/patches/03-mongodb-compatibility.patch
+++ b/debian/patches/03-mongodb-compatibility.patch
@@ -3,12 +3,12 @@ Author: Emmanuel Bourg <ebo...@apache.org>
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
-@@ -162,7 +162,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 {
- final int portInt = TypeConverters.convert(port, int.class,
DEFAULT_PORT);
+@@ -290,7 +290,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 {
+ final int portInt = TypeConverters.convert(port,
int.class, DEFAULT_PORT);
diff --git a/debian/patches/series b/debian/patches/series
index 81b6fa2..fb14a38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
01-disable-kafka-appender.patch
-02-jackson-compatibility.patch
03-mongodb-compatibility.patch
04-disable-cassandra-appender.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
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
