Skip to content

Commit 7eb0734

Browse files
committed
GH-3428: Make Kotlin dependency optional again
Fixes #3428 The Kotlin Gradle plugin starting with Kotlin `1.4` adds a standard Kotlin lib into `compile` scope fully ignoring an `optional` variant. See more info here: https://kotlinlang.org/docs/reference/using-gradle.html#dependency-on-the-standard-library * Add `kotlin.stdlib.default.dependency=false` into `gradle.properties` to rely only on the explicit dependency definitions in the project config * Remove explicit Kotlin deps from test scope in the target modules since it is declared globally for all the modules * Fix author emails in the `publish-maven.gradle` to their VMware variants * Remove usage of `org.jetbrains.annotations` in favor of `@Nullable` from Spring Framework
1 parent 6565b7c commit 7eb0734

File tree

6 files changed

+5
-11
lines changed

6 files changed

+5
-11
lines changed

build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -603,8 +603,6 @@ project('spring-integration-kafka') {
603603

604604
testImplementation "org.springframework.kafka:spring-kafka-test:$springKafkaVersion"
605605
testImplementation "com.willowtreeapps.assertk:assertk-jvm:$assertkVersion"
606-
testImplementation 'org.jetbrains.kotlin:kotlin-reflect'
607-
testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
608606
testImplementation "org.hamcrest:hamcrest-core:$hamcrestVersion"
609607

610608
testRuntimeOnly 'com.fasterxml.jackson.core:jackson-core'

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ version=5.4.1-SNAPSHOT
22
org.gradle.jvmargs=-Xmx1536m -Dfile.encoding=UTF-8
33
org.gradle.caching=true
44
org.gradle.parallel=true
5+
kotlin.stdlib.default.dependency=false

publish-maven.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,19 @@ publishing {
3030
developer {
3131
id = 'abilan'
3232
name = 'Artem Bilan'
33-
email = 'abilan@pivotal.io'
33+
email = 'abilan@vmware.com'
3434
roles = ["project lead"]
3535
}
3636
developer {
3737
id = 'garyrussell'
3838
name = 'Gary Russell'
39-
email = 'grussell@pivotal.io'
39+
email = 'grussell@vmware.com'
4040
roles = ["project lead emeritus"]
4141
}
4242
developer {
4343
id = 'markfisher'
4444
name = 'Mark Fisher'
45-
45+
4646
roles = ["project founder and lead emeritus"]
4747
}
4848
}

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/config/StoredProcParserUtils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.apache.commons.logging.Log;
2323
import org.apache.commons.logging.LogFactory;
24-
import org.jetbrains.annotations.NotNull;
2524
import org.w3c.dom.Element;
2625

2726
import org.springframework.beans.BeanMetadataElement;
@@ -148,7 +147,6 @@ private static void validateParameterAttributes(Element storedProcComponent, Par
148147
}
149148
}
150149

151-
@NotNull
152150
private static BeanDefinitionBuilder createParameterBeanDefinitionBuilder(Element storedProcComponent,
153151
ParserContext parserContext, String direction, String returnType) {
154152

spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisQueueInboundGateway.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import java.util.concurrent.Executor;
2020
import java.util.concurrent.TimeUnit;
2121

22-
import org.jetbrains.annotations.Nullable;
23-
2422
import org.springframework.beans.factory.BeanClassLoaderAware;
2523
import org.springframework.context.ApplicationEventPublisher;
2624
import org.springframework.context.ApplicationEventPublisherAware;
@@ -39,6 +37,7 @@
3937
import org.springframework.jmx.export.annotation.ManagedMetric;
4038
import org.springframework.jmx.export.annotation.ManagedOperation;
4139
import org.springframework.jmx.export.annotation.ManagedResource;
40+
import org.springframework.lang.Nullable;
4241
import org.springframework.messaging.Message;
4342
import org.springframework.messaging.MessagingException;
4443
import org.springframework.scheduling.SchedulingAwareRunnable;

spring-integration-stomp/src/main/java/org/springframework/integration/stomp/AbstractStompSessionManager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
import org.apache.commons.logging.Log;
2929
import org.apache.commons.logging.LogFactory;
30-
import org.jetbrains.annotations.NotNull;
3130

3231
import org.springframework.beans.factory.BeanNameAware;
3332
import org.springframework.beans.factory.DisposableBean;
@@ -215,7 +214,6 @@ private synchronized void connect() {
215214
}
216215
}
217216

218-
@NotNull
219217
private CountDownLatch addStompSessionCallback(int currentEpoch) {
220218
CountDownLatch connectLatch = new CountDownLatch(1);
221219
this.stompSessionListenableFuture.addCallback(

0 commit comments

Comments
 (0)