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 fix/jetty-12.0.x-11349-merge-from-11

This commit is contained in:
Ludovic Orban 2024-01-29 22:06:32 +01:00
parent 554d5b19d5 0b587f6e1e
commit 58eaa5f45a
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/build-resources/pom.xml
View File

@ -18,7 +18,7 @@
<maven.javadoc.plugin.version>3.4.0</maven.javadoc.plugin.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
<maven.remote-resources.plugin.version>3.1.0</maven.remote-resources.plugin.version>
<maven.surefire.plugin.version>3.2.3</maven.surefire.plugin.version>
<maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skipTests>true</skipTests>
</properties>
@ -41,7 +41,7 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.41.1</version>
<version>2.43.0</version>
<configuration>
<pom>
<includes>

2
build/scripts/release-jetty.sh
View File

@ -46,7 +46,7 @@ function gitFindRemoteByUrl() {
return 0
}
GIT_REMOTE_URL="github.com:eclipse/jetty.project.git"
GIT_REMOTE_URL="github.com:jetty/jetty.project.git"
GIT_REMOTE_ID=$(gitFindRemoteByUrl "$GIT_REMOTE_URL")
GIT_BRANCH_ID=$(git symbolic-ref -q --short HEAD || git describe --tags --exact-match)

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

@ -33,7 +33,7 @@ public class quiche_h
{
// 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.
private static final String EXPECTED_QUICHE_VERSION = "0.18.0";
private static final String EXPECTED_QUICHE_VERSION = "0.20.0";
public static final byte C_FALSE = 0;
public static final byte C_TRUE = 1;

2
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.
// It needs to be reviewed each time the native lib version changes.
String EXPECTED_QUICHE_VERSION = "0.18.0";
String EXPECTED_QUICHE_VERSION = "0.20.0";
// The charset used to convert java.lang.String to char * and vice versa.
Charset CHARSET = StandardCharsets.UTF_8;

2
jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/HttpChannelState.java
View File

@ -674,7 +674,7 @@ public class HttpChannelState
catch (Throwable x)
{
if (LOG.isDebugEnabled())
LOG.warn("{} while invoking onTimeout listener {}", x.toString(), listener, x);
LOG.debug("{} while invoking onTimeout listener {}", x.toString(), listener, x);
else
LOG.warn("{} while invoking onTimeout listener {}", x.toString(), listener);
}

2
jetty-integrations/jetty-gcloud/pom.xml
View File

@ -17,7 +17,7 @@
</modules>
<properties>
<gcloud.version>2.17.6</gcloud.version>
<gcloud.version>2.18.2</gcloud.version>
<protobuf.version>3.25.1</protobuf.version>
</properties>

20
pom.xml
View File

@ -155,7 +155,7 @@
<apache.avro.version>1.11.3</apache.avro.version>
<apache.httpclient.version>4.5.14</apache.httpclient.version>
<apache.httpcore.version>4.4.16</apache.httpcore.version>
<asciidoctor.maven.plugin.version>2.2.4</asciidoctor.maven.plugin.version>
<asciidoctor.maven.plugin.version>2.2.5</asciidoctor.maven.plugin.version>
<asciidoctor.skip>false</asciidoctor.skip>
<asciidoctorj-diagram.version>2.2.14</asciidoctorj-diagram.version>
<asciidoctorj.version>2.5.11</asciidoctorj.version>
@ -179,10 +179,10 @@
<eclipse.jdt.ecj.version>3.33.0</eclipse.jdt.ecj.version>
<felix.version>7.0.5</felix.version>
<findbugs.jsr305.version>3.0.2</findbugs.jsr305.version>
<flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
<flatten.maven.plugin.version>1.6.0</flatten.maven.plugin.version>
<google.errorprone.version>2.24.1</google.errorprone.version>
<groovy.version>4.0.6</groovy.version>
<grpc.version>1.60.1</grpc.version>
<grpc.version>1.61.0</grpc.version>
<gson.version>2.10.1</gson.version>
<guava.version>33.0.0-jre</guava.version>
<guice.version>7.0.0</guice.version>
@ -204,7 +204,7 @@
<jboss.logging.processor.version>2.2.1.Final</jboss.logging.processor.version>
<jboss.logging.version>3.5.3.Final</jboss.logging.version>
<jetty-assembly-descriptors.version>1.1</jetty-assembly-descriptors.version>
<jetty-quiche-native.version>0.18.0</jetty-quiche-native.version>
<jetty-quiche-native.version>0.20.0</jetty-quiche-native.version>
<jetty-test-policy.version>1.2</jetty-test-policy.version>
<jetty-version.maven.plugin.version>2.7</jetty-version.maven.plugin.version>
<jetty.perf-helper.version>1.0.7</jetty.perf-helper.version>
@ -237,7 +237,7 @@
<mariadb.version>3.3.2</mariadb.version>
<maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version>
<maven-build-cache.version>1.1.0</maven-build-cache.version>
<maven-plugin.plugin.version>3.10.2</maven-plugin.plugin.version>
<maven-plugin.plugin.version>3.11.0</maven-plugin.plugin.version>
<maven.antrun.plugin.version>3.1.0</maven.antrun.plugin.version>
<maven.assembly.plugin.version>3.6.0</maven.assembly.plugin.version>
<maven.bundle.plugin.version>5.1.9</maven.bundle.plugin.version>
@ -255,7 +255,7 @@
<maven.invoker.plugin.version>3.6.0</maven.invoker.plugin.version>
<maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
<maven.javadoc.plugin.version>3.6.3</maven.javadoc.plugin.version>
<maven.plugin-tools.version>3.10.2</maven.plugin-tools.version>
<maven.plugin-tools.version>3.11.0</maven.plugin-tools.version>
<maven.release.plugin.version>3.0.1</maven.release.plugin.version>
<maven.remote-resources-plugin.version>3.1.0</maven.remote-resources-plugin.version>
<maven.resolver.version>1.9.18</maven.resolver.version>
@ -297,15 +297,15 @@
<settingsPath>src/it/settings.xml</settingsPath>
<slf4j.version>2.0.9</slf4j.version>
<spifly.version>1.3.6</spifly.version>
<spotbugs.maven.plugin.version>4.8.2.0</spotbugs.maven.plugin.version>
<spotbugs.maven.plugin.version>4.8.3.0</spotbugs.maven.plugin.version>
<surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
<surefire.rerunFailingTestsCount>0</surefire.rerunFailingTestsCount>
<swissbox.version>1.8.3</swissbox.version>
<testcontainers.version>1.19.3</testcontainers.version>
<testcontainers.version>1.19.4</testcontainers.version>
<tinybundles.version>3.0.0</tinybundles.version>
<versions.maven.plugin.version>2.16.2</versions.maven.plugin.version>
<wildfly.common.version>1.7.0.Final</wildfly.common.version>
<wildfly.elytron.version>2.2.2.Final</wildfly.elytron.version>
<wildfly.elytron.version>2.2.3.Final</wildfly.elytron.version>
<xmemcached.version>2.4.8</xmemcached.version>
</properties>
@ -1637,7 +1637,7 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>2.41.1</version>
<version>2.43.0</version>
<configuration>
<pom>
<includes>