Skip to content

Commit c876a64

Browse files
appiepollo14appiepollo14
committed
Updates quarkus sample app to 3.x
Signed-off-by: asjervanasten <[email protected]>
1 parent 92165db commit c876a64

File tree

10 files changed

+48
-43
lines changed

10 files changed

+48
-43
lines changed

‎core/jakarta/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,3 @@ jar.finalizedBy overwrite
6161
apply from: publishScript
6262

6363
publishToMavenLocal.dependsOn ':microshed-testing-core:publishToMavenLocal'
64-

‎modules/quarkus/src/main/java/org/microshed/testing/quarkus/QuarkusConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ private void autoConfigureJwt() {
141141
}
142142

143143
private void autoConfigureDatabases() {
144-
if (System.getProperty("quarkus.datasource.url") != null ||
144+
if (System.getProperty("quarkus.datasource.jdbc.url") != null ||
145145
System.getProperty("quarkus.datasource.username") != null ||
146146
System.getProperty("quarkus.datasource.password") != null)
147147
return; // Do not override explicit configuration
@@ -153,7 +153,7 @@ private void autoConfigureDatabases() {
153153
if (jdbcContainers.size() == 1) {
154154
GenericContainer<?> db = jdbcContainers.get(0);
155155
String jdbcUrl = (String) JdbcContainerClass.getMethod("getJdbcUrl").invoke(db);
156-
System.setProperty("quarkus.datasource.url", jdbcUrl);
156+
System.setProperty("quarkus.datasource.jdbc.url", jdbcUrl);
157157
System.setProperty("quarkus.datasource.username", (String) JdbcContainerClass.getMethod("getUsername").invoke(db));
158158
System.setProperty("quarkus.datasource.password", (String) JdbcContainerClass.getMethod("getPassword").invoke(db));
159159
LOG.info("Set quarkus.datasource.url to: " + jdbcUrl);

‎modules/testcontainers/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ test {
3333
apply from: publishScript
3434

3535
publishToMavenLocal.dependsOn ':microshed-testing-core:publishToMavenLocal'
36+
publishToMavenLocal.dependsOn ':microshed-testing-core-jakarta:publishToMavenLocal'
3637

3738
task integrationTest(type: Test) {
3839
description = 'Runs integration tests.'

‎sample-apps/quarkus-app/pom.xml

+21-16
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@
66
<artifactId>quarkus-demo</artifactId>
77
<version>1.0.0-SNAPSHOT</version>
88
<properties>
9-
<compiler-plugin.version>3.8.1</compiler-plugin.version>
9+
<compiler-plugin.version>3.11.0</compiler-plugin.version>
1010
<maven.compiler.parameters>true</maven.compiler.parameters>
11-
<maven.compiler.source>1.8</maven.compiler.source>
12-
<maven.compiler.target>1.8</maven.compiler.target>
11+
<maven.compiler.release>11</maven.compiler.release>
1312
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1413
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1514
<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
1615
<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
17-
<quarkus.platform.version>1.8.3.Final</quarkus.platform.version>
18-
<quarkus-plugin.version>1.8.3.Final</quarkus-plugin.version>
19-
<surefire-plugin.version>2.22.2</surefire-plugin.version>
16+
<quarkus.platform.version>3.2.8.Final</quarkus.platform.version>
17+
<surefire-plugin.version>3.1.2</surefire-plugin.version>
2018
</properties>
2119
<dependencyManagement>
2220
<dependencies>
@@ -55,7 +53,7 @@
5553
<groupId>io.quarkus</groupId>
5654
<artifactId>quarkus-mongodb-client</artifactId>
5755
</dependency>
58-
<!--
56+
<!--
5957
<dependency>
6058
<groupId>io.quarkus</groupId>
6159
<artifactId>quarkus-smallrye-jwt</artifactId>
@@ -67,7 +65,7 @@
6765
<artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>
6866
</dependency>
6967
-->
70-
68+
7169
<!-- Test dependencies -->
7270
<dependency>
7371
<groupId>io.quarkus</groupId>
@@ -87,17 +85,17 @@
8785
</dependency>
8886
<dependency>
8987
<groupId>org.microshed</groupId>
90-
<artifactId>microshed-testing-core</artifactId>
88+
<artifactId>microshed-testing-core-jakarta</artifactId>
9189
<version>0.9.2-SNAPSHOT</version>
9290
<scope>test</scope>
9391
</dependency>
9492
<dependency>
9593
<groupId>org.testcontainers</groupId>
9694
<artifactId>postgresql</artifactId>
97-
<version>1.15.0</version>
95+
<version>1.19.1</version>
9896
<scope>test</scope>
9997
</dependency>
100-
<!--
98+
<!--
10199
<dependency>
102100
<groupId>org.testcontainers</groupId>
103101
<artifactId>kafka</artifactId>
@@ -108,7 +106,7 @@
108106
<dependency>
109107
<groupId>org.slf4j</groupId>
110108
<artifactId>slf4j-log4j12</artifactId>
111-
<version>1.7.36</version>
109+
<version>2.0.9</version>
112110
<scope>test</scope>
113111
</dependency>
114112
</dependencies>
@@ -117,11 +115,13 @@
117115
<plugin>
118116
<groupId>io.quarkus</groupId>
119117
<artifactId>quarkus-maven-plugin</artifactId>
120-
<version>${quarkus-plugin.version}</version>
118+
<version>${quarkus.platform.version}</version>
121119
<executions>
122120
<execution>
123121
<goals>
124122
<goal>build</goal>
123+
<goal>generate-code</goal>
124+
<goal>generate-code-tests</goal>
125125
</goals>
126126
</execution>
127127
</executions>
@@ -161,9 +161,14 @@
161161
<goal>verify</goal>
162162
</goals>
163163
<configuration>
164-
<systemProperties>
165-
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
166-
</systemProperties>
164+
<systemPropertyVariables>
165+
<native.image.path>
166+
${project.build.directory}/${project.build.finalName}-runner
167+
</native.image.path>
168+
<java.util.logging.manager>org.jboss.logmanager.LogManager
169+
</java.util.logging.manager>
170+
<maven.home>${maven.home}</maven.home>
171+
</systemPropertyVariables>
167172
</configuration>
168173
</execution>
169174
</executions>

‎sample-apps/quarkus-app/src/main/java/org/example/app/ExampleResource.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
*/
1919
package org.example.app;
2020

21-
import javax.ws.rs.GET;
22-
import javax.ws.rs.Path;
23-
import javax.ws.rs.Produces;
24-
import javax.ws.rs.core.MediaType;
21+
import jakarta.ws.rs.GET;
22+
import jakarta.ws.rs.Path;
23+
import jakarta.ws.rs.Produces;
24+
import jakarta.ws.rs.core.MediaType;
2525

2626
@Path("/hello")
2727
public class ExampleResource {

‎sample-apps/quarkus-app/src/main/java/org/example/app/FruitResource.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020

2121
import java.util.List;
2222

23-
import javax.inject.Inject;
24-
import javax.ws.rs.Consumes;
25-
import javax.ws.rs.GET;
26-
import javax.ws.rs.POST;
27-
import javax.ws.rs.Path;
28-
import javax.ws.rs.Produces;
29-
import javax.ws.rs.core.MediaType;
23+
import jakarta.inject.Inject;
24+
import jakarta.ws.rs.Consumes;
25+
import jakarta.ws.rs.GET;
26+
import jakarta.ws.rs.POST;
27+
import jakarta.ws.rs.Path;
28+
import jakarta.ws.rs.Produces;
29+
import jakarta.ws.rs.core.MediaType;
3030

3131
@Path("/fruits")
3232
@Produces(MediaType.APPLICATION_JSON)

‎sample-apps/quarkus-app/src/main/java/org/example/app/FruitService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import java.util.ArrayList;
2222
import java.util.List;
2323

24-
import javax.enterprise.context.ApplicationScoped;
25-
import javax.inject.Inject;
24+
import jakarta.enterprise.context.ApplicationScoped;
25+
import jakarta.inject.Inject;
2626

2727
import org.bson.Document;
2828

‎sample-apps/quarkus-app/src/main/java/org/example/app/Person.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.time.LocalDate;
2222
import java.util.List;
2323

24-
import javax.persistence.Entity;
24+
import jakarta.persistence.Entity;
2525

2626
import io.quarkus.hibernate.orm.panache.PanacheEntity;
2727

‎sample-apps/quarkus-app/src/main/java/org/example/app/PersonResource.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020

2121
import java.util.List;
2222

23-
import javax.transaction.Transactional;
24-
import javax.ws.rs.GET;
25-
import javax.ws.rs.POST;
26-
import javax.ws.rs.Path;
27-
import javax.ws.rs.PathParam;
28-
import javax.ws.rs.Produces;
29-
import javax.ws.rs.QueryParam;
30-
import javax.ws.rs.core.MediaType;
23+
import jakarta.transaction.Transactional;
24+
import jakarta.ws.rs.GET;
25+
import jakarta.ws.rs.POST;
26+
import jakarta.ws.rs.Path;
27+
import jakarta.ws.rs.PathParam;
28+
import jakarta.ws.rs.Produces;
29+
import jakarta.ws.rs.QueryParam;
30+
import jakarta.ws.rs.core.MediaType;
3131

3232
@Path("/people")
3333
@Transactional

‎sample-apps/quarkus-app/src/main/resources/application.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
quarkus.datasource.url=jdbc:postgresql://localhost:5432/quark_db
2-
quarkus.datasource.driver=org.postgresql.Driver
1+
quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/quark_db
2+
quarkus.datasource.jdbc.driver=org.postgresql.Driver
33
quarkus.datasource.username=quark
44
quarkus.datasource.password=quark
55

0 commit comments

Comments
 (0)