Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/perf-test-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<!-- Special allowance for performance libraries as they aren't shipped. -->
<include>com.beust:jcommander:[1.82]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->

<include>io.projectreactor:reactor-core:[3.7.11]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.8.1]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.vertx:vertx-codegen:[4.5.17]</include> <!-- {x-include-update;io.vertx:vertx-codegen;external_dependency} -->
</includes>
</bannedDependencies>
Expand Down
13 changes: 13 additions & 0 deletions eng/pipelines/templates/jobs/ci.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,19 @@ jobs:
parameters:
LatestJdkFeatureVersion: $(LatestNonLtsJdkFeatureVersion)

- pwsh: |
$downloadUri = "https://aka.ms/download-jdk/microsoft-jdk-25.0.1-windows-x64.zip"
$jdkZipName = "microsoft_jdk_25.zip"
$jdkUnzipName = "microsoft-jdk-25"
Invoke-WebRequest -URI $downloadUri -OutFile $jdkZipName
Expand-Archive -Path $jdkZipName -Destination "jdk-temp"
Move-Item -Path (Join-Path -Path "jdk-temp" -ChildPath (Get-ChildItem "jdk-temp")[0].Name) -Destination $jdkUnzipName
$javaHome = (Convert-Path $jdkUnzipName)
Write-Host "##vso[task.setvariable variable=JAVA_HOME;]$javaHome"
Write-Host "##vso[task.setvariable variable=JAVA_HOME_25_X64;]$javaHome"
displayName: Install Microsoft JDK 25
condition: and(eq(variables['JavaTestVersion'], '1.25'), eq(variables['Agent.OS'], 'Windows_NT'))

- ${{ parameters.PreBuildSteps }}

- ${{ parameters.PreTestSteps }}
Expand Down
32 changes: 16 additions & 16 deletions eng/versioning/external_dependencies.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,22 @@ commons-net:commons-net;3.9.0
io.cloudevents:cloudevents-api;2.2.0
io.cloudevents:cloudevents-core;2.2.0
io.fabric8:kubernetes-client;6.12.1
io.netty:netty-buffer;4.1.127.Final
io.netty:netty-common;4.1.127.Final
io.netty:netty-codec;4.1.127.Final
io.netty:netty-codec-http;4.1.127.Final
io.netty:netty-codec-http2;4.1.127.Final
io.netty:netty-handler;4.1.127.Final
io.netty:netty-handler-proxy;4.1.127.Final
io.netty:netty-resolver;4.1.127.Final
io.netty:netty-resolver-dns;4.1.127.Final
io.netty:netty-buffer;4.2.9.Final
io.netty:netty-common;4.2.9.Final
io.netty:netty-codec;4.2.9.Final
io.netty:netty-codec-http;4.2.9.Final
io.netty:netty-codec-http2;4.2.9.Final
io.netty:netty-handler;4.2.9.Final
io.netty:netty-handler-proxy;4.2.9.Final
io.netty:netty-resolver;4.2.9.Final
io.netty:netty-resolver-dns;4.2.9.Final
io.netty:netty-tcnative-boringssl-static;2.0.74.Final
io.netty:netty-transport;4.1.127.Final
io.netty:netty-transport-native-epoll;4.1.127.Final
io.netty:netty-transport-native-unix-common;4.1.127.Final
io.netty:netty-transport-native-kqueue;4.1.127.Final
io.projectreactor.netty:reactor-netty-http;1.2.10
io.projectreactor:reactor-core;3.7.11
io.netty:netty-transport;4.2.9.Final
io.netty:netty-transport-native-epoll;4.2.9.Final
io.netty:netty-transport-native-unix-common;4.2.9.Final
io.netty:netty-transport-native-kqueue;4.2.9.Final
io.projectreactor.netty:reactor-netty-http;1.3.1
io.projectreactor:reactor-core;3.8.1
io.vertx:vertx-codegen;4.5.17
io.vertx:vertx-core;4.5.17
javax.websocket:javax.websocket-api;1.1
Expand Down Expand Up @@ -127,7 +127,7 @@ io.opentelemetry:opentelemetry-bom;1.49.0
io.opentelemetry.instrumentation:opentelemetry-runtime-telemetry-java8;2.14.0-alpha
io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter;2.14.0
io.opentelemetry.instrumentation:opentelemetry-logback-appender-1.0;2.14.0-alpha
io.projectreactor:reactor-test;3.7.11
io.projectreactor:reactor-test;3.8.1
io.github.hakky54:logcaptor;2.9.3
com.squareup.okio:okio;3.16.0
com.squareup.okio:okio-jvm;3.16.0
Expand Down
2 changes: 1 addition & 1 deletion sdk/ai/azure-ai-voicelive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<version>3.7.11</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<version>3.8.1</version> <!-- {x-version-update;io.projectreactor:reactor-test;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
Expand Down
56 changes: 25 additions & 31 deletions sdk/clientcore/http-netty4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
io.clientcore.core.implementation*,io.clientcore.core.models,io.clientcore.core.util,io.clientcore.core.util*
</javadoc.excludePackageNames>

<netty.version>4.1.127.Final</netty.version> <!-- {x-version-update;io.netty:netty-common;external_dependency} -->
<netty.version>4.2.9.Final</netty.version> <!-- {x-version-update;io.netty:netty-common;external_dependency} -->
</properties>

<dependencies>
Expand All @@ -69,52 +69,52 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-buffer;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-codec;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-codec;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-codec-http;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-codec-http2;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-common;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-common;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-handler;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-handler-proxy;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-resolver;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-resolver;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-resolver-dns;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-resolver-dns;external_dependency} -->
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-transport;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-transport;external_dependency} -->
</dependency>

<!-- Test dependencies on core, because we want to run tests inherited from this module using Netty -->
Expand All @@ -129,29 +129,29 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<classifier>linux-x86_64</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-epoll;external_dependency} -->
<classifier>linux-x86_64</classifier>
<scope>test</scope>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-unix-common;external_dependency} -->
<classifier>osx-x86_64</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>4.1.127.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<version>4.2.9.Final</version> <!-- {x-version-update;io.netty:netty-transport-native-kqueue;external_dependency} -->
<classifier>osx-x86_64</classifier>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -205,12 +205,6 @@
<version>2.5.2</version> <!-- {x-version-update;org.conscrypt:conscrypt-openjdk-uber;external_dependency} -->
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.11.0</version> <!-- {x-version-update;org.mockito:mockito-core;external_dependency} -->
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand All @@ -223,16 +217,16 @@
<rules>
<bannedDependencies>
<includes>
<include>io.netty:netty-buffer:[4.1.127.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec:[4.1.127.Final]</include> <!-- {x-include-update;io.netty:netty-codec;external_dependency} -->
<include>io.netty:netty-codec-http:[4.1.127.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.1.127.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-common:[4.1.127.Final]</include> <!-- {x-include-update;io.netty:netty-common;external_dependency} -->
<include>io.netty:netty-handler:[4.1.127.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.1.127.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-resolver:[4.1.127.Final]</include> <!-- {x-include-update;io.netty:netty-resolver;external_dependency} -->
<include>io.netty:netty-resolver-dns:[4.1.127.Final]</include> <!-- {x-include-update;io.netty:netty-resolver-dns;external_dependency} -->
<include>io.netty:netty-transport:[4.1.127.Final]</include> <!-- {x-include-update;io.netty:netty-transport;external_dependency} -->
<include>io.netty:netty-buffer:[4.2.9.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
<include>io.netty:netty-codec:[4.2.9.Final]</include> <!-- {x-include-update;io.netty:netty-codec;external_dependency} -->
<include>io.netty:netty-codec-http:[4.2.9.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http;external_dependency} -->
<include>io.netty:netty-codec-http2:[4.2.9.Final]</include> <!-- {x-include-update;io.netty:netty-codec-http2;external_dependency} -->
<include>io.netty:netty-common:[4.2.9.Final]</include> <!-- {x-include-update;io.netty:netty-common;external_dependency} -->
<include>io.netty:netty-handler:[4.2.9.Final]</include> <!-- {x-include-update;io.netty:netty-handler;external_dependency} -->
<include>io.netty:netty-handler-proxy:[4.2.9.Final]</include> <!-- {x-include-update;io.netty:netty-handler-proxy;external_dependency} -->
<include>io.netty:netty-resolver:[4.2.9.Final]</include> <!-- {x-include-update;io.netty:netty-resolver;external_dependency} -->
<include>io.netty:netty-resolver-dns:[4.2.9.Final]</include> <!-- {x-include-update;io.netty:netty-resolver-dns;external_dependency} -->
<include>io.netty:netty-transport:[4.2.9.Final]</include> <!-- {x-include-update;io.netty:netty-transport;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import io.netty.channel.Channel;
import io.netty.channel.ChannelOption;
import io.netty.channel.EventLoopGroup;
import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.handler.ssl.SslContext;
Expand Down Expand Up @@ -153,11 +152,11 @@ public NettyHttpClientBuilder() {
/**
* Sets the event loop group for the Netty client.
* <p>
* By default, if no {@code eventLoopGroup} is configured and no native transports are available (Epoll KQueue)
* {@link NioEventLoopGroup} will be used.
* By default, if no {@code eventLoopGroup} is configured and no native transports are available (Epoll, KQueue)
* {@link io.netty.channel.nio.NioEventLoopGroup} will be used.
* <p>
* If native transports are available, the {@link EventLoopGroup} implementation for the native transport will be
* chosen over {@link NioEventLoopGroup}.
* chosen over {@link io.netty.channel.nio.NioEventLoopGroup}.
*
* @param eventLoopGroup The event loop group.
* @return The updated builder.
Expand Down Expand Up @@ -453,6 +452,7 @@ ProxyOptions getProxyOptions() {
return (proxyOptions == null) ? ProxyOptions.fromConfiguration(buildConfiguration, true) : proxyOptions;
}

@SuppressWarnings("deprecation")
static EventLoopGroup getEventLoopGroupToUse(EventLoopGroup configuredGroup,
Class<? extends SocketChannel> configuredChannelClass, boolean isEpollAvailable,
MethodHandle epollEventLoopGroupCreator, boolean isKqueueAvailable, MethodHandle kqueueEventLoopGroupCreator) {
Expand Down Expand Up @@ -483,7 +483,7 @@ static EventLoopGroup getEventLoopGroupToUse(EventLoopGroup configuredGroup,
}

// Fallback to NioEventLoopGroup.
return new NioEventLoopGroup(threadFactory);
return new io.netty.channel.nio.NioEventLoopGroup(threadFactory);
}

static Class<? extends SocketChannel> getChannelClass(Class<? extends SocketChannel> configuredChannelClass,
Expand Down
Loading
Loading