Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Armeria 1.25.2 #3351

Merged
merged 2 commits into from
Sep 20, 2023
Merged

Armeria 1.25.2 #3351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7671f42
Updates Armeria to 1.25.2. This also removes Gradle resolution strate…
dlvenable Sep 18, 2023
f5caa37
Adds back resolution strategies for Netty and Log4j.
dlvenable Sep 18, 2023
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
19 changes: 12 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,30 +163,35 @@ subprojects {
}
because 'CVE from transitive dependencies'
}
implementation('org.xerial.snappy:snappy-java') {
version {
require '1.1.10.1'
}
because 'Fixes CVE-2023-35165, CVE-2023-34455, CVE-2023-34453, CVE-2023-34454, CVE-2023-2976'
}
}
}
test {
useJUnitPlatform()
}

configurations.all {
resolutionStrategy.eachDependency { def details ->
if (details.requested.group == 'io.netty') {
if (details.requested.name == 'netty') {
details.useTarget group: 'io.netty', name: 'netty-all', version: '4.1.86.Final'
details.useTarget group: 'io.netty', name: 'netty-all', version: '4.1.96.Final'
// replace with your desired version
} else if (!details.requested.name.startsWith('netty-tcnative')) {
details.useVersion '4.1.86.Final'
details.useVersion '4.1.96.Final'
details.because 'Fixes CVE-2022-41881, CVE-2021-21290 and CVE-2022-41915.'
}
} else if (details.requested.group == 'log4j' && details.requested.name == 'log4j') {
details.useTarget group: 'org.apache.logging.log4j', name: 'log4j-1.2-api', version: '2.17.1'
} else if (details.requested.group == 'org.xerial.snappy' && details.requested.name == 'snappy-java') {
details.useTarget group: 'org.xerial.snappy', name: 'snappy-java', version: '1.1.10.1'
}
}
}

test {
useJUnitPlatform()
}

build.dependsOn test
jacocoTestReport {
dependsOn test // tests are required to run before generating the report
Expand Down
3 changes: 2 additions & 1 deletion .../src/test/java/org/opensearch/dataprepper/peerforwarder/PeerForwarder_ClientServerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.linecorp.armeria.common.ClosedSessionException;
import com.linecorp.armeria.common.HttpStatus;
import com.linecorp.armeria.server.Server;
import io.netty.handler.ssl.NotSslRecordException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
Expand Down Expand Up @@ -326,7 +327,7 @@ void send_Events_to_server_when_expecting_SSL_should_throw(final boolean binaryC
() -> client.serializeRecordsAndSendHttpRequest(outgoingRecords, LOCALHOST, pluginId, pipelineName).get());

assertThat(actualException.getCause(), instanceOf(UnprocessedRequestException.class));
assertThat(actualException.getCause().getCause(), instanceOf(SSLHandshakeException.class));
assertThat(actualException.getCause().getCause(), instanceOf(NotSslRecordException.class));

final Collection<Record<Event>> receivedRecords = getServerSideRecords(peerForwarderProvider);
assertThat(receivedRecords, notNullValue());
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencyResolutionManagement {
libs {
version('slf4j', '2.0.6')
library('slf4j-api', 'org.slf4j', 'slf4j-api').versionRef('slf4j')
version('armeria', '1.22.1')
version('armeria', '1.25.2')
library('armeria-core', 'com.linecorp.armeria', 'armeria').versionRef('armeria')
library('armeria-grpc', 'com.linecorp.armeria', 'armeria-grpc').versionRef('armeria')
library('armeria-junit', 'com.linecorp.armeria', 'armeria-junit5').versionRef('armeria')
Expand Down
Loading