This is an automated email from the git hooks/post-receive script. mans0954 pushed a commit to branch master in repository mongo-java-driver.
commit 070c3b8a1af495f0096eb12bde14be509ee1786b Author: Christopher Hoskin <christopher.hos...@gmail.com> Date: Fri Dec 22 00:06:35 2017 +0000 Update patches --- debian/changelog | 1 + debian/patches/build.patch | 55 ++++++++++++++++++++++++++-------------------- debian/patches/test.patch | 4 ++-- 3 files changed, 34 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4f955a1..2cd3796 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ mongo-java-driver (3.6.0-1) UNRELEASED; urgency=medium * Update Standards-Version from 4.0.0 to 4.1.1 (no change required) * New upstream release (3.6.0) + * Update patches -- Christopher Hoskin <mans0...@debian.org> Thu, 07 Dec 2017 04:20:29 +0000 diff --git a/debian/patches/build.patch b/debian/patches/build.patch index ff45c18..8cb96a1 100644 --- a/debian/patches/build.patch +++ b/debian/patches/build.patch @@ -5,16 +5,19 @@ Last-Update: 2016-08-19 --- a/build.gradle +++ b/build.gradle -@@ -29,7 +29,7 @@ +@@ -33,9 +33,9 @@ } dependencies { classpath 'org.kordamp.gradle:clirr-gradle-plugin:0.2.2' - classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+' +// classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:1.12.+' classpath 'com.bmuschko:gradle-nexus-plugin:2.2' +- classpath "gradle.plugin.com.github.spotbugs:gradlePlugin:1.6.0" ++// classpath "gradle.plugin.com.github.spotbugs:gradlePlugin:1.6.0" } } -@@ -40,7 +40,7 @@ + +@@ -45,7 +45,7 @@ configure(subprojects.findAll { it.name != 'util' }) { apply plugin: 'java' @@ -23,7 +26,7 @@ Last-Update: 2016-08-19 evaluationDependsOn(':util') -@@ -56,7 +56,7 @@ +@@ -61,7 +61,7 @@ } dependencies { @@ -45,7 +48,7 @@ Last-Update: 2016-08-19 modifyPom { project { -@@ -55,6 +56,7 @@ +@@ -59,6 +60,7 @@ // no need to publish test dependencies pom.dependencies.removeAll { it.scope == "test" } } @@ -55,10 +58,10 @@ Last-Update: 2016-08-19 if (!version.endsWith("-SNAPSHOT")) { --- a/bson/build.gradle +++ b/bson/build.gradle -@@ -15,16 +15,18 @@ - */ +@@ -16,16 +16,18 @@ apply plugin: 'osgi' + apply plugin: 'java' -apply plugin: 'org.kordamp.gradle.clirr' +//apply plugin: 'org.kordamp.gradle.clirr' @@ -68,14 +71,14 @@ Last-Update: 2016-08-19 +/* clirr { excludeFilter = new File("$configDir/clirr-exclude.yml") - baseline 'org.mongodb:bson:3.2.0' + baseline 'org.mongodb:bson:3.4.0' failOnErrors = true } +*/ jar { manifest { -@@ -34,6 +36,7 @@ +@@ -36,6 +38,7 @@ } } @@ -83,7 +86,7 @@ Last-Update: 2016-08-19 modifyPom { project { name 'BSON' -@@ -41,3 +44,4 @@ +@@ -43,3 +46,4 @@ url 'http://bsonspec.org' } } @@ -106,28 +109,28 @@ Last-Update: 2016-08-19 +/* clirr { excludeFilter = new File("$configDir/clirr-exclude.yml") - baseline 'org.mongodb:mongodb-driver-async:3.2.0' + baseline 'org.mongodb:mongodb-driver-async:3.4.0' failOnErrors = false } +*/ tasks.withType(Checkstyle) { // needed so the Javadoc checks can find the code in other modules - classpath = files(project(':driver-core').sourceSets.main.output, sourceSets.main.output); + classpath = files(project(':driver-core').sourceSets.main.output, sourceSets.main.output) } +/* - modifyPom { - project { - name 'MongoDB Asynchronous Driver' -@@ -50,3 +53,4 @@ + jar { + manifest { + instruction 'Build-Version', getGitVersion() +@@ -60,3 +63,4 @@ url 'http://www.mongodb.org' } } +*/ --- a/driver-core/build.gradle +++ b/driver-core/build.gradle -@@ -15,23 +15,25 @@ +@@ -15,24 +15,26 @@ */ apply plugin: 'osgi' @@ -140,7 +143,7 @@ Last-Update: 2016-08-19 +/* clirr { excludeFilter = new File("$configDir/clirr-exclude.yml") - baseline 'org.mongodb:mongodb-driver-core:3.2.0' + baseline 'org.mongodb:mongodb-driver-core:3.4.0' failOnErrors = false } +*/ @@ -151,13 +154,15 @@ Last-Update: 2016-08-19 - compile "io.netty:netty-buffer:$nettyVersion", optional - compile "io.netty:netty-transport:$nettyVersion", optional - compile "io.netty:netty-handler:$nettyVersion", optional +- compile "org.xerial.snappy:snappy-java:$snappyVersion", optional + compile "io.netty:netty-buffer:$nettyVersion" //, optional + compile "io.netty:netty-transport:$nettyVersion" //, optional + compile "io.netty:netty-handler:$nettyVersion" //, optional ++ compile "org.xerial.snappy:snappy-java:$snappyVersion" //, optional testCompile project(':bson').sourceSets.test.output } -@@ -53,6 +55,7 @@ +@@ -56,6 +58,7 @@ } } @@ -165,7 +170,7 @@ Last-Update: 2016-08-19 modifyPom { project { name 'MongoDB Java Driver Core' -@@ -61,3 +64,4 @@ +@@ -64,3 +67,4 @@ url 'http://www.mongodb.org' } } @@ -188,14 +193,14 @@ Last-Update: 2016-08-19 +/* clirr { excludeFilter = new File("$configDir/clirr-exclude.yml") - baseline 'org.mongodb:mongodb-driver:3.2.0' + baseline 'org.mongodb:mongodb-driver:3.4.0' failOnErrors = false } +*/ tasks.withType(Checkstyle) { // needed so the Javadoc checks can find the code in other modules - classpath = files(project(':driver-core').sourceSets.main.output, sourceSets.main.output); + classpath = files(project(':driver-core').sourceSets.main.output, sourceSets.main.output) } +/* @@ -209,20 +214,22 @@ Last-Update: 2016-08-19 +*/ --- a/mongo-java-driver/build.gradle +++ b/mongo-java-driver/build.gradle -@@ -29,9 +29,9 @@ +@@ -27,10 +27,10 @@ // dependencies copied from driver-core dependencies { - compile "io.netty:netty-buffer:$nettyVersion", optional - compile "io.netty:netty-transport:$nettyVersion", optional - compile "io.netty:netty-handler:$nettyVersion", optional +- compile "org.xerial.snappy:snappy-java:$snappyVersion", optional + compile "io.netty:netty-buffer:$nettyVersion" //, optional + compile "io.netty:netty-transport:$nettyVersion" //, optional + compile "io.netty:netty-handler:$nettyVersion" //, optional ++ compile "org.xerial.snappy:snappy-java:$snappyVersion" //, optional } // srcDirs copied as well, so everything is compiled twice -@@ -61,6 +61,7 @@ +@@ -63,6 +63,7 @@ } } @@ -230,7 +237,7 @@ Last-Update: 2016-08-19 modifyPom { project { name 'MongoDB Java Driver' -@@ -68,3 +69,4 @@ +@@ -70,3 +71,4 @@ url 'http://www.mongodb.org' } } diff --git a/debian/patches/test.patch b/debian/patches/test.patch index b958b00..ea9afcd 100644 --- a/debian/patches/test.patch +++ b/debian/patches/test.patch @@ -7,9 +7,9 @@ Author: Christopher Hoskin <christopher.hos...@gmail.com> Last-Update: 2016-09-24 --- a/build.gradle +++ b/build.gradle -@@ -270,3 +270,11 @@ - +@@ -328,3 +328,11 @@ apply from: 'gradle/deploy.gradle' + apply from: 'gradle/TestColorOutput.gradle' +subprojects { + configurations.all { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mongo-java-driver.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