Merge branch 'issues/76_vaadin-24' into test/76_vaadin-24

mcollovati · Jan 5, 2024 · d67e2c5 · d67e2c5
2 parents c6dfbf0 + bf7b030
commit d67e2c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -130,6 +130,8 @@ jobs:
           tar cf - .m2 | (cd ~ && tar xf -)
       - name: Build
         if: ${{ github.run_attempt > 1 }}
+        env:
+          VAADIN_OFFLINE_KEY: ${{ secrets.VAADIN_OFFLINE_KEY }}
         run: |
           set -x -e -o pipefail
           mvn -V -e -B -ntp -DskipTests -DskipVertxRun=true -Dmaven.javadoc.skip=false install -Pflow-ui-tests
@@ -185,6 +187,8 @@ jobs:
           tar cf - .m2 | (cd ~ && tar xf -)
       - name: Build
         if: ${{ github.run_attempt > 1 }}
+        env:
+          VAADIN_OFFLINE_KEY: ${{ secrets.VAADIN_OFFLINE_KEY }}
         run: |
           set -x -e -o pipefail
           mvn -V -e -B -ntp -DskipTests -DskipVertxRun=true -Dmaven.javadoc.skip=false install -Pflow-ui-tests

diff --git a/vertx-vaadin-flow/pom.xml b/vertx-vaadin-flow/pom.xml
@@ -22,7 +22,7 @@
         <jackson.version>2.14.2</jackson.version>
         <javax.annotation.api.version>1.3.2</javax.annotation.api.version>
         <jakarta.websocket.version>2.1.1</jakarta.websocket.version>
-        <validation.api.version>2.0.1.Final</validation.api.version>
+        <validation.api.version>3.0.2</validation.api.version>
     </properties>
 
     <dependencyManagement>
@@ -149,8 +149,8 @@
             <version>${vertx.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
             <version>${validation.api.version}</version>
         </dependency>
         <dependency>
@@ -222,13 +222,13 @@
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>6.1.6.Final</version>
+            <version>8.0.1.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>jakarta.el</artifactId>
-            <version>3.0.3</version>
+            <version>5.0.0-M1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>