From 4d5a9d3c0d560dea081ea1890d35af92c8ccecb3 Mon Sep 17 00:00:00 2001
From: Vaadin Bot <vaadin-bot@users.noreply.github.com>
Date: Tue, 7 Jan 2025 16:56:20 +0100
Subject: [PATCH] update copilot to 24.6.1 (#7169)

* update copilot to 24.6.1

* update hilla to 24.6.1 (#7164)

Co-authored-by: Zhe Sun <31067185+ZheSun88@users.noreply.github.com>

---------

Co-authored-by: Zhe Sun <31067185+ZheSun88@users.noreply.github.com>
---
 vaadin-dev/pom.xml | 72 ++++++++++++++++++++++++++++++++++++++++------
 versions.json      |  4 +--
 2 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/vaadin-dev/pom.xml b/vaadin-dev/pom.xml
index 740071a61..1cab33bb6 100644
--- a/vaadin-dev/pom.xml
+++ b/vaadin-dev/pom.xml
@@ -53,8 +53,8 @@
             <groupId>com.vaadin</groupId>
             <artifactId>copilot</artifactId>
             <exclusions>
-                <!-- io.projectreactor.netty:reactor-netty:jar:1.1.24 brings vulnerable dependencies
-                and also failed the dependency convergence test, as netty-* has different versions   -->
+                <!-- io.projectreactor.netty:reactor-netty:jar:1.2.0 and netty-all:4.1.116.Final
+                 failed the dependency convergence test, as netty-* has different versions   -->
                 <exclusion>
                     <groupId>io.netty</groupId>
                     <artifactId>netty-common</artifactId>
@@ -67,6 +67,18 @@
                     <groupId>io.netty</groupId>
                     <artifactId>netty-codec</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-codec-http</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-codec-http2</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-handler-proxy</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>io.netty</groupId>
                     <artifactId>netty-handler</artifactId>
@@ -79,47 +91,89 @@
                     <groupId>io.netty</groupId>
                     <artifactId>netty-resolver</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-resolver-dns</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>io.netty</groupId>
                     <artifactId>netty-transport-native-unix-common</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-resolver-dns-native-macos</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>netty-transport-native-epoll</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-common</artifactId>
-            <version>4.1.115.Final</version>
+            <version>4.1.116.Final</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
-            <version>4.1.115.Final</version>
+            <version>4.1.116.Final</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec</artifactId>
-            <version>4.1.115.Final</version>
+            <version>4.1.116.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http</artifactId>
+            <version>4.1.116.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http2</artifactId>
+            <version>4.1.116.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-handler-proxy</artifactId>
+            <version>4.1.116.Final</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
-            <version>4.1.115.Final</version>
+            <version>4.1.116.Final</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport</artifactId>
-            <version>4.1.115.Final</version>
+            <version>4.1.116.Final</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-resolver</artifactId>
-            <version>4.1.115.Final</version>
+            <version>4.1.116.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver-dns</artifactId>
+            <version>4.1.116.Final</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-unix-common</artifactId>
-            <version>4.1.115.Final</version>
+            <version>4.1.116.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver-dns-native-macos</artifactId>
+            <version>4.1.116.Final</version>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-native-epoll</artifactId>
+            <version>4.1.116.Final</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/versions.json b/versions.json
index 50678ad9e..41cee5039 100644
--- a/versions.json
+++ b/versions.json
@@ -143,7 +143,7 @@
             "npmName": "@vaadin/grid"
         },
         "hilla": {
-            "javaVersion": "24.6.0"
+            "javaVersion": "24.6.1"
         },
         "horizontal-layout": {
             "jsVersion": "24.6.1",
@@ -391,7 +391,7 @@
             "javaVersion": "1.1.0"
         },
         "copilot": {
-            "javaVersion": "24.6.0"
+            "javaVersion": "24.6.1"
         },
         "kubernetes-kit-starter": {
             "javaVersion": "2.4.0"