Tony Mancill pushed to branch master at Debian Java Maintainers / apache-log4j2
Commits: 4d8cf449 by tony mancill at 2019-01-12T19:12:44Z Drop support for mongodb (Debian: #919095) - - - - - c396a1b5 by tony mancill at 2019-01-12T19:33:34Z Bump Standards-Version to 4.3.0 - - - - - 035a496f by tony mancill at 2019-01-12T19:44:58Z prepare changelog for upload - - - - - 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,11 @@ +apache-log4j2 (2.11.1-2) unstable; urgency=medium + + * Team upload. + * Drop support for mongodb (Closes: #919095) + * Standards-Version updated to 4.3.0 + + -- tony mancill <[email protected]> Sat, 12 Jan 2019 11:33:45 -0800 + apache-log4j2 (2.11.1-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -38,14 +38,13 @@ Build-Depends: libmaven-install-plugin-java, libmaven-javadoc-plugin-java, libmaven-source-plugin-java, - libmongodb-java, libnetty-java, libosgi-core-java, libservlet3.1-java, libslf4j-java, libwoodstox-java, maven-debian-helper (>= 1.5) -Standards-Version: 4.1.5 +Standards-Version: 4.3.0 Vcs-Git: https://salsa.debian.org/java-team/apache-log4j2.git Vcs-Browser: https://salsa.debian.org/java-team/apache-log4j2 Homepage: http://logging.apache.org/log4j/2.x/ ===================================== 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 --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 ===================================== @@ -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 ===================================== @@ -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 deleted ===================================== @@ -1,14 +0,0 @@ -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,3 +1,2 @@ 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/e53214dd1bac60e1743463c2391d40846bb451a7...035a496fbc98c26e18ac5204236909c7dcf5be78 -- View it on GitLab: https://salsa.debian.org/java-team/apache-log4j2/compare/e53214dd1bac60e1743463c2391d40846bb451a7...035a496fbc98c26e18ac5204236909c7dcf5be78 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
