Skip to content

Commit 4e8f313

Browse files
VampireVampire
committed
Upgrade to CDI 3
1 parent eb126ef commit 4e8f313

File tree

193 files changed

+475
-603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+475
-603
lines changed

‎buildSrc/src/main/kotlin/net/kautler/java.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2020 Bjoern Kautler
2+
* Copyright 2019-2022 Bjoern Kautler
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -39,9 +39,9 @@ java {
3939
dependencies {
4040
val versions: Map<String, String> by project
4141

42-
implementation("javax.enterprise:cdi-api:${versions["cdi"]}")
43-
compileOnly("javax.inject:javax.inject:${versions["javax.inject"]}")
44-
compileOnly("javax.annotation:javax.annotation-api:${versions["javax.annotation-api"]}")
42+
implementation("jakarta.enterprise:jakarta.enterprise.cdi-api:${versions["cdi"]}")
43+
compileOnly("jakarta.inject:jakarta.inject-api:${versions["jakarta.inject-api"]}")
44+
compileOnly("jakarta.annotation:jakarta.annotation-api:${versions["jakarta.annotation-api"]}")
4545
compileOnly("com.github.spotbugs:spotbugs-annotations:${versions["spotbugs"]}") {
4646
exclude("com.google.code.findbugs", "jsr305")
4747
}

‎buildSrc/src/main/kotlin/net/kautler/java9.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019 Bjoern Kautler
2+
* Copyright 2019-2022 Bjoern Kautler
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -58,9 +58,9 @@ if (JavaVersion.current().isJava9Compatible) {
5858
val module = moduleInfoFile
5959
.setModule("net.kautler.command")
6060
.addDirective("requires org.apache.logging.log4j;")
61-
.addDirective("requires cdi.api;")
62-
.addDirective("requires static javax.inject;")
63-
.addDirective("requires static java.annotation;")
61+
.addDirective("requires jakarta.cdi;")
62+
.addDirective("requires static jakarta.inject;")
63+
.addDirective("requires static jakarta.annotation;")
6464
.addDirective("requires static com.github.spotbugs.annotations;")
6565
.addDirective("requires static org.antlr.antlr4.runtime;")
6666
.addDirective("requires static org.javacord.api;")

‎buildSrc/src/main/kotlin/net/kautler/javadoc.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ tasks.withType<Javadoc>().configureEach {
5353
error("JavaDoc URL for JRE needs to be adapted to new target compatibility ${java.targetCompatibility}")
5454
}
5555
add("https://docs.oracle.com/javase/8/docs/api/")
56-
add("https://static.javadoc.io/javax.enterprise/cdi-api/${versions["cdi"]}/")
57-
add("https://static.javadoc.io/javax.inject/javax.inject/${versions["javax.inject"]}/")
56+
add("https://static.javadoc.io/jakarta.enterprise/jakarta.enterprise.cdi-api/${versions["cdi"]}/")
57+
add("https://static.javadoc.io/jakarta.inject/jakarta.inject-api/${versions["jakarta.inject-api"]}/")
5858
add("https://static.javadoc.io/org.javacord/javacord-api/${messageFrameworkVersions.safeGet("javacord").first()}/")
5959
add("https://ci.dv8tion.net/job/JDA/javadoc/")
6060
}

‎buildSrc/src/main/kotlin/net/kautler/tests.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ dependencies {
113113

114114
val integTestCommonImplementation by configurations
115115
integTestCommonImplementation("org.spockframework:spock-core:${versions["spock"]}")
116-
integTestCommonImplementation("javax.enterprise:cdi-api:${versions["cdi"]}")
117-
integTestCommonImplementation("javax.annotation:javax.annotation-api:${versions["javax.annotation-api"]}")
116+
integTestCommonImplementation("jakarta.enterprise:jakarta.enterprise.cdi-api:${versions["cdi"]}")
117+
integTestCommonImplementation("jakarta.annotation:jakarta.annotation-api:${versions["jakarta.annotation-api"]}")
118118
integTestCommonImplementation("org.apache.logging.log4j:log4j-core:${versions["log4j"]}:tests")
119119
integTestCommonImplementation("org.apache.logging.log4j:log4j-core:${versions["log4j"]}")
120120

@@ -138,9 +138,9 @@ dependencies {
138138
integTestSourceSets.keys.forEach {
139139
"${it}Implementation"(integTestCommon.let { it.output + it.runtimeClasspath })
140140
"${it}Implementation"("org.spockframework:spock-core:${versions["spock"]}")
141-
"${it}Implementation"("javax.enterprise:cdi-api:${versions["cdi"]}")
141+
"${it}Implementation"("jakarta.enterprise:jakarta.enterprise.cdi-api:${versions["cdi"]}")
142142

143-
"${it}CompileOnly"("javax.annotation:javax.annotation-api:${versions["javax.annotation-api"]}")
143+
"${it}CompileOnly"("jakarta.annotation:jakarta.annotation-api:${versions["jakarta.annotation-api"]}")
144144
}
145145

146146
val messageFrameworkDependencies = mapOf(

‎buildSrc/src/main/kotlin/net/kautler/versions.gradle.kts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ val messageFrameworkVersions by extra(mapOf(
4444

4545
val versions by extra(mapOf(
4646
// production versions
47-
"cdi" to "2.0",
48-
"javax.annotation-api" to "1.3.2",
49-
"javax.inject" to "1",
50-
"log4j" to "2.12.1",
47+
"cdi" to "3.0.0",
48+
"jakarta.annotation-api" to "2.0.0",
49+
"jakarta.inject-api" to "2.0.1",
50+
"log4j" to "2.17.2",
5151
"antlr" to "4.7.2",
5252

5353
// tool versions
@@ -66,8 +66,8 @@ val versions by extra(mapOf(
6666
"spock-global-unroll" to "0.5.1",
6767
"byte-buddy" to "1.10.1",
6868
"objenesis" to "3.1",
69-
"weld-junit" to "2.0.1.Final",
70-
"weld-se" to "3.1.2.Final",
69+
"weld-junit" to "3.0.0.Final",
70+
"weld-se" to "4.0.3.Final",
7171
"jandex" to "2.1.1.Final",
7272
"jansi" to "1.18",
7373
"discordWebhooks" to "0.1.8"

‎config/pmd/pmd.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
<value>
4545
.[
4646
((MethodDeclaration/@MethodName = 'ensureInitializationAtStartup') and descendant::FormalParameter[
47-
Annotation[typeIsExactly('javax.enterprise.event.Observes')]
48-
and Annotation[typeIsExactly('javax.enterprise.context.Initialized')]])
49-
or Annotation[typeIsExactly('javax.enterprise.inject.Produces')]
50-
or Annotation[typeIsExactly('javax.inject.Inject')]
51-
or Annotation[typeIsExactly('javax.annotation.PostConstruct')]
52-
or Annotation[typeIsExactly('javax.annotation.PreDestroy')]
47+
Annotation[typeIsExactly('jakarta.enterprise.event.Observes')]
48+
and Annotation[typeIsExactly('jakarta.enterprise.context.Initialized')]])
49+
or Annotation[typeIsExactly('jakarta.enterprise.inject.Produces')]
50+
or Annotation[typeIsExactly('jakarta.inject.Inject')]
51+
or Annotation[typeIsExactly('jakarta.annotation.PostConstruct')]
52+
or Annotation[typeIsExactly('jakarta.annotation.PreDestroy')]
5353
]
5454
</value>
5555
</property>
@@ -62,8 +62,8 @@
6262
<value>
6363
.[
6464
((@MethodName = 'ensureInitializationAtStartup') and descendant::FormalParameter[
65-
Annotation[typeIsExactly('javax.enterprise.event.Observes')]
66-
and Annotation[typeIsExactly('javax.enterprise.context.Initialized')]])
65+
Annotation[typeIsExactly('jakarta.enterprise.event.Observes')]
66+
and Annotation[typeIsExactly('jakarta.enterprise.context.Initialized')]])
6767
or (((@MethodName = 'expression')
6868
or (@MethodName = 'optional')
6969
or (@MethodName = 'placeholder')

‎examples/simplePingBotJavacord/build.gradle.kts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@ repositories {
2525
dependencies {
2626
implementation("net.kautler:command-framework")
2727

28-
implementation("javax.enterprise:cdi-api:2.0")
29-
runtimeOnly("org.jboss.weld.se:weld-se-core:3.1.2.Final") { because("CDI implementation") }
28+
implementation("jakarta.enterprise:jakarta.enterprise.cdi-api:3.0.0")
29+
runtimeOnly("org.jboss.weld.se:weld-se-core:4.0.3.Final") { because("CDI implementation") }
3030
runtimeOnly("org.jboss:jandex:2.1.1.Final") { because("faster CDI bean scanning") }
3131

3232
implementation("org.javacord:javacord:3.4.0")
33-
implementation("org.apache.logging.log4j:log4j-api:2.12.1")
33+
implementation(platform("org.apache.logging.log4j:log4j-bom:2.17.2"))
34+
implementation("org.apache.logging.log4j:log4j-api")
3435

35-
runtimeOnly("org.apache.logging.log4j:log4j-core:2.12.1")
36+
runtimeOnly("org.apache.logging.log4j:log4j-core")
3637
runtimeOnly("org.fusesource.jansi:jansi:1.18") { because("ANSI colors on Windows") }
3738
}
3839

‎examples/simplePingBotJavacord/src/main/java/net/kautler/command/example/ping/CombinedPingCommand.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
import java.util.concurrent.CompletableFuture;
2121
import java.util.function.Function;
2222

23-
import javax.enterprise.context.ApplicationScoped;
24-
import javax.inject.Inject;
25-
23+
import jakarta.enterprise.context.ApplicationScoped;
24+
import jakarta.inject.Inject;
2625
import net.kautler.command.api.Command;
2726
import net.kautler.command.api.CommandContext;
2827
import net.kautler.command.api.annotation.Alias;

‎examples/simplePingBotJavacord/src/main/java/net/kautler/command/example/ping/JavacordProducer.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@
1616

1717
package net.kautler.command.example.ping;
1818

19+
import jakarta.enterprise.context.ApplicationScoped;
20+
import jakarta.enterprise.inject.Disposes;
21+
import jakarta.enterprise.inject.Produces;
22+
import jakarta.inject.Inject;
23+
import jakarta.inject.Named;
1924
import org.apache.logging.log4j.Logger;
2025
import org.javacord.api.DiscordApi;
2126
import org.javacord.api.DiscordApiBuilder;
2227

23-
import javax.enterprise.context.ApplicationScoped;
24-
import javax.enterprise.inject.Disposes;
25-
import javax.enterprise.inject.Produces;
26-
import javax.inject.Inject;
27-
import javax.inject.Named;
28-
2928
@ApplicationScoped
3029
class JavacordProducer {
3130
@Inject

‎examples/simplePingBotJavacord/src/main/java/net/kautler/command/example/ping/LoggerProducer.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,12 @@
1616

1717
package net.kautler.command.example.ping;
1818

19+
import jakarta.enterprise.context.ApplicationScoped;
20+
import jakarta.enterprise.inject.Produces;
21+
import jakarta.enterprise.inject.spi.InjectionPoint;
1922
import org.apache.logging.log4j.LogManager;
2023
import org.apache.logging.log4j.Logger;
2124

22-
import javax.enterprise.context.ApplicationScoped;
23-
import javax.enterprise.inject.Produces;
24-
import javax.enterprise.inject.spi.InjectionPoint;
25-
2625
@ApplicationScoped
2726
class LoggerProducer {
2827
@Produces

0 commit comments

Comments
 (0)