fix: use quarkus compatible classloader

Use a classLoader that is compatible with quarkus for default i18N translation. part of vaadin/flow#18977
vaadin · Apr 11, 2024 · 3a8bf62 · 3a8bf62
1 parent 8595c07
commit 3a8bf62
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 17 deletions.
diff --git a/build-tools/pom.xml b/build-tools/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>vaadin-quarkus-parent</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>vaadin-quarkus-buildtools</artifactId>

diff --git a/deployment/pom.xml b/deployment/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>vaadin-quarkus-parent</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>vaadin-quarkus-deployment</artifactId>

diff --git a/integration-tests/codestarts/pom.xml b/integration-tests/codestarts/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-quarkus-integration-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>vaadin-quarkus-codestarts-tests</artifactId>

diff --git a/integration-tests/common-test-code/pom.xml b/integration-tests/common-test-code/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-quarkus-integration-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>vaadin-quarkus-common-test-code</artifactId>

diff --git a/integration-tests/custom-websocket-dependency/pom.xml b/integration-tests/custom-websocket-dependency/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-quarkus-integration-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/integration-tests/development/pom.xml b/integration-tests/development/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-quarkus-integration-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>vaadin-quarkus-development-tests</artifactId>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-quarkus-parent</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>vaadin-quarkus-integration-tests</artifactId>

diff --git a/integration-tests/production/pom.xml b/integration-tests/production/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-quarkus-integration-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>vaadin-quarkus-production-tests</artifactId>

diff --git a/integration-tests/reusable-theme/pom.xml b/integration-tests/reusable-theme/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-quarkus-integration-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -16,7 +16,7 @@
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <vaadin-lumo-theme.version>24.0-SNAPSHOT</vaadin-lumo-theme.version>
+        <vaadin-lumo-theme.version>24.4-SNAPSHOT</vaadin-lumo-theme.version>
     </properties>
 
     <dependencies>

diff --git a/integration-tests/test-addons/addon-with-jandex/pom.xml b/integration-tests/test-addons/addon-with-jandex/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-quarkus-integration-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/integration-tests/test-addons/addon-without-jandex/pom.xml b/integration-tests/test-addons/addon-without-jandex/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-quarkus-integration-tests</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>com.vaadin</groupId>
     <artifactId>vaadin-quarkus-parent</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Vaadin Quarkus - Parent</name>
@@ -34,7 +34,7 @@
         <failsafe-plugin.version>${surefire-plugin.version}</failsafe-plugin.version>
         <maven.compiler.parameters>true</maven.compiler.parameters>
 
-        <vaadin.flow.version>24.0-SNAPSHOT</vaadin.flow.version>
+        <vaadin.flow.version>24.4-SNAPSHOT</vaadin.flow.version>
         <quarkus.version>3.0.1.Final</quarkus.version>
         <open.telemetry.alpha.version>1.16.0-alpha</open.telemetry.alpha.version>
         <open.telemetry.version>1.16.0</open.telemetry.version>

diff --git a/runtime/pom.xml b/runtime/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>vaadin-quarkus-parent</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>vaadin-quarkus</artifactId>

diff --git a/runtime/src/main/java/com/vaadin/quarkus/QuarkusInstantiatorFactory.java b/runtime/src/main/java/com/vaadin/quarkus/QuarkusInstantiatorFactory.java
@@ -36,8 +36,13 @@ public Instantiator createInstantitor(VaadinService vaadinService) {
         if (!getServiceClass().isAssignableFrom(vaadinService.getClass())) {
             return null;
         }
-        return new QuarkusInstantiator(new DefaultInstantiator(vaadinService),
-                beanManager);
+        DefaultInstantiator delegate = new DefaultInstantiator(vaadinService) {
+            @Override
+            protected ClassLoader getClassLoader() {
+                return Thread.currentThread().getContextClassLoader();
+            }
+        };
+        return new QuarkusInstantiator(delegate, beanManager);
     }
 
     /**