Merge pull request #505 from jedla97/update-with-test-resource

Change parameters for WithTestResource annotation
quarkus-qe · Sep 5, 2024 · d9693b8 · d9693b8
2 parents 6d11302 + cd415c7
commit d9693b8
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/daily.yaml b/.github/workflows/daily.yaml
@@ -208,7 +208,6 @@ jobs:
         with:
           version: ${{ matrix.graalvm-version }}
           java-version: ${{ matrix.graalvm-java-version }}
-          components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Configure Pagefile
         # Increased the page-file size due to memory-consumption of native-image command

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -44,7 +44,6 @@ jobs:
     strategy:
       matrix:
         java: [ 17 ]
-        image: [ "ubi-quarkus-mandrel-builder-image:jdk-21"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
@@ -88,6 +87,7 @@ jobs:
     strategy:
       matrix:
         java: [ 17 ]
+        image: [ "ubi-quarkus-mandrel-builder-image:jdk-21"]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
@@ -130,7 +130,8 @@ jobs:
 
           MODULES_ARG="${CHANGED// /,}"
           mvn -am -fae -V -B -s .github/mvn-settings.xml -fae -pl $MODULES_ARG clean verify -Dnative \
-            -Dquarkus.native.container-build=true -Dquarkus.native.native-image-xmx=4g
+            -Dquarkus.native.container-build=true -Dquarkus.native.native-image-xmx=4g \
+            -Dquarkus.native.builder-image=quay.io/quarkus/${{ matrix.image }}
       - name: Zip Artifacts
         if: failure()
         run: |
@@ -181,7 +182,6 @@ jobs:
         with:
           version: ${{ matrix.graalvm-version }}
           java-version: ${{ matrix.graalvm-java-version }}
-          components: 'native-image'
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Configure Pagefile
         # Increased the page-file size due to memory-consumption of native-image command

diff --git a/004-quarkus-HHH-and-HV/src/test/java/io/quarkus/qe/hibernate/validator/TestResources.java b/004-quarkus-HHH-and-HV/src/test/java/io/quarkus/qe/hibernate/validator/TestResources.java
@@ -1,8 +1,9 @@
 package io.quarkus.qe.hibernate.validator;
 
+import io.quarkus.test.common.TestResourceScope;
 import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.h2.H2DatabaseTestResource;
 
-@WithTestResource(value = H2DatabaseTestResource.class, restrictToAnnotatedClass = false)
+@WithTestResource(value = H2DatabaseTestResource.class, scope = TestResourceScope.MATCHING_RESOURCES)
 public class TestResources {
 }
diff --git a/006-quartz-manually-scheduled-job/src/test/java/io/quarkus/qe/quartz/TestResources.java b/006-quartz-manually-scheduled-job/src/test/java/io/quarkus/qe/quartz/TestResources.java
@@ -1,8 +1,9 @@
 package io.quarkus.qe.quartz;
 
+import io.quarkus.test.common.TestResourceScope;
 import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.h2.H2DatabaseTestResource;
 
-@WithTestResource(value = H2DatabaseTestResource.class, restrictToAnnotatedClass = false)
+@WithTestResource(value = H2DatabaseTestResource.class, scope = TestResourceScope.MATCHING_RESOURCES)
 public class TestResources {
 }
diff --git a/013-quarkus-oidc-restclient/pom.xml b/013-quarkus-oidc-restclient/pom.xml
@@ -30,11 +30,11 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-oidc-client-filter</artifactId>
+            <artifactId>quarkus-resteasy-client-oidc-filter</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-oidc-token-propagation</artifactId>
+            <artifactId>quarkus-resteasy-client-oidc-token-propagation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>

diff --git a/013-quarkus-oidc-restclient/src/main/resources/application.properties b/013-quarkus-oidc-restclient/src/main/resources/application.properties
@@ -28,13 +28,13 @@ quarkus.oidc-client.test-user.grant-options.password.password=test-user
 
 # RestClient
 io.quarkus.qe.ping.clients.PongClient/mp-rest/url=http://localhost:8081
-io.quarkus.qe.ping.clients.PongClient/mp-rest/scope=javax.inject.Singleton
+io.quarkus.qe.ping.clients.PongClient/mp-rest/scope=jakarta.inject.Singleton
 
 io.quarkus.qe.ping.clients.ReactivePongClient/mp-rest/url=http://localhost:8081
-io.quarkus.qe.ping.clients.ReactivePongClient/mp-rest/scope=javax.inject.Singleton
+io.quarkus.qe.ping.clients.ReactivePongClient/mp-rest/scope=jakarta.inject.Singleton
 
 io.quarkus.qe.ping.clients.LookupAuthorizationPongClient/mp-rest/url=http://localhost:8081
-io.quarkus.qe.ping.clients.LookupAuthorizationPongClient/mp-rest/scope=javax.inject.Singleton
+io.quarkus.qe.ping.clients.LookupAuthorizationPongClient/mp-rest/scope=jakarta.inject.Singleton
 
 io.quarkus.qe.ping.clients.AutoAcquireTokenPongClient/mp-rest/url=http://localhost:8081
 

diff --git a/013-quarkus-oidc-restclient/src/test/java/io/quarkus/qe/AbstractPingPongResourceTest.java b/013-quarkus-oidc-restclient/src/test/java/io/quarkus/qe/AbstractPingPongResourceTest.java
@@ -14,12 +14,13 @@
 
 import io.quarkus.qe.containers.KeycloakTestResource;
 import io.quarkus.qe.model.Score;
+import io.quarkus.test.common.TestResourceScope;
 import io.quarkus.test.common.WithTestResource;
 import io.restassured.RestAssured;
 import io.restassured.config.RestAssuredConfig;
 import io.restassured.http.ContentType;
 
-@WithTestResource(value = KeycloakTestResource.class, restrictToAnnotatedClass = false)
+@WithTestResource(value = KeycloakTestResource.class, scope = TestResourceScope.MATCHING_RESOURCES)
 public abstract class AbstractPingPongResourceTest {
 
     private static final String PING_ENDPOINT = "/%s-ping";

diff --git a/601-spring-data-primitive-types/src/test/java/io/quarkus/qe/spring/data/TestResources.java b/601-spring-data-primitive-types/src/test/java/io/quarkus/qe/spring/data/TestResources.java
@@ -1,8 +1,9 @@
 package io.quarkus.qe.spring.data;
 
+import io.quarkus.test.common.TestResourceScope;
 import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.h2.H2DatabaseTestResource;
 
-@WithTestResource(value = H2DatabaseTestResource.class, restrictToAnnotatedClass = false)
+@WithTestResource(value = H2DatabaseTestResource.class, scope = TestResourceScope.MATCHING_RESOURCES)
 public class TestResources {
 }