Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-11.0.x' into merge/jetty-12.0.x/11660-upgrade-quiche-to-0_21_0

This commit is contained in:
Ludovic Orban 2024-04-18 10:41:37 +02:00
parent 33feac33e7 37dd03a630
commit 74b76b9a2e
No known key found for this signature in database
GPG Key ID: 3D146A4A1C58367E
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-foreign/src/main/java/org/eclipse/jetty/quic/quiche/foreign/quiche_h.java
View File

@ -30,7 +30,7 @@ import static org.eclipse.jetty.quic.quiche.foreign.NativeHelper.C_POINTER;
public class quiche_h public class quiche_h
{ {
private static final String EXPECTED_QUICHE_VERSION = "0.20.1"; private static final String EXPECTED_QUICHE_VERSION = "0.21.0";
private static final Logger LOG = LoggerFactory.getLogger(quiche_h.class); private static final Logger LOG = LoggerFactory.getLogger(quiche_h.class);
private static class LoggingCallback private static class LoggingCallback

6
jetty-core/jetty-quic/jetty-quic-quiche/jetty-quic-quiche-jna/src/main/java/org/eclipse/jetty/quic/quiche/jna/LibQuiche.java
View File

@ -31,7 +31,7 @@ public interface LibQuiche extends Library
{ {
// This interface is a translation of the quiche.h header of a specific version. // This interface is a translation of the quiche.h header of a specific version.
// It needs to be reviewed each time the native lib version changes. // It needs to be reviewed each time the native lib version changes.
String EXPECTED_QUICHE_VERSION = "0.20.1"; String EXPECTED_QUICHE_VERSION = "0.21.0";
// The charset used to convert java.lang.String to char * and vice versa. // The charset used to convert java.lang.String to char * and vice versa.
Charset CHARSET = StandardCharsets.UTF_8; Charset CHARSET = StandardCharsets.UTF_8;
@ -402,8 +402,8 @@ public interface LibQuiche extends Library
// Schedule an ack-eliciting packet on the specified path. // Schedule an ack-eliciting packet on the specified path.
ssize_t quiche_conn_send_ack_eliciting_on_path(quiche_conn conn, ssize_t quiche_conn_send_ack_eliciting_on_path(quiche_conn conn,
sockaddr local, size_t local_len, sockaddr local, size_t local_len,
sockaddr peer, size_t peer_len); sockaddr peer, size_t peer_len);
@Structure.FieldOrder({"from", "from_len", "to", "to_len", "at"}) @Structure.FieldOrder({"from", "from_len", "to", "to_len", "at"})
class quiche_send_info extends Structure class quiche_send_info extends Structure

4
pom.xml
View File

@ -169,7 +169,7 @@
<commons-codec.version>1.16.1</commons-codec.version> <commons-codec.version>1.16.1</commons-codec.version>
<commons-lang3.version>3.14.0</commons-lang3.version> <commons-lang3.version>3.14.0</commons-lang3.version>
<commons.compress.version>1.26.1</commons.compress.version> <commons.compress.version>1.26.1</commons.compress.version>
<commons.io.version>2.15.1</commons.io.version> <commons.io.version>2.16.0</commons.io.version>
<compiler.release>17</compiler.release> <compiler.release>17</compiler.release>
<compiler.source>17</compiler.source> <compiler.source>17</compiler.source>
<compiler.target>17</compiler.target> <compiler.target>17</compiler.target>
@ -204,7 +204,7 @@
<jboss.logging.processor.version>2.2.1.Final</jboss.logging.processor.version> <jboss.logging.processor.version>2.2.1.Final</jboss.logging.processor.version>
<jboss.logging.version>3.5.3.Final</jboss.logging.version> <jboss.logging.version>3.5.3.Final</jboss.logging.version>
<jetty-assembly-descriptors.version>1.1</jetty-assembly-descriptors.version> <jetty-assembly-descriptors.version>1.1</jetty-assembly-descriptors.version>
<jetty-quiche-native.version>0.20.1</jetty-quiche-native.version> <jetty-quiche-native.version>0.21.0</jetty-quiche-native.version>
<jetty-test-policy.version>1.2</jetty-test-policy.version> <jetty-test-policy.version>1.2</jetty-test-policy.version>
<jetty-version.maven.plugin.version>2.7</jetty-version.maven.plugin.version> <jetty-version.maven.plugin.version>2.7</jetty-version.maven.plugin.version>
<jetty.perf-helper.version>1.0.7</jetty.perf-helper.version> <jetty.perf-helper.version>1.0.7</jetty.perf-helper.version>