Fix and refactor the scope of some resources

.github/workflows/daily.yaml

@@ -116,7 +116,7 @@ jobs:
       - name: Test in Native mode
         run: |
           mvn -fae -V -B --no-transfer-progress -s .github/mvn-settings.xml -fae clean verify -Dnative \
-            -Dquarkus.native.container-build=true -Dquarkus.native.native-image-xmx=7g \
+            -Dquarkus.native.container-build=true -Dquarkus.native.native-image-xmx=8g \
             -Dquarkus.native.builder-image=quay.io/quarkus/${{ matrix.image }}
       - name: Zip Artifacts
         if: failure()
@@ -213,7 +213,7 @@ jobs:
         shell: bash
         run: |
           # Build on Native requires a lot of disk space, for now, we'll run only one module.
-          mvn -V -B --no-transfer-progress -s .github/mvn-settings.xml -fae clean verify -Dnative -Dquarkus.native.native-image-xmx=7g -pl '003-quarkus-many-extensions'
+          mvn -V -B --no-transfer-progress -s .github/mvn-settings.xml -fae clean verify -Dnative -Dquarkus.native.native-image-xmx=8g -pl '003-quarkus-many-extensions'
       - name: Zip Artifacts
         shell: bash
         if: failure()

.github/workflows/pr.yaml

@@ -130,7 +130,7 @@ jobs:
 
           MODULES_ARG="${CHANGED// /,}"
           mvn -am -fae -V -B --no-transfer-progress -s .github/mvn-settings.xml -fae -pl $MODULES_ARG clean verify -Dnative \
-            -Dquarkus.native.container-build=true -Dquarkus.native.native-image-xmx=7g \
+            -Dquarkus.native.container-build=true -Dquarkus.native.native-image-xmx=8g \
             -Dquarkus.native.builder-image=quay.io/quarkus/${{ matrix.image }}
       - name: Zip Artifacts
         if: failure()
@@ -187,7 +187,7 @@ jobs:
         shell: bash
         run: |
           mvn -V -B --no-transfer-progress -s .github/mvn-settings.xml -fae clean verify -Dnative \
-            -Dquarkus.native.native-image-xmx=7g \
+            -Dquarkus.native.native-image-xmx=8g \
             -pl '003-quarkus-many-extensions'
       - name: Zip Artifacts
         shell: bash

004-quarkus-HHH-and-HV/src/test/java/io/quarkus/qe/hibernate/items/ItemsResourceTest.java

@@ -5,9 +5,13 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.test.common.TestResourceScope;
+import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
+@WithTestResource(value = H2DatabaseTestResource.class, scope = TestResourceScope.RESTRICTED_TO_CLASS)
 public class ItemsResourceTest {
 
     /**

004-quarkus-HHH-and-HV/src/test/java/io/quarkus/qe/hibernate/transaction/TransactionScopeBeanResourceTest.java

@@ -6,9 +6,13 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.test.common.TestResourceScope;
+import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
+@WithTestResource(value = H2DatabaseTestResource.class, scope = TestResourceScope.RESTRICTED_TO_CLASS)
 public class TransactionScopeBeanResourceTest {
 
     private static final String TRANSACTION_SCOPE_BASE_PATH = "/transaction-scope";

004-quarkus-HHH-and-HV/src/test/java/io/quarkus/qe/hibernate/validator/JakartaPersistenceAndHibernateValidatorResourceTest.java

@@ -6,9 +6,13 @@
 
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.test.common.TestResourceScope;
+import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest
+@WithTestResource(value = H2DatabaseTestResource.class, scope = TestResourceScope.RESTRICTED_TO_CLASS)
 public class JakartaPersistenceAndHibernateValidatorResourceTest {
 
     @Test

006-quartz-manually-scheduled-job/src/test/java/io/quarkus/qe/quartz/TestResources.java

@@ -4,6 +4,6 @@
 import io.quarkus.test.common.WithTestResource;
 import io.quarkus.test.h2.H2DatabaseTestResource;
 
-@WithTestResource(value = H2DatabaseTestResource.class, scope = TestResourceScope.MATCHING_RESOURCES)
+@WithTestResource(value = H2DatabaseTestResource.class, scope = TestResourceScope.GLOBAL)
 public class TestResources {
 }

601-spring-data-primitive-types/src/test/java/io/quarkus/qe/spring/data/BookResourceTest.java

@@ -16,11 +16,15 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.qe.spring.data.model.Book;
+import io.quarkus.test.common.TestResourceScope;
+import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import io.restassured.response.Response;
 
 @QuarkusTest
+@WithTestResource(value = H2DatabaseTestResource.class, scope = TestResourceScope.MATCHING_RESOURCES)
 public class BookResourceTest {
 
     @Test

601-spring-data-primitive-types/src/test/java/io/quarkus/qe/spring/data/CatResourceTest.java

@@ -10,11 +10,15 @@
 import org.junit.jupiter.api.Test;
 
 import io.quarkus.qe.spring.data.model.Cat;
+import io.quarkus.test.common.TestResourceScope;
+import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.ContentType;
 import io.restassured.response.Response;
 
 @QuarkusTest
+@WithTestResource(value = H2DatabaseTestResource.class, scope = TestResourceScope.MATCHING_RESOURCES)
 public class CatResourceTest {
     @Test
     void testCustomFindPublicationYearObjectBoolean() {

601-spring-data-primitive-types/src/test/java/io/quarkus/qe/spring/data/CommonsHeadersTest.java

@@ -12,12 +12,16 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
+import io.quarkus.test.common.TestResourceScope;
+import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.Headers;
 import io.restassured.response.Response;
 
 @QuarkusTest
+@WithTestResource(value = H2DatabaseTestResource.class, scope = TestResourceScope.MATCHING_RESOURCES)
 public class CommonsHeadersTest {
     //This is for regression test for https://github.com/quarkusio/quarkus/pull/12234
     @Test

601-spring-data-primitive-types/src/test/java/io/quarkus/qe/spring/di/SpringDiTest.java

@@ -12,11 +12,15 @@
 
 import io.quarkus.arc.Arc;
 import io.quarkus.arc.InjectableBean;
+import io.quarkus.test.common.TestResourceScope;
+import io.quarkus.test.common.WithTestResource;
+import io.quarkus.test.h2.H2DatabaseTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 
 import jakarta.enterprise.inject.spi.CDI;
 
 @QuarkusTest
+@WithTestResource(value = H2DatabaseTestResource.class, scope = TestResourceScope.MATCHING_RESOURCES)
 public class SpringDiTest {
 
     private static Stream<Class<?>> beanClassProvider() {