Skip to content

Commit 20d25a0

Browse files
radcortezradcortez
committed
Move to Jakarta
1 parent 6dbf1b0 commit 20d25a0

File tree

104 files changed

+230
-230
lines changed

Some content is hidden

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

104 files changed

+230
-230
lines changed

‎cdi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>io.smallrye.config</groupId>
2323
<artifactId>smallrye-config-parent</artifactId>
24-
<version>2.13.3-SNAPSHOT</version>
24+
<version>3.1.2-SNAPSHOT</version>
2525
</parent>
2626

2727
<artifactId>smallrye-config</artifactId>

‎cdi/src/main/java/io/smallrye/config/inject/ConfigExtension.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@
3636
import java.util.function.Supplier;
3737
import java.util.stream.StreamSupport;
3838

39-
import javax.enterprise.event.Observes;
40-
import javax.enterprise.inject.Instance;
41-
import javax.enterprise.inject.spi.AfterBeanDiscovery;
42-
import javax.enterprise.inject.spi.AfterDeploymentValidation;
43-
import javax.enterprise.inject.spi.AnnotatedType;
44-
import javax.enterprise.inject.spi.BeanManager;
45-
import javax.enterprise.inject.spi.BeforeBeanDiscovery;
46-
import javax.enterprise.inject.spi.Extension;
47-
import javax.enterprise.inject.spi.InjectionPoint;
48-
import javax.enterprise.inject.spi.ProcessAnnotatedType;
49-
import javax.enterprise.inject.spi.ProcessInjectionPoint;
50-
import javax.enterprise.inject.spi.WithAnnotations;
51-
import javax.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
52-
import javax.enterprise.util.Nonbinding;
53-
import javax.inject.Provider;
39+
import jakarta.enterprise.event.Observes;
40+
import jakarta.enterprise.inject.Instance;
41+
import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
42+
import jakarta.enterprise.inject.spi.AfterDeploymentValidation;
43+
import jakarta.enterprise.inject.spi.AnnotatedType;
44+
import jakarta.enterprise.inject.spi.BeanManager;
45+
import jakarta.enterprise.inject.spi.BeforeBeanDiscovery;
46+
import jakarta.enterprise.inject.spi.Extension;
47+
import jakarta.enterprise.inject.spi.InjectionPoint;
48+
import jakarta.enterprise.inject.spi.ProcessAnnotatedType;
49+
import jakarta.enterprise.inject.spi.ProcessInjectionPoint;
50+
import jakarta.enterprise.inject.spi.WithAnnotations;
51+
import jakarta.enterprise.inject.spi.configurator.AnnotatedTypeConfigurator;
52+
import jakarta.enterprise.util.Nonbinding;
53+
import jakarta.inject.Provider;
5454

5555
import org.eclipse.microprofile.config.ConfigProvider;
5656
import org.eclipse.microprofile.config.inject.ConfigProperties;

‎cdi/src/main/java/io/smallrye/config/inject/ConfigInjectionBean.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@
2323
import java.util.Optional;
2424
import java.util.Set;
2525

26-
import javax.enterprise.context.Dependent;
27-
import javax.enterprise.context.spi.CreationalContext;
28-
import javax.enterprise.inject.Instance;
29-
import javax.enterprise.inject.spi.Annotated;
30-
import javax.enterprise.inject.spi.Bean;
31-
import javax.enterprise.inject.spi.BeanManager;
32-
import javax.enterprise.inject.spi.InjectionPoint;
33-
import javax.enterprise.inject.spi.PassivationCapable;
34-
import javax.enterprise.util.AnnotationLiteral;
35-
import javax.inject.Provider;
26+
import jakarta.enterprise.context.Dependent;
27+
import jakarta.enterprise.context.spi.CreationalContext;
28+
import jakarta.enterprise.inject.Instance;
29+
import jakarta.enterprise.inject.spi.Annotated;
30+
import jakarta.enterprise.inject.spi.Bean;
31+
import jakarta.enterprise.inject.spi.BeanManager;
32+
import jakarta.enterprise.inject.spi.InjectionPoint;
33+
import jakarta.enterprise.inject.spi.PassivationCapable;
34+
import jakarta.enterprise.util.AnnotationLiteral;
35+
import jakarta.inject.Provider;
3636

3737
import org.eclipse.microprofile.config.Config;
3838
import org.eclipse.microprofile.config.ConfigProvider;

‎cdi/src/main/java/io/smallrye/config/inject/ConfigMappingInjectionBean.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
import java.util.Collections;
88
import java.util.Set;
99

10-
import javax.enterprise.context.Dependent;
11-
import javax.enterprise.context.spi.CreationalContext;
12-
import javax.enterprise.inject.Default;
13-
import javax.enterprise.inject.spi.Bean;
14-
import javax.enterprise.inject.spi.BeanManager;
15-
import javax.enterprise.inject.spi.InjectionPoint;
10+
import jakarta.enterprise.context.Dependent;
11+
import jakarta.enterprise.context.spi.CreationalContext;
12+
import jakarta.enterprise.inject.Default;
13+
import jakarta.enterprise.inject.spi.Bean;
14+
import jakarta.enterprise.inject.spi.BeanManager;
15+
import jakarta.enterprise.inject.spi.InjectionPoint;
1616

1717
import org.eclipse.microprofile.config.ConfigProvider;
1818

‎cdi/src/main/java/io/smallrye/config/inject/ConfigProducer.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import java.util.*;
2222
import java.util.function.Supplier;
2323

24-
import javax.enterprise.context.ApplicationScoped;
25-
import javax.enterprise.context.Dependent;
26-
import javax.enterprise.inject.Produces;
27-
import javax.enterprise.inject.spi.InjectionPoint;
24+
import jakarta.enterprise.context.ApplicationScoped;
25+
import jakarta.enterprise.context.Dependent;
26+
import jakarta.enterprise.inject.Produces;
27+
import jakarta.enterprise.inject.spi.InjectionPoint;
2828

2929
import org.eclipse.microprofile.config.Config;
3030
import org.eclipse.microprofile.config.ConfigProvider;

‎cdi/src/main/java/io/smallrye/config/inject/ConfigProducerUtil.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
import java.util.function.IntFunction;
2121
import java.util.function.Supplier;
2222

23-
import javax.enterprise.inject.Instance;
24-
import javax.enterprise.inject.spi.AnnotatedMember;
25-
import javax.enterprise.inject.spi.AnnotatedType;
26-
import javax.enterprise.inject.spi.InjectionPoint;
27-
import javax.inject.Provider;
23+
import jakarta.enterprise.inject.Instance;
24+
import jakarta.enterprise.inject.spi.AnnotatedMember;
25+
import jakarta.enterprise.inject.spi.AnnotatedType;
26+
import jakarta.enterprise.inject.spi.InjectionPoint;
27+
import jakarta.inject.Provider;
2828

2929
import org.eclipse.microprofile.config.Config;
3030
import org.eclipse.microprofile.config.ConfigValue;

‎cdi/src/main/java/io/smallrye/config/inject/ConfigPropertiesInjectionBean.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import java.util.Collections;
88
import java.util.Set;
99

10-
import javax.enterprise.context.Dependent;
11-
import javax.enterprise.context.spi.CreationalContext;
12-
import javax.enterprise.inject.spi.Bean;
13-
import javax.enterprise.inject.spi.InjectionPoint;
10+
import jakarta.enterprise.context.Dependent;
11+
import jakarta.enterprise.context.spi.CreationalContext;
12+
import jakarta.enterprise.inject.spi.Bean;
13+
import jakarta.enterprise.inject.spi.InjectionPoint;
1414

1515
import org.eclipse.microprofile.config.ConfigProvider;
1616
import org.eclipse.microprofile.config.inject.ConfigProperties;

‎cdi/src/main/java/io/smallrye/config/inject/InjectionMessages.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.util.NoSuchElementException;
1111
import java.util.stream.Collectors;
1212

13-
import javax.enterprise.inject.spi.InjectionPoint;
13+
import jakarta.enterprise.inject.spi.InjectionPoint;
1414

1515
import org.jboss.logging.Messages;
1616
import org.jboss.logging.annotations.Cause;

‎cdi/src/main/java/io/smallrye/config/inject/MetadataInjectionPoint.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import java.util.Collections;
77
import java.util.Set;
88

9-
import javax.enterprise.inject.Default;
10-
import javax.enterprise.inject.spi.Annotated;
11-
import javax.enterprise.inject.spi.Bean;
12-
import javax.enterprise.inject.spi.InjectionPoint;
13-
import javax.enterprise.util.AnnotationLiteral;
9+
import jakarta.enterprise.inject.Default;
10+
import jakarta.enterprise.inject.spi.Annotated;
11+
import jakarta.enterprise.inject.spi.Bean;
12+
import jakarta.enterprise.inject.spi.InjectionPoint;
13+
import jakarta.enterprise.util.AnnotationLiteral;
1414

1515
class MetadataInjectionPoint implements InjectionPoint {
1616
@Override

‎cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension ‎cdi/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension

File renamed without changes.

‎cdi/src/test/java/io/smallrye/config/inject/ConfigInjectionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import java.util.Set;
1717
import java.util.function.Supplier;
1818

19-
import javax.enterprise.context.ApplicationScoped;
20-
import javax.inject.Inject;
19+
import jakarta.enterprise.context.ApplicationScoped;
20+
import jakarta.inject.Inject;
2121

2222
import org.eclipse.microprofile.config.Config;
2323
import org.eclipse.microprofile.config.ConfigProvider;

‎cdi/src/test/java/io/smallrye/config/inject/ConfigMappingInjectionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
import java.util.Optional;
1010

11-
import javax.enterprise.inject.spi.CDI;
12-
import javax.inject.Inject;
11+
import jakarta.enterprise.inject.spi.CDI;
12+
import jakarta.inject.Inject;
1313

1414
import org.eclipse.microprofile.config.ConfigProvider;
1515
import org.eclipse.microprofile.config.spi.ConfigProviderResolver;

‎cdi/src/test/java/io/smallrye/config/inject/ConfigPropertiesInjectionTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import java.util.Optional;
1414
import java.util.Set;
1515

16-
import javax.enterprise.context.Dependent;
17-
import javax.enterprise.inject.UnsatisfiedResolutionException;
18-
import javax.enterprise.inject.spi.CDI;
19-
import javax.inject.Inject;
16+
import jakarta.enterprise.context.Dependent;
17+
import jakarta.enterprise.inject.UnsatisfiedResolutionException;
18+
import jakarta.enterprise.inject.spi.CDI;
19+
import jakarta.inject.Inject;
2020

2121
import org.eclipse.microprofile.config.Config;
2222
import org.eclipse.microprofile.config.ConfigProvider;

‎cdi/src/test/java/io/smallrye/config/inject/IndexedPropertiesInjectionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import java.util.stream.Collectors;
1616
import java.util.stream.Stream;
1717

18-
import javax.enterprise.context.ApplicationScoped;
19-
import javax.inject.Inject;
18+
import jakarta.enterprise.context.ApplicationScoped;
19+
import jakarta.inject.Inject;
2020

2121
import org.eclipse.microprofile.config.ConfigProvider;
2222
import org.eclipse.microprofile.config.inject.ConfigProperty;

‎cdi/src/test/java/io/smallrye/config/inject/InjectedConfigSerializationTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import java.io.ObjectInputStream;
1111
import java.io.ObjectOutputStream;
1212

13-
import javax.inject.Inject;
13+
import jakarta.inject.Inject;
1414

1515
import org.eclipse.microprofile.config.Config;
1616
import org.eclipse.microprofile.config.ConfigProvider;

‎cdi/src/test/java/io/smallrye/config/inject/OptionalInjectionTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.OptionalInt;
99
import java.util.OptionalLong;
1010

11-
import javax.inject.Inject;
11+
import jakarta.inject.Inject;
1212

1313
import org.eclipse.microprofile.config.ConfigProvider;
1414
import org.eclipse.microprofile.config.inject.ConfigProperty;

‎cdi/src/test/java/io/smallrye/config/inject/SupplierInjectionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import java.util.Set;
1111
import java.util.function.Supplier;
1212

13-
import javax.enterprise.context.ApplicationScoped;
14-
import javax.inject.Inject;
13+
import jakarta.enterprise.context.ApplicationScoped;
14+
import jakarta.inject.Inject;
1515

1616
import org.eclipse.microprofile.config.ConfigProvider;
1717
import org.eclipse.microprofile.config.inject.ConfigProperty;

‎cdi/src/test/java/io/smallrye/config/inject/ValidateInjectionTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import java.util.Set;
1616
import java.util.stream.Collectors;
1717

18-
import javax.enterprise.context.ApplicationScoped;
19-
import javax.enterprise.context.Dependent;
20-
import javax.enterprise.inject.spi.InjectionPoint;
21-
import javax.inject.Inject;
18+
import jakarta.enterprise.context.ApplicationScoped;
19+
import jakarta.enterprise.context.Dependent;
20+
import jakarta.enterprise.inject.spi.InjectionPoint;
21+
import jakarta.inject.Inject;
2222

2323
import org.eclipse.microprofile.config.ConfigProvider;
2424
import org.eclipse.microprofile.config.inject.ConfigProperties;
@@ -63,7 +63,7 @@
6363
* </pre>
6464
*
6565
* If n Exception messages are thrown during
66-
* {@link ConfigExtension#validate(javax.enterprise.inject.spi.AfterDeploymentValidation)},
66+
* {@link ConfigExtension#validate(jakarta.enterprise.inject.spi.AfterDeploymentValidation)},
6767
* as defined by
6868
* {@link org.jboss.weld.exceptions.DeploymentException#DeploymentException(List)}
6969
* the messages will be bundled together as follows:

‎common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.smallrye.config</groupId>
77
<artifactId>smallrye-config-parent</artifactId>
8-
<version>2.13.3-SNAPSHOT</version>
8+
<version>3.1.2-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>smallrye-config-common</artifactId>

‎converters/json/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<parent>
66
<groupId>io.smallrye.config</groupId>
77
<artifactId>smallrye-config-parent</artifactId>
8-
<version>2.13.3-SNAPSHOT</version>
8+
<version>3.1.2-SNAPSHOT</version>
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111

1212
<artifactId>smallrye-config-converter-json</artifactId>
1313
<name>SmallRye Config: Converter - Json</name>
1414

1515
<properties>
16-
<version.jakarta.json>1.1.6</version.jakarta.json>
16+
<version.jakarta.json>2.0.1</version.jakarta.json>
1717
</properties>
1818

1919
<dependencies>

‎converters/json/src/main/java/io/smallrye/config/converter/json/JsonArrayConverter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import java.io.StringReader;
44

5-
import javax.json.Json;
6-
import javax.json.JsonArray;
7-
import javax.json.JsonReader;
5+
import jakarta.json.Json;
6+
import jakarta.json.JsonArray;
7+
import jakarta.json.JsonReader;
88

99
import org.eclipse.microprofile.config.spi.Converter;
1010

‎converters/json/src/main/java/io/smallrye/config/converter/json/JsonObjectConverter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import java.io.StringReader;
44

5-
import javax.json.Json;
6-
import javax.json.JsonObject;
7-
import javax.json.JsonReader;
5+
import jakarta.json.Json;
6+
import jakarta.json.JsonObject;
7+
import jakarta.json.JsonReader;
88

99
import org.eclipse.microprofile.config.spi.Converter;
1010

‎converters/json/src/test/java/io/smallrye/config/converter/json/JsonArrayConverterTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
import java.io.StringReader;
66

7-
import javax.enterprise.context.ApplicationScoped;
8-
import javax.inject.Inject;
9-
import javax.json.Json;
10-
import javax.json.JsonArray;
11-
import javax.json.JsonReader;
7+
import jakarta.enterprise.context.ApplicationScoped;
8+
import jakarta.inject.Inject;
9+
import jakarta.json.Json;
10+
import jakarta.json.JsonArray;
11+
import jakarta.json.JsonReader;
1212

1313
import org.eclipse.microprofile.config.inject.ConfigProperty;
1414
import org.jboss.weld.junit5.WeldInitiator;

‎converters/json/src/test/java/io/smallrye/config/converter/json/JsonObjectConverterTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
import java.io.StringReader;
66

7-
import javax.enterprise.context.ApplicationScoped;
8-
import javax.inject.Inject;
9-
import javax.json.Json;
10-
import javax.json.JsonObject;
11-
import javax.json.JsonReader;
7+
import jakarta.enterprise.context.ApplicationScoped;
8+
import jakarta.inject.Inject;
9+
import jakarta.json.Json;
10+
import jakarta.json.JsonObject;
11+
import jakarta.json.JsonReader;
1212

1313
import org.eclipse.microprofile.config.inject.ConfigProperty;
1414
import org.jboss.weld.junit5.WeldInitiator;

‎coverage/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.smallrye.config</groupId>
77
<artifactId>smallrye-config-parent</artifactId>
8-
<version>2.13.3-SNAPSHOT</version>
8+
<version>3.1.2-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>smallrye-config-coverage</artifactId>

‎documentation/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.smallrye.config</groupId>
77
<artifactId>smallrye-config-parent</artifactId>
8-
<version>2.13.3-SNAPSHOT</version>
8+
<version>3.1.2-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>smallrye-config-documentation</artifactId>

‎documentation/src/main/docs/config/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ SmallRyeConfig config;
9999
```
100100

101101
- If a value if not provided for this `greeting.message`, the application startup fails with a
102-
`javax.enterprise.inject.spi.DeploymentException: No config value of type [class java.lang.String] exists for: greeting.message`.
102+
`jakarta.enterprise.inject.spi.DeploymentException: No config value of type [class java.lang.String] exists for: greeting.message`.
103103
- The default value `!` is injected if the configuration does not provide a value for `greeting.suffix`.
104104
- The property `greeting.name` is optional - an empty Optional is injected if the configuration does not provide a
105105
value for it.

‎documentation/src/main/docs/converters/custom.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ Config config = ConfigProvider.getConfig();
5959
CustomValue value = config.getValue("custom.value", CustomValue.class);
6060
````
6161

62-
The `javax.annotation.Priority` annotation overrides the `Converter` priority and change converters precedence to fine
62+
The `jakarta.annotation.Priority` annotation overrides the `Converter` priority and change converters precedence to fine
6363
tune the execution order. By default, if no `@Priority` is specified by the `Converter`, the converter is registered
6464
with a priority of `100`. Consider:
6565

6666
```java
6767
package org.acme.config;
6868

69-
import javax.annotation.Priority;
69+
import jakarta.annotation.Priority;
7070
import org.eclipse.microprofile.config.spi.Converter;
7171

7272
@Priority(150)

0 commit comments

Comments
 (0)