Skip to content

Commit 6e3e706

Browse files
committed
Changed the project name in the configuration to align with the artifactId, ensuring that the 'optional' plugin functions correctly.
JAVA-5582
1 parent 28c5b83 commit 6e3e706

File tree

6 files changed

+6
-18
lines changed

6 files changed

+6
-18
lines changed

driver-benchmarks/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ sourceSets {
3131

3232
dependencies {
3333
api project(':driver-sync')
34-
api project(':mongocrypt')
34+
api project(':mongodb-crypt')
3535
implementation "ch.qos.logback:logback-classic:$logbackVersion"
3636
}
3737

driver-core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies {
4545
implementation project(path: ':bson-record-codec', configuration: 'default')
4646
implementation project(path: ':bson-kotlin', configuration: 'default'), optional
4747
implementation project(path: ':bson-kotlinx', configuration: 'default'), optional
48-
mongoCryptSupportImplementation project(path: ':mongocrypt', configuration: 'default')
48+
implementation project(path: ':mongodb-crypt', configuration: 'default'), optional
4949

5050
implementation "com.github.jnr:jnr-unixsocket:$jnrUnixsocketVersion", optional
5151
api platform("io.netty:netty-bom:$nettyVersion")

driver-reactive-streams/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,9 @@
1717
description = "A Reactive Streams implementation of the MongoDB Java driver"
1818
archivesBaseName = 'mongodb-driver-reactivestreams'
1919

20-
java {
21-
registerFeature("mongoCryptSupport") {
22-
usingSourceSet(sourceSets["main"])
23-
}
24-
}
25-
2620
dependencies {
2721
api project(path: ':bson', configuration: 'default')
2822
api project(path: ':driver-core', configuration: 'default')
29-
mongoCryptSupportImplementation project(path: ':mongocrypt', configuration: 'default')
3023

3124
api 'org.reactivestreams:reactive-streams:1.0.4'
3225
implementation platform("io.projectreactor:reactor-bom:$projectReactorVersion")

driver-sync/build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,9 @@ ext {
2020
pomName = 'MongoDB Driver'
2121
}
2222

23-
java {
24-
registerFeature("mongoCryptSupport") {
25-
usingSourceSet(sourceSets["main"])
26-
}
27-
}
28-
2923
dependencies {
3024
api project(path: ':bson', configuration: 'default')
3125
api project(path: ':driver-core', configuration: 'default')
32-
mongoCryptSupportImplementation project(path: ':mongocrypt', configuration: 'default')
3326

3427
testImplementation project(':bson').sourceSets.test.output
3528
testImplementation project(':driver-core').sourceSets.test.output

graalvm-native-image-app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ dependencies {
8282
implementation project(path:':driver-sync', configuration:'archives')
8383
implementation project(path:':driver-reactive-streams', configuration:'archives')
8484
implementation project(path:':driver-legacy', configuration:'archives')
85-
implementation project(path: ':mongocrypt', configuration: 'archives')
86-
implementation project(path: ':mongocrypt', configuration: 'runtimeElements')
85+
implementation project(path: ':mongodb-crypt', configuration: 'archives')
86+
implementation project(path: ':mongodb-crypt', configuration: 'runtimeElements')
8787
// note that as a result of these `sourceSets` dependencies, `driver-sync/src/test/resources/logback-test.xml` is used
8888
implementation project(':driver-core').sourceSets.test.output
8989
implementation project(':driver-sync').sourceSets.test.output

settings.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ include ':driver-kotlin-coroutine'
3030
include ':bson-scala'
3131
include ':driver-scala'
3232
include ':mongocrypt'
33+
// Project name is different from the folder name because "optional plugin" needs project name to match the artifactId.
34+
project(":mongocrypt").name = "mongodb-crypt"
3335
include 'util:spock'
3436
include 'util:taglets'
3537
include ':graalvm-native-image-app'

0 commit comments

Comments
 (0)