From d4815feea16decfef727910d7524ba2c3e0546a6 Mon Sep 17 00:00:00 2001
From: Viacheslav Babanin <18335884+vbabanin@users.noreply.github.com>
Date: Fri, 10 Jan 2025 01:40:33 +0000
Subject: [PATCH 1/7] Version: bump 5.3.0
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index df2f70c49de..b0342dbd8e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,7 +76,7 @@ configure(coreProjects) {
apply plugin: 'idea'
group = 'org.mongodb'
- version = '5.3.0-SNAPSHOT'
+ version = '5.3.0'
repositories {
mavenLocal()
From 07ceb695ae07f3b3de5360b7ab19c6e868fa9892 Mon Sep 17 00:00:00 2001
From: Viacheslav Babanin <18335884+vbabanin@users.noreply.github.com>
Date: Fri, 10 Jan 2025 01:40:33 +0000
Subject: [PATCH 2/7] Version: bump 5.3.1-SNAPSHOT
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index b0342dbd8e4..6af87196605 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,7 +76,7 @@ configure(coreProjects) {
apply plugin: 'idea'
group = 'org.mongodb'
- version = '5.3.0'
+ version = '5.3.1-SNAPSHOT'
repositories {
mavenLocal()
From 36b5504f24ba5c26208abc1a7c4917d22bb18abc Mon Sep 17 00:00:00 2001
From: Nabil Hachicha <nabil.hachicha@gmail.com>
Date: Thu, 23 Jan 2025 10:32:05 +0000
Subject: [PATCH 3/7] Backport #5751 to 5.3.x (#1604)
* Fixing default module name for kotlin-extensions (#1602)
---
driver-kotlin-extensions/build.gradle.kts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/driver-kotlin-extensions/build.gradle.kts b/driver-kotlin-extensions/build.gradle.kts
index 25b437e0fad..76f36ca33b2 100644
--- a/driver-kotlin-extensions/build.gradle.kts
+++ b/driver-kotlin-extensions/build.gradle.kts
@@ -165,4 +165,6 @@ tasks.javadocJar.configure {
// ===========================
tasks.sourcesJar { from(project.sourceSets.main.map { it.kotlin }) }
-afterEvaluate { tasks.jar { manifest { attributes["Automatic-Module-Name"] = "org.mongodb.driver.kotlin.core" } } }
+afterEvaluate {
+ tasks.jar { manifest { attributes["Automatic-Module-Name"] = "org.mongodb.driver.kotlin.extensions" } }
+}
From 6af87152116731431d41ca56d538c445ac26edd9 Mon Sep 17 00:00:00 2001
From: Nabil Hachicha <1793238+nhachicha@users.noreply.github.com>
Date: Thu, 23 Jan 2025 11:26:12 +0000
Subject: [PATCH 4/7] Version: bump 5.3.1
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 6af87196605..4110282d11d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,7 +76,7 @@ configure(coreProjects) {
apply plugin: 'idea'
group = 'org.mongodb'
- version = '5.3.1-SNAPSHOT'
+ version = '5.3.1'
repositories {
mavenLocal()
From 93f0c182775e434617c667e0849c24769b456560 Mon Sep 17 00:00:00 2001
From: Nabil Hachicha <1793238+nhachicha@users.noreply.github.com>
Date: Thu, 23 Jan 2025 11:26:12 +0000
Subject: [PATCH 5/7] Version: bump 5.3.2-SNAPSHOT
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 4110282d11d..7ed2112856d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,7 +76,7 @@ configure(coreProjects) {
apply plugin: 'idea'
group = 'org.mongodb'
- version = '5.3.1'
+ version = '5.3.2-SNAPSHOT'
repositories {
mavenLocal()
From 2a1d5556fb835b23fb274216d8478cca7d4a1391 Mon Sep 17 00:00:00 2001
From: Viacheslav Babanin <slav.babanin@mongodb.com>
Date: Mon, 3 Feb 2025 21:58:35 -0800
Subject: [PATCH 6/7] Remove deprecation warnings. (#1613) (#1614)
JAVA-5770
---
.../src/main/com/mongodb/ConnectionString.java | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/driver-core/src/main/com/mongodb/ConnectionString.java b/driver-core/src/main/com/mongodb/ConnectionString.java
index 69db84eb072..062ca1d45c2 100644
--- a/driver-core/src/main/com/mongodb/ConnectionString.java
+++ b/driver-core/src/main/com/mongodb/ConnectionString.java
@@ -509,7 +509,6 @@ public ConnectionString(final String connectionString, @Nullable final DnsClient
credential = createCredentials(combinedOptionsMaps, userName, password);
warnOnUnsupportedOptions(combinedOptionsMaps);
- warnDeprecatedTimeouts(combinedOptionsMaps);
}
private static final Set<String> GENERAL_OPTIONS_KEYS = new LinkedHashSet<>();
@@ -518,7 +517,6 @@ public ConnectionString(final String connectionString, @Nullable final DnsClient
private static final Set<String> WRITE_CONCERN_KEYS = new HashSet<>();
private static final Set<String> COMPRESSOR_KEYS = new HashSet<>();
private static final Set<String> ALL_KEYS = new HashSet<>();
- private static final Set<String> DEPRECATED_TIMEOUT_KEYS = new HashSet<>();
static {
GENERAL_OPTIONS_KEYS.add("minpoolsize");
@@ -592,10 +590,6 @@ public ConnectionString(final String connectionString, @Nullable final DnsClient
ALL_KEYS.addAll(READ_PREFERENCE_KEYS);
ALL_KEYS.addAll(WRITE_CONCERN_KEYS);
ALL_KEYS.addAll(COMPRESSOR_KEYS);
-
- DEPRECATED_TIMEOUT_KEYS.add("sockettimeoutms");
- DEPRECATED_TIMEOUT_KEYS.add("waitqueuetimeoutms");
- DEPRECATED_TIMEOUT_KEYS.add("wtimeoutms");
}
// Any options contained in the connection string completely replace the corresponding options specified in TXT records,
@@ -616,15 +610,6 @@ private void warnOnUnsupportedOptions(final Map<String, List<String>> optionsMap
.forEach(k -> LOGGER.warn(format("Connection string contains unsupported option '%s'.", k)));
}
}
- private void warnDeprecatedTimeouts(final Map<String, List<String>> optionsMap) {
- if (LOGGER.isWarnEnabled()) {
- optionsMap.keySet()
- .stream()
- .filter(DEPRECATED_TIMEOUT_KEYS::contains)
- .forEach(k -> LOGGER.warn(format("Use of deprecated timeout option: '%s'. Prefer 'timeoutMS' instead.", k)));
- }
- }
-
private void translateOptions(final Map<String, List<String>> optionsMap) {
boolean tlsInsecureSet = false;
From cd2161918cff371fbe82b4bf0186056a6d011561 Mon Sep 17 00:00:00 2001
From: Maxim Katcharov <maxim.katcharov@mongodb.com>
Date: Thu, 13 Feb 2025 10:38:19 -0700
Subject: [PATCH 7/7] Stop ignoring id parameter (#1622) (#1631)
JAVA-5728
---
.../client/internal/gridfs/GridFSBucketImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSBucketImpl.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSBucketImpl.java
index 1e81db2045e..948c666489c 100644
--- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSBucketImpl.java
+++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/gridfs/GridFSBucketImpl.java
@@ -208,7 +208,7 @@ public GridFSUploadPublisher<Void> uploadFromPublisher(final ClientSession clien
final Publisher<ByteBuffer> source,
final GridFSUploadOptions options) {
return createGridFSUploadPublisher(chunkSizeBytes, filesCollection, chunksCollection,
- notNull("clientSession", clientSession), new BsonObjectId(), filename, options, source);
+ notNull("clientSession", clientSession), id, filename, options, source);
}
@Override