Skip to content

Commit 7ae1e69

Browse files
rsvobodarsvoboda
committed
Move to Quarkus 3.0.0.Alpha3
- switch to jakarta packages - drop of Quarkiverse extensions with really old relocations
1 parent 8d0e267 commit 7ae1e69

File tree

178 files changed

+902
-897
lines changed

Some content is hidden

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

178 files changed

+902
-897
lines changed

‎001-quarkus-getting-started-with-jaxrs/src/main/java/io/quarkus/qe/core/GreetingResource.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.quarkus.qe.core;
22

3-
import javax.ws.rs.GET;
4-
import javax.ws.rs.Path;
5-
import javax.ws.rs.Produces;
6-
import javax.ws.rs.core.MediaType;
3+
import jakarta.ws.rs.GET;
4+
import jakarta.ws.rs.Path;
5+
import jakarta.ws.rs.Produces;
6+
import jakarta.ws.rs.core.MediaType;
77

88
@Deprecated
99
@Path("/hello")

‎001-quarkus-getting-started-with-jaxrs/src/main/java/io/quarkus/qe/core/MultipartBody.java

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

33
import java.io.InputStream;
44

5-
import javax.ws.rs.FormParam;
6-
import javax.ws.rs.core.MediaType;
7-
85
import org.jboss.resteasy.annotations.providers.multipart.PartType;
96

7+
import jakarta.ws.rs.FormParam;
8+
import jakarta.ws.rs.core.MediaType;
9+
1010
public class MultipartBody {
1111

1212
@FormParam("text")

‎001-quarkus-getting-started-with-jaxrs/src/main/java/io/quarkus/qe/core/MultipartResource.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
import java.io.IOException;
44

5-
import javax.ws.rs.Consumes;
6-
import javax.ws.rs.POST;
7-
import javax.ws.rs.Path;
8-
import javax.ws.rs.Produces;
9-
import javax.ws.rs.core.MediaType;
10-
115
import org.apache.commons.io.IOUtils;
126
import org.jboss.resteasy.annotations.providers.multipart.MultipartForm;
137

8+
import jakarta.ws.rs.Consumes;
9+
import jakarta.ws.rs.POST;
10+
import jakarta.ws.rs.Path;
11+
import jakarta.ws.rs.Produces;
12+
import jakarta.ws.rs.core.MediaType;
13+
1414
@Path("/multipart")
1515
public class MultipartResource {
1616

‎001-quarkus-getting-started-with-jaxrs/src/test/java/io/quarkus/qe/core/MultipartResourceTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import java.nio.charset.StandardCharsets;
1111
import java.util.Random;
1212

13-
import javax.ws.rs.core.MediaType;
14-
1513
import org.apache.commons.io.IOUtils;
1614
import org.junit.jupiter.api.BeforeAll;
1715
import org.junit.jupiter.api.Test;
@@ -22,6 +20,8 @@
2220
import io.restassured.response.ValidatableResponse;
2321
import io.restassured.specification.MultiPartSpecification;
2422

23+
import jakarta.ws.rs.core.MediaType;
24+
2525
@QuarkusTest
2626
public class MultipartResourceTest {
2727

‎002-quarkus-all-extensions/pom.xml

+49-48
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,14 @@
176176
<groupId>io.quarkus</groupId>
177177
<artifactId>quarkus-elytron-security</artifactId>
178178
</dependency>
179-
<dependency>
180-
<groupId>io.quarkus</groupId>
181-
<artifactId>quarkus-amazon-dynamodb</artifactId>
182-
</dependency>
183-
<dependency>
184-
<groupId>io.quarkus</groupId>
185-
<artifactId>quarkus-tika</artifactId>
186-
</dependency>
179+
<!-- <dependency>-->
180+
<!-- <groupId>io.quarkus</groupId>-->
181+
<!-- <artifactId>quarkus-amazon-dynamodb</artifactId>-->
182+
<!-- </dependency>-->
183+
<!-- <dependency>-->
184+
<!-- <groupId>io.quarkus</groupId>-->
185+
<!-- <artifactId>quarkus-tika</artifactId>-->
186+
<!-- </dependency>-->
187187
<dependency>
188188
<groupId>io.quarkus</groupId>
189189
<artifactId>quarkus-vertx</artifactId>
@@ -284,10 +284,10 @@
284284
<groupId>io.quarkus</groupId>
285285
<artifactId>quarkus-resteasy-jaxb</artifactId>
286286
</dependency>
287-
<dependency>
288-
<groupId>io.quarkus</groupId>
289-
<artifactId>quarkus-vault</artifactId>
290-
</dependency>
287+
<!-- <dependency>-->
288+
<!-- <groupId>io.quarkus</groupId>-->
289+
<!-- <artifactId>quarkus-vault</artifactId>-->
290+
<!-- </dependency>-->
291291
<dependency>
292292
<groupId>io.quarkus</groupId>
293293
<artifactId>quarkus-mongodb-panache</artifactId>
@@ -316,10 +316,10 @@
316316
<groupId>io.quarkus</groupId>
317317
<artifactId>quarkus-jdbc-mariadb</artifactId>
318318
</dependency>
319-
<dependency>
320-
<groupId>io.quarkus</groupId>
321-
<artifactId>quarkus-artemis-jms</artifactId>
322-
</dependency>
319+
<!-- <dependency>-->
320+
<!-- <groupId>io.quarkus</groupId>-->
321+
<!-- <artifactId>quarkus-artemis-jms</artifactId>-->
322+
<!-- </dependency>-->
323323
<dependency>
324324
<groupId>io.quarkus</groupId>
325325
<artifactId>quarkus-logging-gelf</artifactId>
@@ -369,53 +369,53 @@
369369
<groupId>io.quarkus</groupId>
370370
<artifactId>quarkus-vertx-graphql</artifactId>
371371
</dependency>
372-
<dependency>
373-
<groupId>io.quarkus</groupId>
374-
<artifactId>quarkus-jgit</artifactId>
375-
</dependency>
372+
<!-- <dependency>-->
373+
<!-- <groupId>io.quarkus</groupId>-->
374+
<!-- <artifactId>quarkus-jgit</artifactId>-->
375+
<!-- </dependency>-->
376376
<dependency>
377377
<groupId>io.quarkus</groupId>
378378
<artifactId>quarkus-smallrye-reactive-messaging-mqtt</artifactId>
379379
</dependency>
380380
<!-- New extensions in 1.7.1 comparing to 1.3.4 -->
381-
<dependency>
382-
<groupId>io.quarkus</groupId>
383-
<artifactId>quarkus-amazon-alexa</artifactId>
384-
</dependency>
385-
<dependency>
386-
<groupId>io.quarkus</groupId>
387-
<artifactId>quarkus-amazon-kms</artifactId>
388-
</dependency>
381+
<!-- <dependency>-->
382+
<!-- <groupId>io.quarkus</groupId>-->
383+
<!-- <artifactId>quarkus-amazon-alexa</artifactId>-->
384+
<!-- </dependency>-->
385+
<!-- <dependency>-->
386+
<!-- <groupId>io.quarkus</groupId>-->
387+
<!-- <artifactId>quarkus-amazon-kms</artifactId>-->
388+
<!-- </dependency>-->
389389
<!-- The Amazon Lambda extensions is not compatible with uber-jar package type.
390390
<dependency>
391391
<groupId>io.quarkus</groupId>
392392
<artifactId>quarkus-amazon-lambda-common</artifactId>
393393
</dependency>
394394
-->
395-
<dependency>
396-
<groupId>io.quarkus</groupId>
397-
<artifactId>quarkus-amazon-s3</artifactId>
398-
</dependency>
399-
<dependency>
400-
<groupId>io.quarkus</groupId>
401-
<artifactId>quarkus-amazon-ses</artifactId>
402-
</dependency>
403-
<dependency>
404-
<groupId>io.quarkus</groupId>
405-
<artifactId>quarkus-amazon-sns</artifactId>
406-
</dependency>
407-
<dependency>
408-
<groupId>io.quarkus</groupId>
409-
<artifactId>quarkus-amazon-sqs</artifactId>
410-
</dependency>
395+
<!-- <dependency>-->
396+
<!-- <groupId>io.quarkus</groupId>-->
397+
<!-- <artifactId>quarkus-amazon-s3</artifactId>-->
398+
<!-- </dependency>-->
399+
<!-- <dependency>-->
400+
<!-- <groupId>io.quarkus</groupId>-->
401+
<!-- <artifactId>quarkus-amazon-ses</artifactId>-->
402+
<!-- </dependency>-->
403+
<!-- <dependency>-->
404+
<!-- <groupId>io.quarkus</groupId>-->
405+
<!-- <artifactId>quarkus-amazon-sns</artifactId>-->
406+
<!-- </dependency>-->
407+
<!-- <dependency>-->
408+
<!-- <groupId>io.quarkus</groupId>-->
409+
<!-- <artifactId>quarkus-amazon-sqs</artifactId>-->
410+
<!-- </dependency>-->
411411
<dependency>
412412
<groupId>io.quarkus</groupId>
413413
<artifactId>quarkus-avro</artifactId>
414414
</dependency>
415-
<dependency>
416-
<groupId>io.quarkus</groupId>
417-
<artifactId>quarkus-consul-config</artifactId>
418-
</dependency>
415+
<!-- <dependency>-->
416+
<!-- <groupId>io.quarkus</groupId>-->
417+
<!-- <artifactId>quarkus-consul-config</artifactId>-->
418+
<!-- </dependency>-->
419419
<dependency>
420420
<groupId>io.quarkus</groupId>
421421
<artifactId>quarkus-elasticsearch-rest-client</artifactId>
@@ -549,6 +549,7 @@
549549
<dependency>
550550
<groupId>jakarta.security.jacc</groupId>
551551
<artifactId>jakarta.security.jacc-api</artifactId>
552+
<version>1.6.1</version>
552553
</dependency>
553554
<dependency>
554555
<groupId>net.java.dev.jna</groupId>

‎002-quarkus-all-extensions/src/main/java/io/quarkus/qe/core/Fruit.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package io.quarkus.qe.core;
22

3-
import javax.persistence.Cacheable;
4-
import javax.persistence.Column;
5-
import javax.persistence.Entity;
6-
import javax.persistence.GeneratedValue;
7-
import javax.persistence.GenerationType;
8-
import javax.persistence.Id;
9-
import javax.persistence.NamedQuery;
10-
import javax.persistence.QueryHint;
11-
import javax.persistence.SequenceGenerator;
12-
import javax.persistence.Table;
3+
import jakarta.persistence.Cacheable;
4+
import jakarta.persistence.Column;
5+
import jakarta.persistence.Entity;
6+
import jakarta.persistence.GeneratedValue;
7+
import jakarta.persistence.GenerationType;
8+
import jakarta.persistence.Id;
9+
import jakarta.persistence.NamedQuery;
10+
import jakarta.persistence.QueryHint;
11+
import jakarta.persistence.SequenceGenerator;
12+
import jakarta.persistence.Table;
1313

1414
@Entity
1515
@Table(name = "known_fruits")

‎002-quarkus-all-extensions/src/main/java/io/quarkus/qe/core/GreetingResource.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.quarkus.qe.core;
22

3-
import javax.ws.rs.GET;
4-
import javax.ws.rs.Path;
5-
import javax.ws.rs.Produces;
6-
import javax.ws.rs.core.MediaType;
3+
import jakarta.ws.rs.GET;
4+
import jakarta.ws.rs.Path;
5+
import jakarta.ws.rs.Produces;
6+
import jakarta.ws.rs.core.MediaType;
77

88
@Path("/hello")
99
public class GreetingResource {

‎003-quarkus-many-extensions/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<artifactId>rest-assured</artifactId>
2323
<scope>test</scope>
2424
</dependency>
25-
<dependency>
26-
<groupId>io.quarkus</groupId>
27-
<artifactId>quarkus-artemis-jms</artifactId>
28-
</dependency>
25+
<!-- <dependency>-->
26+
<!-- <groupId>io.quarkus</groupId>-->
27+
<!-- <artifactId>quarkus-artemis-jms</artifactId>-->
28+
<!-- </dependency>-->
2929
<dependency>
3030
<groupId>io.quarkus</groupId>
3131
<artifactId>quarkus-elytron-security</artifactId>

‎003-quarkus-many-extensions/src/main/java/io/quarkus/qe/many/extensions/ManyExtensionsResource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.quarkus.qe.many.extensions;
22

3-
import javax.ws.rs.GET;
4-
import javax.ws.rs.Path;
3+
import jakarta.ws.rs.GET;
4+
import jakarta.ws.rs.Path;
55

66
@Path("/hello")
77
public class ManyExtensionsResource {

‎004-quarkus-HHH-and-HV/src/main/java/io/quarkus/qe/hibernate/items/Account.java

+11-11
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
import java.util.HashSet;
55
import java.util.Set;
66

7-
import javax.persistence.Column;
8-
import javax.persistence.Entity;
9-
import javax.persistence.FetchType;
10-
import javax.persistence.Id;
11-
import javax.persistence.JoinColumn;
12-
import javax.persistence.JoinTable;
13-
import javax.persistence.ManyToMany;
14-
import javax.persistence.Temporal;
15-
import javax.persistence.TemporalType;
16-
import javax.validation.constraints.NotNull;
17-
import javax.validation.constraints.Size;
7+
import jakarta.persistence.Column;
8+
import jakarta.persistence.Entity;
9+
import jakarta.persistence.FetchType;
10+
import jakarta.persistence.Id;
11+
import jakarta.persistence.JoinColumn;
12+
import jakarta.persistence.JoinTable;
13+
import jakarta.persistence.ManyToMany;
14+
import jakarta.persistence.Temporal;
15+
import jakarta.persistence.TemporalType;
16+
import jakarta.validation.constraints.NotNull;
17+
import jakarta.validation.constraints.Size;
1818

1919
@Entity
2020
public class Account {

‎004-quarkus-HHH-and-HV/src/main/java/io/quarkus/qe/hibernate/items/Customer.java

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

33
import java.util.Date;
44

5-
import javax.persistence.CascadeType;
6-
import javax.persistence.Column;
7-
import javax.persistence.Entity;
8-
import javax.persistence.FetchType;
9-
import javax.persistence.Id;
10-
import javax.persistence.OneToOne;
11-
import javax.persistence.Temporal;
12-
import javax.persistence.TemporalType;
13-
import javax.persistence.Version;
5+
import jakarta.persistence.CascadeType;
6+
import jakarta.persistence.Column;
7+
import jakarta.persistence.Entity;
8+
import jakarta.persistence.FetchType;
9+
import jakarta.persistence.Id;
10+
import jakarta.persistence.OneToOne;
11+
import jakarta.persistence.Temporal;
12+
import jakarta.persistence.TemporalType;
13+
import jakarta.persistence.Version;
1414

1515
@Entity
1616
public class Customer {

‎004-quarkus-HHH-and-HV/src/main/java/io/quarkus/qe/hibernate/items/Item.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.quarkus.qe.hibernate.items;
22

3-
import javax.persistence.Entity;
4-
import javax.persistence.FetchType;
5-
import javax.persistence.Id;
6-
import javax.persistence.JoinColumn;
7-
import javax.persistence.ManyToOne;
3+
import jakarta.persistence.Entity;
4+
import jakarta.persistence.FetchType;
5+
import jakarta.persistence.Id;
6+
import jakarta.persistence.JoinColumn;
7+
import jakarta.persistence.ManyToOne;
88

99
@Entity
1010
public class Item {

‎004-quarkus-HHH-and-HV/src/main/java/io/quarkus/qe/hibernate/items/ItemsResource.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package io.quarkus.qe.hibernate.items;
22

3-
import javax.inject.Inject;
4-
import javax.persistence.EntityManager;
5-
import javax.persistence.TypedQuery;
6-
import javax.persistence.criteria.CriteriaBuilder;
7-
import javax.persistence.criteria.CriteriaQuery;
8-
import javax.transaction.Transactional;
9-
import javax.ws.rs.GET;
10-
import javax.ws.rs.Path;
3+
import jakarta.inject.Inject;
4+
import jakarta.persistence.EntityManager;
5+
import jakarta.persistence.TypedQuery;
6+
import jakarta.persistence.criteria.CriteriaBuilder;
7+
import jakarta.persistence.criteria.CriteriaQuery;
8+
import jakarta.transaction.Transactional;
9+
import jakarta.ws.rs.GET;
10+
import jakarta.ws.rs.Path;
1111

1212
@Path("/items")
1313
@Transactional

‎004-quarkus-HHH-and-HV/src/main/java/io/quarkus/qe/hibernate/items/Role.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.quarkus.qe.hibernate.items;
22

3-
import javax.persistence.Column;
4-
import javax.persistence.Entity;
5-
import javax.persistence.Id;
3+
import jakarta.persistence.Column;
4+
import jakarta.persistence.Entity;
5+
import jakarta.persistence.Id;
66

77
@Entity
88
public class Role {

‎004-quarkus-HHH-and-HV/src/main/java/io/quarkus/qe/hibernate/transaction/TransactionScopeBean.java

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

33
import java.util.concurrent.atomic.AtomicBoolean;
44

5-
import javax.annotation.PostConstruct;
6-
import javax.annotation.PreDestroy;
7-
import javax.transaction.TransactionScoped;
5+
import jakarta.annotation.PostConstruct;
6+
import jakarta.annotation.PreDestroy;
7+
import jakarta.transaction.TransactionScoped;
88

99
@TransactionScoped
1010
public class TransactionScopeBean {

0 commit comments

Comments
 (0)