Skip to content

Commit f1aa84e

Browse files
ArneLimburgArneLimburg
committed
Change namespace to jakarta
1 parent ed5f916 commit f1aa84e

File tree

74 files changed

+304
-509
lines changed

Some content is hidden

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

74 files changed

+304
-509
lines changed

‎address-validation-service/pom.xml‎

Lines changed: 17 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- ~ Copyright (C) open knowledge GmbH. ~ ~ Licensed under the Apache License,
3-
Version 2.0 (the "License"); you may not use this file except in compliance
4-
with ~ the License. You may obtain a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0
5-
~ ~ Unless required by applicable law or agreed to in writing, software distributed
6-
under the License is distributed on ~ an "AS IS" BASIS, WITHOUT WARRANTIES
7-
OR CONDITIONS OF ANY KIND, either express or implied. See the License for
8-
the ~ specific language governing permissions and limitations under the License. -->
9-
10-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
114
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
126
<modelVersion>4.0.0</modelVersion>
137

148
<groupId>de.openkonwledge.sample.shop</groupId>
@@ -21,13 +15,14 @@
2115
<maven.compiler.target>17</maven.compiler.target>
2216
<failOnMissingWebXml>false</failOnMissingWebXml>
2317
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
24-
<meecrowave.version>1.2.15</meecrowave.version>
18+
<meecrowave.version>2.0.0</meecrowave.version>
2519
<deltaspike.version>1.9.6</deltaspike.version>
2620
<junit.version>5.8.2</junit.version>
2721
</properties>
2822

2923
<dependencies>
3024

25+
<!-- Jakarta kompatibles Meecrowave -->
3126
<dependency>
3227
<groupId>org.apache.meecrowave</groupId>
3328
<artifactId>meecrowave-specs-api</artifactId>
@@ -42,92 +37,47 @@
4237
</dependency>
4338
<dependency>
4439
<groupId>org.apache.geronimo.specs</groupId>
45-
<artifactId>geronimo-validation_1.0_spec</artifactId>
46-
<version>1.1</version>
40+
<artifactId>geronimo-validation_2.0_spec</artifactId>
41+
<version>1.0</version>
4742
</dependency>
4843
<dependency>
4944
<groupId>org.eclipse.microprofile.config</groupId>
5045
<artifactId>microprofile-config-api</artifactId>
51-
<version>1.4</version>
46+
<version>3.0</version>
5247
</dependency>
5348
<dependency>
5449
<groupId>org.apache.geronimo.config</groupId>
5550
<artifactId>geronimo-config-impl</artifactId>
56-
<version>1.2.2</version>
51+
<version>1.2.3</version>
52+
<classifier>jakarta</classifier>
5753
</dependency>
5854
<dependency>
5955
<groupId>org.eclipse.microprofile.jwt</groupId>
6056
<artifactId>microprofile-jwt-auth-api</artifactId>
61-
<version>1.2.1</version>
62-
</dependency>
63-
<dependency>
64-
<groupId>org.apache.geronimo</groupId>
65-
<artifactId>geronimo-jwt-auth</artifactId>
66-
<version>1.0.4</version>
67-
</dependency>
68-
<dependency>
69-
<groupId>org.apache.deltaspike.modules</groupId>
70-
<artifactId>deltaspike-security-module-api</artifactId>
71-
<version>${deltaspike.version}</version>
72-
<scope>compile</scope>
73-
</dependency>
74-
<dependency>
75-
<groupId>org.apache.deltaspike.modules</groupId>
76-
<artifactId>deltaspike-security-module-impl</artifactId>
77-
<version>${deltaspike.version}</version>
78-
<scope>runtime</scope>
57+
<version>2.0</version>
7958
</dependency>
8059
<dependency>
8160
<groupId>org.eclipse.microprofile.opentracing</groupId>
8261
<artifactId>microprofile-opentracing-api</artifactId>
83-
<version>1.2</version>
84-
</dependency>
85-
<dependency>
86-
<groupId>io.opentracing</groupId>
87-
<artifactId>opentracing-api</artifactId>
88-
<version>0.31.0</version>
89-
</dependency>
90-
<dependency>
91-
<groupId>org.apache.geronimo</groupId>
92-
<artifactId>geronimo-opentracing</artifactId>
93-
<version>1.0.3</version>
62+
<version>2.0</version>
9463
</dependency>
9564
<dependency>
9665
<groupId>org.eclipse.microprofile.health</groupId>
9766
<artifactId>microprofile-health-api</artifactId>
98-
<version>3.0-RC3</version>
99-
</dependency>
100-
<dependency>
101-
<groupId>org.apache.geronimo</groupId>
102-
<artifactId>geronimo-health</artifactId>
103-
<version>2.0.1</version>
104-
</dependency>
105-
<dependency>
106-
<groupId>org.microprofile-ext.health-ext</groupId>
107-
<artifactId>healthprobe-jvm</artifactId>
108-
<version>1.2.0</version>
109-
</dependency>
110-
<dependency>
111-
<groupId>org.microprofile-ext.health-ext</groupId>
112-
<artifactId>healthprobe-system</artifactId>
113-
<version>1.2.0</version>
67+
<version>4.0</version>
11468
</dependency>
11569
<dependency>
11670
<groupId>org.eclipse.microprofile.metrics</groupId>
11771
<artifactId>microprofile-metrics-api</artifactId>
118-
<version>3.0-RC2</version>
119-
</dependency>
120-
<dependency>
121-
<groupId>org.apache.geronimo</groupId>
122-
<artifactId>geronimo-metrics</artifactId>
123-
<version>1.0.6</version>
72+
<version>4.0</version>
12473
</dependency>
12574
<dependency>
12675
<groupId>org.apache.commons</groupId>
12776
<artifactId>commons-lang3</artifactId>
12877
<version>3.9</version>
12978
</dependency>
13079

80+
<!-- Test Dependencies -->
13181
<dependency>
13282
<groupId>org.junit.jupiter</groupId>
13383
<artifactId>junit-jupiter-api</artifactId>
@@ -161,14 +111,14 @@
161111
<dependency>
162112
<groupId>rocks.limburg.cdimock</groupId>
163113
<artifactId>cdimock</artifactId>
164-
<version>1.0.4</version>
114+
<version>2.0.2</version>
165115
<scope>test</scope>
166116
</dependency>
167117
<dependency>
168118
<groupId>com.tngtech.archunit</groupId>
169119
<artifactId>archunit</artifactId>
170120
<version>1.0.1</version>
171-
<scope>test</scope>
121+
<scope>test</scope>
172122
</dependency>
173123
</dependencies>
174124
<build>

‎address-validation-service/src/main/checkstyle/configuration.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
</module>
110110
<module name="IllegalThrows"/>
111111
<module name="ImportOrder">
112-
<property name="groups" value="java,javax,org,com,io"/>
112+
<property name="groups" value="java,javax,jakarta,org,com,io"/>
113113
<property name="separated" value="true"/>
114114
<property name="option" value="top"/>
115115
</module>

‎address-validation-service/src/main/java/de/openknowledge/sample/address/application/AddressApplication.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package de.openknowledge.sample.address.application;
1717

18-
import javax.ws.rs.ApplicationPath;
19-
import javax.ws.rs.core.Application;
18+
import jakarta.ws.rs.ApplicationPath;
19+
import jakarta.ws.rs.core.Application;
2020

2121
/**
2222
* Application initialization

‎address-validation-service/src/main/java/de/openknowledge/sample/address/application/AddressResource.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
import java.util.List;
2323
import java.util.logging.Logger;
2424

25-
import javax.enterprise.context.ApplicationScoped;
26-
import javax.inject.Inject;
27-
import javax.ws.rs.Consumes;
28-
import javax.ws.rs.GET;
29-
import javax.ws.rs.POST;
30-
import javax.ws.rs.Path;
31-
import javax.ws.rs.Produces;
32-
import javax.ws.rs.core.Context;
33-
import javax.ws.rs.core.MediaType;
34-
import javax.ws.rs.core.Response;
35-
import javax.ws.rs.core.UriBuilder;
36-
import javax.ws.rs.core.UriInfo;
25+
import jakarta.enterprise.context.ApplicationScoped;
26+
import jakarta.inject.Inject;
27+
import jakarta.ws.rs.Consumes;
28+
import jakarta.ws.rs.GET;
29+
import jakarta.ws.rs.POST;
30+
import jakarta.ws.rs.Path;
31+
import jakarta.ws.rs.Produces;
32+
import jakarta.ws.rs.core.Context;
33+
import jakarta.ws.rs.core.MediaType;
34+
import jakarta.ws.rs.core.Response;
35+
import jakarta.ws.rs.core.UriBuilder;
36+
import jakarta.ws.rs.core.UriInfo;
3737

3838
import de.openknowledge.sample.address.domain.Address;
3939
import de.openknowledge.sample.address.domain.AddressRepository;

‎address-validation-service/src/main/java/de/openknowledge/sample/address/domain/AddressRepository.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import java.util.Set;
2727
import java.util.logging.Logger;
2828

29-
import javax.annotation.PostConstruct;
30-
import javax.enterprise.context.ApplicationScoped;
29+
import jakarta.annotation.PostConstruct;
30+
import jakarta.enterprise.context.ApplicationScoped;
3131

3232
@ApplicationScoped
3333
public class AddressRepository {

‎address-validation-service/src/main/java/de/openknowledge/sample/address/domain/City.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import java.util.List;
2323
import java.util.stream.Stream;
2424

25-
import javax.json.bind.adapter.JsonbAdapter;
26-
import javax.json.bind.annotation.JsonbTypeAdapter;
25+
import jakarta.json.bind.adapter.JsonbAdapter;
26+
import jakarta.json.bind.annotation.JsonbTypeAdapter;
2727

2828
import de.openknowledge.sample.address.domain.City.Adapter;
2929

‎address-validation-service/src/main/java/de/openknowledge/sample/address/domain/CityName.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import static org.apache.commons.lang3.Validate.notNull;
1919

20-
import javax.json.bind.adapter.JsonbAdapter;
21-
import javax.json.bind.annotation.JsonbTypeAdapter;
20+
import jakarta.json.bind.adapter.JsonbAdapter;
21+
import jakarta.json.bind.annotation.JsonbTypeAdapter;
2222

2323
import de.openknowledge.sample.address.domain.CityName.Adapter;
2424

‎address-validation-service/src/main/java/de/openknowledge/sample/address/domain/HouseNumber.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import static org.apache.commons.lang3.Validate.notBlank;
1919

20-
import javax.json.bind.adapter.JsonbAdapter;
21-
import javax.json.bind.annotation.JsonbTypeAdapter;
20+
import jakarta.json.bind.adapter.JsonbAdapter;
21+
import jakarta.json.bind.annotation.JsonbTypeAdapter;
2222

2323
import de.openknowledge.sample.address.domain.HouseNumber.Adapter;
2424

‎address-validation-service/src/main/java/de/openknowledge/sample/address/domain/Street.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import static org.apache.commons.lang3.Validate.notNull;
1919

20-
import javax.json.bind.annotation.JsonbCreator;
21-
import javax.json.bind.annotation.JsonbProperty;
20+
import jakarta.json.bind.annotation.JsonbCreator;
21+
import jakarta.json.bind.annotation.JsonbProperty;
2222

2323
public class Street {
2424

‎address-validation-service/src/main/java/de/openknowledge/sample/address/domain/StreetName.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
import static org.apache.commons.lang3.Validate.notBlank;
1919

20-
import javax.json.bind.adapter.JsonbAdapter;
21-
import javax.json.bind.annotation.JsonbTypeAdapter;
20+
import jakarta.json.bind.adapter.JsonbAdapter;
21+
import jakarta.json.bind.annotation.JsonbTypeAdapter;
2222

2323
import de.openknowledge.sample.address.domain.StreetName.Adapter;
2424

0 commit comments

Comments
 (0)