diff --git a/dependencies.gradle b/dependencies.gradle index b44dc2289..20cfeb240 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -25,6 +25,8 @@ * The dependencies are sorted alphabetically. */ ext { + annotationApiVersion = '3.0.0' + assertjCoreVersion = '3.26.0' asyncapiCoreVersion = '1.0.0-EAP-2' @@ -35,8 +37,6 @@ ext { commonsLang3Version = '3.14.0' - jsr305Version = '3.0.2' - kafkaAvroSerializerVersion = '7.6.0' kafkaClientsVersion = '3.7.0' diff --git a/springwolf-bindings/springwolf-kafka-binding/build.gradle b/springwolf-bindings/springwolf-kafka-binding/build.gradle index d09057956..8e52907bb 100644 --- a/springwolf-bindings/springwolf-kafka-binding/build.gradle +++ b/springwolf-bindings/springwolf-kafka-binding/build.gradle @@ -14,6 +14,8 @@ dependencies { implementation "org.springframework:spring-core" implementation "org.springframework.boot:spring-boot-autoconfigure" + implementation "jakarta.annotation:jakarta.annotation-api:${annotationApiVersion}" + testImplementation "org.assertj:assertj-core:${assertjCoreVersion}" testImplementation "org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}" diff --git a/springwolf-bindings/springwolf-kafka-binding/src/main/java/io/github/springwolf/bindings/kafka/scanners/operations/KafkaOperationBindingProcessor.java b/springwolf-bindings/springwolf-kafka-binding/src/main/java/io/github/springwolf/bindings/kafka/scanners/operations/KafkaOperationBindingProcessor.java index 133a04c41..ea9bb161a 100644 --- a/springwolf-bindings/springwolf-kafka-binding/src/main/java/io/github/springwolf/bindings/kafka/scanners/operations/KafkaOperationBindingProcessor.java +++ b/springwolf-bindings/springwolf-kafka-binding/src/main/java/io/github/springwolf/bindings/kafka/scanners/operations/KafkaOperationBindingProcessor.java @@ -7,7 +7,7 @@ import io.github.springwolf.bindings.kafka.annotations.KafkaAsyncOperationBinding; import io.github.springwolf.core.asyncapi.scanners.bindings.operations.AbstractOperationBindingProcessor; import io.github.springwolf.core.asyncapi.scanners.bindings.operations.ProcessedOperationBinding; -import org.springframework.lang.Nullable; +import jakarta.annotation.Nullable; import org.springframework.util.StringUtils; import java.util.List; diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/utils/AnnotationScannerUtil.java b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/utils/AnnotationScannerUtil.java index 297aa60a6..88e7a3878 100644 --- a/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/utils/AnnotationScannerUtil.java +++ b/springwolf-core/src/main/java/io/github/springwolf/core/asyncapi/scanners/common/utils/AnnotationScannerUtil.java @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 package io.github.springwolf.core.asyncapi.scanners.common.utils; +import jakarta.annotation.Nullable; import org.springframework.core.annotation.MergedAnnotation; import org.springframework.core.annotation.MergedAnnotationCollectors; import org.springframework.core.annotation.MergedAnnotationPredicates; import org.springframework.core.annotation.MergedAnnotations; import org.springframework.core.annotation.RepeatableContainers; -import org.springframework.lang.Nullable; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/configuration/docket/DefaultAsyncApiDocketService.java b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/docket/DefaultAsyncApiDocketService.java index 9f4c176a9..a4d938ae0 100644 --- a/springwolf-core/src/main/java/io/github/springwolf/core/configuration/docket/DefaultAsyncApiDocketService.java +++ b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/docket/DefaultAsyncApiDocketService.java @@ -4,9 +4,9 @@ import io.github.springwolf.asyncapi.v3.model.info.Info; import io.github.springwolf.asyncapi.v3.model.server.Server; import io.github.springwolf.core.configuration.properties.SpringwolfConfigProperties; +import jakarta.annotation.Nullable; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.lang.Nullable; import org.springframework.util.StringUtils; import java.util.Map; diff --git a/springwolf-core/src/main/java/io/github/springwolf/core/configuration/properties/SpringwolfConfigProperties.java b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/properties/SpringwolfConfigProperties.java index a074d2f9a..8877a5f48 100644 --- a/springwolf-core/src/main/java/io/github/springwolf/core/configuration/properties/SpringwolfConfigProperties.java +++ b/springwolf-core/src/main/java/io/github/springwolf/core/configuration/properties/SpringwolfConfigProperties.java @@ -6,11 +6,11 @@ import io.github.springwolf.asyncapi.v3.model.info.License; import io.github.springwolf.asyncapi.v3.model.server.Server; import io.github.springwolf.core.configuration.docket.AsyncApiDocket; +import jakarta.annotation.Nullable; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; -import org.springframework.lang.Nullable; import java.util.Map; import java.util.stream.Collectors; diff --git a/springwolf-examples/springwolf-stomp-example/build.gradle b/springwolf-examples/springwolf-stomp-example/build.gradle index 1b0f388d8..49161b3a5 100644 --- a/springwolf-examples/springwolf-stomp-example/build.gradle +++ b/springwolf-examples/springwolf-stomp-example/build.gradle @@ -46,6 +46,8 @@ dependencies { testImplementation "org.testcontainers:testcontainers:${testcontainersVersion}" testImplementation "org.testcontainers:junit-jupiter:${testcontainersVersion}" + testImplementation "jakarta.annotation:jakarta.annotation-api:${annotationApiVersion}" + testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}" testCompileOnly "org.projectlombok:lombok:${lombokVersion}" } diff --git a/springwolf-examples/springwolf-stomp-example/src/test/java/io/github/springwolf/examples/stomp/stomp/util/BaseStompUtil.java b/springwolf-examples/springwolf-stomp-example/src/test/java/io/github/springwolf/examples/stomp/stomp/util/BaseStompUtil.java index 17766d643..3d7570da9 100644 --- a/springwolf-examples/springwolf-stomp-example/src/test/java/io/github/springwolf/examples/stomp/stomp/util/BaseStompUtil.java +++ b/springwolf-examples/springwolf-stomp-example/src/test/java/io/github/springwolf/examples/stomp/stomp/util/BaseStompUtil.java @@ -1,9 +1,9 @@ // SPDX-License-Identifier: Apache-2.0 package io.github.springwolf.examples.stomp.stomp.util; +import jakarta.annotation.Nullable; import lombok.extern.slf4j.Slf4j; import org.springframework.lang.NonNull; -import org.springframework.lang.Nullable; import org.springframework.messaging.converter.MappingJackson2MessageConverter; import org.springframework.messaging.simp.stomp.StompCommand; import org.springframework.messaging.simp.stomp.StompFrameHandler; diff --git a/springwolf-plugins/springwolf-amqp-plugin/build.gradle b/springwolf-plugins/springwolf-amqp-plugin/build.gradle index 4fd189c84..57819cd88 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/build.gradle +++ b/springwolf-plugins/springwolf-amqp-plugin/build.gradle @@ -22,12 +22,11 @@ dependencies { implementation "org.springframework.amqp:spring-amqp" implementation "org.springframework.amqp:spring-rabbit" - compileOnly "com.google.code.findbugs:jsr305:${jsr305Version}" - permitUnusedDeclared "com.google.code.findbugs:jsr305:${jsr305Version}" - annotationProcessor "org.projectlombok:lombok:${lombokVersion}" compileOnly "org.projectlombok:lombok:${lombokVersion}" + implementation "jakarta.annotation:jakarta.annotation-api:${annotationApiVersion}" + annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}" diff --git a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/properties/SpringwolfAmqpConfigProperties.java b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/properties/SpringwolfAmqpConfigProperties.java index bbacd602d..b16d12c83 100644 --- a/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/properties/SpringwolfAmqpConfigProperties.java +++ b/springwolf-plugins/springwolf-amqp-plugin/src/main/java/io/github/springwolf/plugins/amqp/configuration/properties/SpringwolfAmqpConfigProperties.java @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 package io.github.springwolf.plugins.amqp.configuration.properties; +import jakarta.annotation.Nullable; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.lang.Nullable; /** * This class is used to create metadata for auto-completion in spring configuration properties/yaml by using diff --git a/springwolf-plugins/springwolf-jms-plugin/build.gradle b/springwolf-plugins/springwolf-jms-plugin/build.gradle index 2505419c6..97e2dd5f5 100644 --- a/springwolf-plugins/springwolf-jms-plugin/build.gradle +++ b/springwolf-plugins/springwolf-jms-plugin/build.gradle @@ -14,6 +14,7 @@ dependencies { implementation "jakarta.jms:jakarta.jms-api" + implementation "jakarta.annotation:jakarta.annotation-api:${annotationApiVersion}" implementation "org.slf4j:slf4j-api:${slf4jApiVersion}" runtimeOnly "org.apache.activemq:activemq-broker" @@ -26,9 +27,6 @@ dependencies { implementation "org.springframework.boot:spring-boot" implementation "org.springframework.boot:spring-boot-autoconfigure" - compileOnly "com.google.code.findbugs:jsr305:${jsr305Version}" - permitUnusedDeclared "com.google.code.findbugs:jsr305:${jsr305Version}" - annotationProcessor "org.projectlombok:lombok:${lombokVersion}" compileOnly "org.projectlombok:lombok:${lombokVersion}" diff --git a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/properties/SpringwolfJmsConfigProperties.java b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/properties/SpringwolfJmsConfigProperties.java index 5bcd0e5a3..a8dfcc9d7 100644 --- a/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/properties/SpringwolfJmsConfigProperties.java +++ b/springwolf-plugins/springwolf-jms-plugin/src/main/java/io/github/springwolf/plugins/jms/configuration/properties/SpringwolfJmsConfigProperties.java @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 package io.github.springwolf.plugins.jms.configuration.properties; +import jakarta.annotation.Nullable; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.lang.Nullable; /** * This class is used to create metadata for auto-completion in spring configuration properties/yaml by using diff --git a/springwolf-plugins/springwolf-kafka-plugin/build.gradle b/springwolf-plugins/springwolf-kafka-plugin/build.gradle index 794b43623..c182fcdb3 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/build.gradle +++ b/springwolf-plugins/springwolf-kafka-plugin/build.gradle @@ -15,6 +15,8 @@ dependencies { implementation "io.swagger.core.v3:swagger-models-jakarta:${swaggerVersion}" permitUnusedDeclared "io.swagger.core.v3:swagger-models-jakarta:${swaggerVersion}" implementation "org.apache.kafka:kafka-clients:${kafkaClientsVersion}" + + implementation "jakarta.annotation:jakarta.annotation-api:${annotationApiVersion}" implementation "org.slf4j:slf4j-api:${slf4jApiVersion}" implementation "org.springframework:spring-context" @@ -26,9 +28,6 @@ dependencies { implementation "org.springframework.kafka:spring-kafka" - compileOnly "com.google.code.findbugs:jsr305:${jsr305Version}" - permitUnusedDeclared "com.google.code.findbugs:jsr305:${jsr305Version}" - annotationProcessor "org.projectlombok:lombok:${lombokVersion}" compileOnly "org.projectlombok:lombok:${lombokVersion}" diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/common/KafkaListenerUtil.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/common/KafkaListenerUtil.java index 6af0930ee..a4da6bf25 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/common/KafkaListenerUtil.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/asyncapi/scanners/common/KafkaListenerUtil.java @@ -10,10 +10,10 @@ import io.github.springwolf.asyncapi.v3.model.schema.Schema; import io.github.springwolf.asyncapi.v3.model.schema.SchemaObject; import io.github.springwolf.asyncapi.v3.model.schema.SchemaType; +import jakarta.annotation.Nullable; import lombok.extern.slf4j.Slf4j; import org.springframework.kafka.annotation.KafkaListener; import org.springframework.kafka.support.KafkaHeaders; -import org.springframework.lang.Nullable; import org.springframework.util.StringValueResolver; import java.util.Arrays; diff --git a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/properties/SpringwolfKafkaConfigProperties.java b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/properties/SpringwolfKafkaConfigProperties.java index ad8562902..f1cd3814b 100644 --- a/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/properties/SpringwolfKafkaConfigProperties.java +++ b/springwolf-plugins/springwolf-kafka-plugin/src/main/java/io/github/springwolf/plugins/kafka/configuration/properties/SpringwolfKafkaConfigProperties.java @@ -1,12 +1,12 @@ // SPDX-License-Identifier: Apache-2.0 package io.github.springwolf.plugins.kafka.configuration.properties; +import jakarta.annotation.Nullable; import lombok.Getter; import lombok.Setter; import org.springframework.boot.autoconfigure.kafka.KafkaProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; -import org.springframework.lang.Nullable; /** * This class is used to create metadata for auto-completion in spring configuration properties/yaml by using diff --git a/springwolf-plugins/springwolf-sns-plugin/build.gradle b/springwolf-plugins/springwolf-sns-plugin/build.gradle index 6714190f2..e684e9977 100644 --- a/springwolf-plugins/springwolf-sns-plugin/build.gradle +++ b/springwolf-plugins/springwolf-sns-plugin/build.gradle @@ -17,21 +17,19 @@ dependencies { api project(":springwolf-bindings:springwolf-sns-binding") permitUnusedDeclared project(":springwolf-bindings:springwolf-sns-binding") + implementation "jakarta.annotation:jakarta.annotation-api:${annotationApiVersion}" implementation "org.slf4j:slf4j-api:${slf4jApiVersion}" implementation 'io.awspring.cloud:spring-cloud-aws-sns' implementation 'io.awspring.cloud:spring-cloud-aws-starter-sns' permitUnusedDeclared 'io.awspring.cloud:spring-cloud-aws-starter-sns' + implementation "org.springframework:spring-context" - implementation "org.springframework:spring-core" implementation "org.springframework:spring-messaging" implementation "org.springframework:spring-web" implementation "org.springframework.boot:spring-boot" implementation "org.springframework.boot:spring-boot-autoconfigure" - compileOnly "com.google.code.findbugs:jsr305:${jsr305Version}" - permitUnusedDeclared "com.google.code.findbugs:jsr305:${jsr305Version}" - annotationProcessor "org.projectlombok:lombok:${lombokVersion}" compileOnly "org.projectlombok:lombok:${lombokVersion}" diff --git a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/properties/SpringwolfSnsConfigProperties.java b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/properties/SpringwolfSnsConfigProperties.java index ea3abcdb4..c4b25f13b 100644 --- a/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/properties/SpringwolfSnsConfigProperties.java +++ b/springwolf-plugins/springwolf-sns-plugin/src/main/java/io/github/springwolf/plugins/sns/configuration/properties/SpringwolfSnsConfigProperties.java @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 package io.github.springwolf.plugins.sns.configuration.properties; +import jakarta.annotation.Nullable; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.lang.Nullable; /** * This class is used to create metadata for auto-completion in spring configuration properties/yaml by using diff --git a/springwolf-plugins/springwolf-sqs-plugin/build.gradle b/springwolf-plugins/springwolf-sqs-plugin/build.gradle index c8441d4ee..cdeebdddd 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/build.gradle +++ b/springwolf-plugins/springwolf-sqs-plugin/build.gradle @@ -18,20 +18,19 @@ dependencies { api project(":springwolf-bindings:springwolf-sqs-binding") permitUnusedDeclared project(":springwolf-bindings:springwolf-sqs-binding") + implementation "jakarta.annotation:jakarta.annotation-api:${annotationApiVersion}" implementation "org.slf4j:slf4j-api:${slf4jApiVersion}" implementation 'io.awspring.cloud:spring-cloud-aws-sqs' implementation 'io.awspring.cloud:spring-cloud-aws-starter-sqs' permitUnusedDeclared 'io.awspring.cloud:spring-cloud-aws-starter-sqs' + implementation "org.springframework:spring-context" implementation "org.springframework:spring-core" implementation "org.springframework:spring-web" implementation "org.springframework.boot:spring-boot" implementation "org.springframework.boot:spring-boot-autoconfigure" - compileOnly "com.google.code.findbugs:jsr305:${jsr305Version}" - permitUnusedDeclared "com.google.code.findbugs:jsr305:${jsr305Version}" - annotationProcessor "org.projectlombok:lombok:${lombokVersion}" compileOnly "org.projectlombok:lombok:${lombokVersion}" diff --git a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/properties/SpringwolfSqsConfigProperties.java b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/properties/SpringwolfSqsConfigProperties.java index b696bbbc3..8c8f04e6c 100644 --- a/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/properties/SpringwolfSqsConfigProperties.java +++ b/springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/properties/SpringwolfSqsConfigProperties.java @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 package io.github.springwolf.plugins.sqs.configuration.properties; +import jakarta.annotation.Nullable; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.lang.Nullable; /** * This class is used to create metadata for auto-completion in spring configuration properties/yaml by using diff --git a/springwolf-plugins/springwolf-stomp-plugin/build.gradle b/springwolf-plugins/springwolf-stomp-plugin/build.gradle index 1add61d3e..7b40302cb 100644 --- a/springwolf-plugins/springwolf-stomp-plugin/build.gradle +++ b/springwolf-plugins/springwolf-stomp-plugin/build.gradle @@ -14,6 +14,8 @@ dependencies { implementation "io.swagger.core.v3:swagger-models-jakarta:${swaggerVersion}" permitUnusedDeclared "io.swagger.core.v3:swagger-models-jakarta:${swaggerVersion}" + + implementation "jakarta.annotation:jakarta.annotation-api:${annotationApiVersion}" implementation "org.slf4j:slf4j-api:${slf4jApiVersion}" implementation "org.springframework:spring-context" @@ -26,9 +28,6 @@ dependencies { permitUnusedDeclared("org.springframework.boot:spring-boot-starter-websocket") annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" - compileOnly "com.google.code.findbugs:jsr305:${jsr305Version}" - permitUnusedDeclared "com.google.code.findbugs:jsr305:${jsr305Version}" - annotationProcessor "org.projectlombok:lombok:${lombokVersion}" compileOnly "org.projectlombok:lombok:${lombokVersion}" testAnnotationProcessor "org.projectlombok:lombok:${lombokVersion}" diff --git a/springwolf-plugins/springwolf-stomp-plugin/src/main/java/io/github/springwolf/plugins/stomp/configuration/properties/SpringwolfStompConfigProperties.java b/springwolf-plugins/springwolf-stomp-plugin/src/main/java/io/github/springwolf/plugins/stomp/configuration/properties/SpringwolfStompConfigProperties.java index 97166d2bc..5944dc7bd 100644 --- a/springwolf-plugins/springwolf-stomp-plugin/src/main/java/io/github/springwolf/plugins/stomp/configuration/properties/SpringwolfStompConfigProperties.java +++ b/springwolf-plugins/springwolf-stomp-plugin/src/main/java/io/github/springwolf/plugins/stomp/configuration/properties/SpringwolfStompConfigProperties.java @@ -1,10 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 package io.github.springwolf.plugins.stomp.configuration.properties; +import jakarta.annotation.Nullable; import lombok.Getter; import lombok.Setter; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.lang.Nullable; /** * This class is used to create metadata for auto-completion in spring configuration properties/yaml by using