Commit 4d8cf449 authored by Tony Mancill's avatar Tony Mancill
Browse files

Drop support for mongodb (Debian: #919095)

parent e53214dd

debian/control

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 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

+1 −1
Original line number Diff line number Diff line
@@ -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 --has-package-version --java-lib

log4j-mongodb3/pom.xml --ignore

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

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 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

+0 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 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

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
Description: Fixes the compatibility with the version of the MongoDB driver in Debian

Author: Emmanuel Bourg <ebourg@apache.org>

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);