[Git][java-team/mongo-java-driver][master] 8 commits: Build with gradle-debian-helper 3.0
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Thu Nov 5 08:46:23 GMT 2026
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / mongo-java-driver
Commits:
ba4c6a3b by Emmanuel Bourg at 2026-11-05T08:13:49+01:00
Build with gradle-debian-helper 3.0
- - - - -
6189542d by Emmanuel Bourg at 2026-11-05T08:13:54+01:00
Standards-Version updated to 4.7.4
- - - - -
93aaa171 by Emmanuel Bourg at 2026-11-05T08:13:59+01:00
Switch to debhelper level 13
- - - - -
5f738405 by Emmanuel Bourg at 2026-11-05T08:31:41+01:00
Imported the NMU 3.6.3-2.1
- - - - -
97bfe9ee by Emmanuel Bourg at 2026-11-05T09:10:39+01:00
Fixed the compatibility with Gradle 5
- - - - -
21340fed by Emmanuel Bourg at 2026-11-05T09:10:39+01:00
Removed the Priority field
- - - - -
b40199fa by Emmanuel Bourg at 2026-11-05T09:10:39+01:00
Converted debian/watch to the version 5 format
- - - - -
42e30010 by Emmanuel Bourg at 2026-11-05T09:12:06+01:00
Upload to unstable
- - - - -
11 changed files:
- debian/changelog
- − debian/compat
- debian/control
- + debian/gradle.ignoreRules
- debian/maven.ignoreRules
- debian/orig-tar.sh
- debian/patches/build.patch
- + debian/patches/gradle-compatibility.patch
- debian/patches/gradle.patch
- debian/patches/series
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,22 @@
+mongo-java-driver (3.6.3-3) unstable; urgency=medium
+
+ * Team upload.
+ * Build with gradle-debian-helper 3.0
+ * Fixed the compatibility with Gradle 5
+ * Standards-Version updated to 4.7.4
+ * Switch to debhelper level 13
+ * Removed the Priority field
+ * Converted debian/watch to the version 5 format
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 05 Nov 2026 09:12:06 +0100
+
+mongo-java-driver (3.6.3-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop unnecessary Build-Depends: libcodenarc-groovy-java. (Closes: #1109752)
+
+ -- Bastian Germann <bage at debian.org> Tue, 25 Nov 2025 17:31:35 +0100
+
mongo-java-driver (3.6.3-2) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11
=====================================
debian/control
=====================================
@@ -1,21 +1,19 @@
Source: mongo-java-driver
Section: java
-Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders:
Emmanuel Bourg <ebourg at apache.org>,
Christopher Hoskin <mans0954 at debian.org>
Build-Depends:
- debhelper (>= 11),
+ debhelper-compat (= 13),
default-jdk,
- gradle-debian-helper (>= 1.4),
+ gradle-debian-helper (>= 3.0),
iproute2,
libnetty-java,
libsnappy-java,
- libcodenarc-groovy-java,
libspock-java,
maven-repo-helper
-Standards-Version: 4.3.0
+Standards-Version: 4.7.4
Vcs-Git: https://salsa.debian.org/java-team/mongo-java-driver.git
Vcs-Browser: https://salsa.debian.org/java-team/mongo-java-driver
Homepage: http://www.mongodb.org
=====================================
debian/gradle.ignoreRules
=====================================
@@ -0,0 +1,7 @@
+# The plugins unavailable in Debian, and the configuration blocks that stop
+# existing with them.
+
+optional-base
+com.bmuschko.nexus modifyPom
+org.kordamp.gradle.clirr clirr
+com.github.spotbugs spotbugs, com.github.spotbugs.SpotBugsTask
=====================================
debian/maven.ignoreRules
=====================================
@@ -16,3 +16,5 @@
org.kordamp.gradle clirr-gradle-plugin * * * *
com.bmuschko gradle-nexus-plugin * * * *
org.sonatype.oss oss-parent * * * *
+com.netflix.nebula gradle-extra-configurations-plugin * * * *
+gradle.plugin.com.github.spotbugs gradlePlugin * * * *
=====================================
debian/orig-tar.sh
=====================================
@@ -5,7 +5,8 @@ VERSION=$2
DIR=mongo-java-driver-r${VERSION}
TAR=../mongo-java-driver_${VERSION}.orig.tar.xz
-tar -xf $3
+mkdir $DIR
+tar -xf $3 --strip-components=1 -C $DIR
rm $3
XZ_OPT=--best tar -c -v -J -f $TAR --exclude '*.jar' --exclude 'gradlew*' --exclude 'gradle/wrapper' $DIR
rm -Rf $DIR
=====================================
debian/patches/build.patch
=====================================
@@ -17,15 +17,6 @@ Last-Update: 2016-08-19
}
}
-@@ -45,7 +45,7 @@
-
- configure(subprojects.findAll { it.name != 'util' }) {
- apply plugin: 'java'
-- apply plugin: 'optional-base'
-+// apply plugin: 'optional-base'
-
- evaluationDependsOn(':util')
-
@@ -61,7 +61,7 @@
}
@@ -35,119 +26,9 @@ Last-Update: 2016-08-19
}
/* Compiling */
---- a/gradle/deploy.gradle
-+++ b/gradle/deploy.gradle
-@@ -20,8 +20,9 @@
- * Ensure you have configured ~/.gradle/gradle.properties for both the nexus and signing plugins
- */
- configure(subprojects - project(':util')) {
-- apply plugin: 'com.bmuschko.nexus'
-+// apply plugin: 'com.bmuschko.nexus'
-
-+/*
- modifyPom {
- project {
-
-@@ -59,6 +60,7 @@
- // no need to publish test dependencies
- pom.dependencies.removeAll { it.scope == "test" }
- }
-+*/
-
- task uploadSnapshotArchives(dependsOn: uploadArchives) {
- if (!version.endsWith("-SNAPSHOT")) {
---- a/bson/build.gradle
-+++ b/bson/build.gradle
-@@ -16,16 +16,18 @@
-
- apply plugin: 'osgi'
- apply plugin: 'java'
--apply plugin: 'org.kordamp.gradle.clirr'
-+//apply plugin: 'org.kordamp.gradle.clirr'
-
- def configDir = new File(rootDir, 'config')
- archivesBaseName = 'bson'
-
-+/*
- clirr {
- excludeFilter = new File("$configDir/clirr-exclude.yml")
- baseline 'org.mongodb:bson:3.4.0'
- failOnErrors = true
- }
-+*/
-
- jar {
- manifest {
-@@ -36,6 +38,7 @@
- }
- }
-
-+/*
- modifyPom {
- project {
- name 'BSON'
-@@ -43,3 +46,4 @@
- url 'http://bsonspec.org'
- }
- }
-+*/
---- a/driver-async/build.gradle
-+++ b/driver-async/build.gradle
-@@ -15,7 +15,7 @@
- */
-
- apply plugin: 'osgi'
--apply plugin: 'org.kordamp.gradle.clirr'
-+//apply plugin: 'org.kordamp.gradle.clirr'
-
- def configDir = new File(rootDir, 'config')
- archivesBaseName = 'mongodb-driver-async'
-@@ -32,17 +32,20 @@
- testCompile project(':driver-core').sourceSets.test.output
- }
-
-+/*
- clirr {
- excludeFilter = new File("$configDir/clirr-exclude.yml")
- 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)
- }
-
-+/*
- 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,24 +15,26 @@
- */
-
- apply plugin: 'osgi'
--apply plugin: 'org.kordamp.gradle.clirr'
-+//apply plugin: 'org.kordamp.gradle.clirr'
-
- def configDir = new File(rootDir, 'config')
- archivesBaseName = 'mongodb-driver-core'
-
-+/*
- clirr {
- excludeFilter = new File("$configDir/clirr-exclude.yml")
- baseline 'org.mongodb:mongodb-driver-core:3.4.0'
- failOnErrors = false
- }
-+*/
-
+@@ -29,10 +29,10 @@
dependencies {
compile project(':bson')
@@ -162,56 +43,6 @@ Last-Update: 2016-08-19
testCompile project(':bson').sourceSets.test.output
}
-@@ -56,6 +58,7 @@
- }
- }
-
-+/*
- modifyPom {
- project {
- name 'MongoDB Java Driver Core'
-@@ -64,3 +67,4 @@
- url 'http://www.mongodb.org'
- }
- }
-+*/
---- a/driver/build.gradle
-+++ b/driver/build.gradle
-@@ -14,7 +14,7 @@
- * limitations under the License.
- */
-
--apply plugin: 'org.kordamp.gradle.clirr'
-+//apply plugin: 'org.kordamp.gradle.clirr'
-
- archivesBaseName = 'mongodb-driver'
- def configDir = new File(rootDir, 'config')
-@@ -35,17 +35,20 @@
- testCompile project(':driver-core').sourceSets.test.output
- }
-
-+/*
- clirr {
- excludeFilter = new File("$configDir/clirr-exclude.yml")
- 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)
- }
-
-+/*
- modifyPom {
- project {
- name 'MongoDB Driver'
-@@ -53,3 +56,4 @@
- url 'http://www.mongodb.org'
- }
- }
-+*/
--- a/mongo-java-driver/build.gradle
+++ b/mongo-java-driver/build.gradle
@@ -27,10 +27,10 @@
@@ -229,16 +60,3 @@ Last-Update: 2016-08-19
}
// srcDirs copied as well, so everything is compiled twice
-@@ -63,6 +63,7 @@
- }
- }
-
-+/*
- modifyPom {
- project {
- name 'MongoDB Java Driver'
-@@ -70,3 +71,4 @@
- url 'http://www.mongodb.org'
- }
- }
-+*/
=====================================
debian/patches/gradle-compatibility.patch
=====================================
@@ -0,0 +1,17 @@
+Description: Fix the compatibility with Gradle 5
+ Gradle 5 no longer allows the wrapper task to be redefined.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -307,10 +307,6 @@
+ //////////////////////////////////////////
+ // Root project configuration //
+ //////////////////////////////////////////
+-task wrapper(type: Wrapper) {
+- gradleVersion = '4.0.1'
+-}
+-
+ gradle.buildFinished { BuildResult result ->
+ if (result.failure && !JavaVersion.current().isJava8Compatible()) {
+ gradle.rootProject.logger.error("\nWARNING:\nJDK ${JavaVersion.VERSION_1_8} is required to build the driver: " +
=====================================
debian/patches/gradle.patch
=====================================
@@ -5,14 +5,12 @@ Subject: gradle
Fix various build failures which are caused by Debian's currently outdated
Gradle version. The patch has to be revised when we ship Gradle >= 4.
---
- build.gradle | 21 +++++++--------------
- 1 file changed, 7 insertions(+), 14 deletions(-)
+ build.gradle | 10 +---------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
-diff --git a/build.gradle b/build.gradle
-index 0232026..f72034f 100644
--- a/build.gradle
+++ b/build.gradle
-@@ -114,7 +114,7 @@ configure(subprojects.findAll { it.name != 'util' }) {
+@@ -114,7 +114,7 @@
options.author = true
options.version = true
options.links 'http://docs.oracle.com/javase/7/docs/api/'
@@ -21,7 +19,7 @@ index 0232026..f72034f 100644
options.taglets 'ManualTaglet'
options.taglets 'DochubTaglet'
options.taglets 'ServerReleaseTaglet'
-@@ -156,20 +156,13 @@ configure(subprojects.findAll { it.name != 'util' }) {
+@@ -156,14 +156,7 @@
def getGitVersion() {
def outputAsString
@@ -37,38 +35,3 @@ index 0232026..f72034f 100644
return outputAsString
}
- configure(subprojects.findAll { it.name != 'util' && it.name != 'mongo-java-driver' }) {
- apply plugin: 'checkstyle'
-- apply plugin: "com.github.spotbugs"
-+ //apply plugin: "com.github.spotbugs"
- apply plugin: 'jacoco'
- apply plugin: 'groovy'
- apply plugin: 'codenarc'
-@@ -270,23 +263,23 @@ configure(subprojects.findAll { it.name != 'util' && it.name != 'mongo-java-driv
- configProperties.checkstyleConfigDir = configDir
- }
-
-- spotbugs {
-+ /*spotbugs {
- excludeFilter = new File(configDir, 'findbugs-exclude.xml')
- sourceSets = [sourceSets.main]
- toolVersion = '3.1.0'
-- }
-+ }*/
-
- codenarc {
- toolVersion = '1.0'
- reportFormat = project.buildingWith('xmlReports.enabled') ? 'xml' : 'html'
- }
-
-- tasks.withType(com.github.spotbugs.SpotBugsTask) {
-+ /*tasks.withType(com.github.spotbugs.SpotBugsTask) {
- reports {
- xml.enabled = project.buildingWith('xmlReports.enabled')
- html.enabled = !project.buildingWith('xmlReports.enabled')
- }
-- }
-+ }*/
-
- tasks.withType(Test) {
- def jdkHome = findProperty("jdkHome")
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ build.patch
test.patch
gradle.patch
java10.patch
+gradle-compatibility.patch
=====================================
debian/watch
=====================================
@@ -1,2 +1,6 @@
-version=3
-https://github.com/mongodb/mongo-java-driver/releases .*/r?([\d\.]+).tar.gz debian debian/orig-tar.sh
+Version: 5
+Mode: git
+Source: https://github.com/mongodb/mongo-java-driver
+Matching-Pattern: refs/tags/r([\d.]+)
+Update-Script: debian/orig-tar.sh
+Compression: xz
View it on GitLab: https://salsa.debian.org/java-team/mongo-java-driver/-/compare/9866ccd329689a1b20320aa004ee88fafcdb5411...42e30010e4664d9967b9d45a4926ccf4c21bbdfd
--
View it on GitLab: https://salsa.debian.org/java-team/mongo-java-driver/-/compare/9866ccd329689a1b20320aa004ee88fafcdb5411...42e30010e4664d9967b9d45a4926ccf4c21bbdfd
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20261105/48fe50ed/attachment.htm>
More information about the pkg-java-commits
mailing list