Tony Mancill pushed to branch master at Debian Java Maintainers / apache-log4j2
Commits: ccc4fbbc by tony mancill at 2019-01-13T16:00:10Z Revert "Drop support for mongodb (Debian: #919095)" This reverts commit 4d8cf4493ad9f63a8cf8d24ae463bd18a12ed1a1. See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919095#56 - - - - - 8cd0fd48 by tony mancill at 2019-01-13T16:02:05Z Revert commit that drops support for the mongodb adapter. - - - - - 7 changed files: - debian/changelog - debian/control - debian/liblog4j2-java.poms - debian/maven.ignoreRules - debian/maven.rules - + debian/patches/03-mongodb-compatibility.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +apache-log4j2 (2.11.1-3) UNRELEASED; urgency=medium + + * Team upload. + * Revert "Drop support for mongodb (Debian: #919095)" + + -- tony mancill <[email protected]> Sun, 13 Jan 2019 08:01:26 -0800 + apache-log4j2 (2.11.1-2) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -38,6 +38,7 @@ Build-Depends: libmaven-install-plugin-java, libmaven-javadoc-plugin-java, libmaven-source-plugin-java, + libmongodb-java, libnetty-java, libosgi-core-java, libservlet3.1-java, ===================================== debian/liblog4j2-java.poms ===================================== @@ -48,7 +48,7 @@ log4j-samples/pom.xml --ignore log4j-osgi/pom.xml --ignore log4j-bom/pom.xml --no-parent --has-package-version log4j-mongodb2/pom.xml --ignore -log4j-mongodb3/pom.xml --ignore +log4j-mongodb3/pom.xml --has-package-version --java-lib log4j-web/pom.xml --has-package-version --java-lib log4j-jul/pom.xml --has-package-version --java-lib log4j-perf/pom.xml --ignore ===================================== debian/maven.ignoreRules ===================================== @@ -10,6 +10,7 @@ org.apache.logging.log4j.osgi log4j-osgi pom * * * org.apache.logging.log4j.samples log4j-samples pom * * * ch.qos.logback logback-classic * * * * ch.qos.logback logback-core * * * * +de.flapdoodle.embed de.flapdoodle.embed.mongo * * * * com.datastax.cassandra cassandra-driver-core * * * * com.github.tomakehurst wiremock * * * * com.google.code.java-allocation-instrumenter java-allocation-instrumenter * * * * ===================================== debian/maven.rules ===================================== @@ -8,6 +8,8 @@ com.fasterxml.jackson.module jackson-module-jaxb-annotations s/jar/bundle/ s/2\. com.beust jcommander * s/.*/1.x/ * * org.apache apache pom s/.*/debian/ * * org.lightcouch lightcouch jar s/.*/debian/ * * +org.mongodb mongo-java-driver bundle s/.*/debian/ * * +org.mongodb mongo-java-driver s/jar/bundle/ s/.*/debian/ * * com.fasterxml.jackson.core jackson-core * s/.*/2.x/ * * com.fasterxml.jackson.core jackson-databind * s/.*/2.x/ * * commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * * ===================================== 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-mongodb3/src/main/java/org/apache/logging/log4j/mongodb3/MongoDbProvider.java ++++ b/log4j-mongodb3/src/main/java/org/apache/logging/log4j/mongodb3/MongoDbProvider.java +@@ -172,7 +172,7 @@ + if (Strings.isNotEmpty(userName) && Strings.isNotEmpty(password)) { + description += ", username=" + userName + ", passwordHash=" + + NameUtil.md5(password + MongoDbProvider.class.getName()); +- mongoCredential = MongoCredential.createCredential(userName, databaseName, password.toCharArray()); ++ mongoCredential = MongoCredential.createMongoCRCredential(userName, databaseName, password.toCharArray()); + } + try { + final int portInt = TypeConverters.convert(port, int.class, DEFAULT_PORT); ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ 01-disable-kafka-appender.patch +03-mongodb-compatibility.patch 05-fix-javadoc-errors.patch View it on GitLab: https://salsa.debian.org/java-team/apache-log4j2/compare/035a496fbc98c26e18ac5204236909c7dcf5be78...8cd0fd489a56ddaee741d3f37df824f10d8bac4e -- View it on GitLab: https://salsa.debian.org/java-team/apache-log4j2/compare/035a496fbc98c26e18ac5204236909c7dcf5be78...8cd0fd489a56ddaee741d3f37df824f10d8bac4e You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
