Skip to content

Commit

Permalink
update copilot to 24.6.1 (#7169)
Browse files Browse the repository at this point in the history 
* update copilot to 24.6.1

* update hilla to 24.6.1 (#7164)

Co-authored-by: Zhe Sun <[email protected]>

---------

Co-authored-by: Zhe Sun <[email protected]>
  • Loading branch information
@vaadin-bot @ZheSun88
vaadin-bot and ZheSun88 authored Jan 7, 2025
1 parent 504139b commit 4d5a9d3
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 11 deletions.
72 changes: 63 additions & 9 deletions vaadin-dev/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions versions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
"npmName": "@vaadin/grid"
},
"hilla": {
"javaVersion": "24.6.0"
"javaVersion": "24.6.1"
},
"horizontal-layout": {
"jsVersion": "24.6.1",
Expand Down Expand Up @@ -391,7 +391,7 @@
"javaVersion": "1.1.0"
},
"copilot": {
"javaVersion": "24.6.0"
"javaVersion": "24.6.1"
},
"kubernetes-kit-starter": {
"javaVersion": "2.4.0"
Expand Down

0 comments on commit 4d5a9d3

Please sign in to comment.