From bee716fef9af9c458cf4bcd38203c970d3f5eaea Mon Sep 17 00:00:00 2001 From: jrhee17 Date: Tue, 22 Aug 2023 22:19:10 +0900 Subject: [PATCH 1/4] Update snapshot version to 1.25.1 (#5137) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 30ff18fe70c6..f2d192c8ec8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=com.linecorp.armeria -version=1.26.0-SNAPSHOT +version=1.25.1-SNAPSHOT projectName=Armeria projectUrl=https://armeria.dev/ projectDescription=Asynchronous HTTP/2 RPC/REST client/server library built on top of Java 8, Netty, Thrift and gRPC From d4c3b386d7f25b1d89b362e6378852f8d4c0073b Mon Sep 17 00:00:00 2001 From: jrhee17 Date: Wed, 23 Aug 2023 16:27:20 +0900 Subject: [PATCH 2/4] Include logback12 from logback module (#5139) Motivation: @ikhoon pointed out that the `logback` module doesn't bring in the `logback12` module in the pom. Modifications: - Modified so that the `logback` module correctly declares the dependency. Result: - `logback` module contains the correct dependencies - Describe the consequences that a user will face after this PR is merged. --- logback/logback/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logback/logback/build.gradle b/logback/logback/build.gradle index e808e9bb7c14..1efa0af8ffc7 100644 --- a/logback/logback/build.gradle +++ b/logback/logback/build.gradle @@ -1,4 +1,4 @@ dependencies { // Logback - api libs.logback12 + api project(':logback12') } From 4e459df529415e18f9bbd331bf771e264d4b31b9 Mon Sep 17 00:00:00 2001 From: jrhee17 Date: Wed, 23 Aug 2023 16:27:40 +0900 Subject: [PATCH 3/4] Release note for 1.25.1 (#5140) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ![FireShot Capture 011 - 1 25 1 release notes — Armeria release notes - localhost](https://github.com/line/armeria/assets/8510579/b480ecaf-4034-453a-be93-58f865cad5b2) --- site/src/pages/release-notes/1.25.1.mdx | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 site/src/pages/release-notes/1.25.1.mdx diff --git a/site/src/pages/release-notes/1.25.1.mdx b/site/src/pages/release-notes/1.25.1.mdx new file mode 100644 index 000000000000..a0f9af338857 --- /dev/null +++ b/site/src/pages/release-notes/1.25.1.mdx @@ -0,0 +1,17 @@ +--- +date: 2023-08-23 +--- + +## 🛠️ Bug fixes + +- `armeria-logback` now correctly declares the `armeria-logback12` dependency. #5139 + - Only 1.25.0 is affected. + +## 🙇 Thank you + + \ No newline at end of file From 59baf81b63d04ac807e93469b4c11cded16349c3 Mon Sep 17 00:00:00 2001 From: Ikhun Um Date: Wed, 23 Aug 2023 16:55:56 +0900 Subject: [PATCH 4/4] Fix flaky `MultipartEncoderTckTest.required_spec101...` (#5136) Motivation: `MultipartEncoderTckTest.required_spec101_XXX` fails quite often. https://ge.armeria.dev/scans/tests?search.timeZoneId=Asia/Seoul&tests.container=com.linecorp.armeria.common.multipart.MultipartEncoderTckTest&tests.test=required_spec101_subscriptionRequestMustResultInTheCorrectNumberOfProducedElements ```java java.lang.AssertionError: Publisher com.linecorp.armeria.common.multipart.MultipartEncoder@3eec8583 produced no element after first `request` within 200 ms at org.testng.Assert.fail(Assert.java:98) at org.reactivestreams.tck.TestEnvironment.flopAndFail(TestEnvironment.java:285) at org.reactivestreams.tck.TestEnvironment$Receptacle.next(TestEnvironment.java:1047) at org.reactivestreams.tck.TestEnvironment$ManualSubscriber.nextElement(TestEnvironment.java:514) at org.reactivestreams.tck.TestEnvironment$ManualSubscriber.nextElement(TestEnvironment.java:510) at org.reactivestreams.tck.PublisherVerification$3.run(PublisherVerification.java:212) at org.reactivestreams.tck.PublisherVerification.activePublisherTest(PublisherVerification.java:1135) at org.reactivestreams.tck.PublisherVerification.required_spec101_subscriptionRequestMustResultInTheCorrectNumberOfProducedElements(PublisherVerification.java:204) ``` The failure couldn't be reproduced locally. I checked the log on the Gradle scan and it shows that the classes are initialized when the test starts. I guess JVM lazy class initialization and the Netty worker group initialization could affect the failure. Modifications: - Early initialize Netty worker group before starting the tests - Increase timeout Result: - Closes #4554 --------- Co-authored-by: Trustin Lee --- .../armeria/common/multipart/MultipartEncoderTckTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/test/java/com/linecorp/armeria/common/multipart/MultipartEncoderTckTest.java b/core/src/test/java/com/linecorp/armeria/common/multipart/MultipartEncoderTckTest.java index bd252c35c8da..af2a4d920af5 100644 --- a/core/src/test/java/com/linecorp/armeria/common/multipart/MultipartEncoderTckTest.java +++ b/core/src/test/java/com/linecorp/armeria/common/multipart/MultipartEncoderTckTest.java @@ -39,6 +39,7 @@ import org.reactivestreams.tck.TestEnvironment; import org.testng.annotations.Test; +import com.linecorp.armeria.common.CommonPools; import com.linecorp.armeria.common.HttpData; import com.linecorp.armeria.common.stream.StreamMessage; @@ -48,8 +49,13 @@ public class MultipartEncoderTckTest extends PublisherVerification { // Forked from https://github.com/oracle/helidon/blob/9d209a1a55f927e60e15b061700384e438ab5a01/media/multipart/src/test/java/io/helidon/media/multipart/MultiPartEncoderTckTest.java + static { + // Make sure the worker group is initialized. + CommonPools.workerGroup().next().submit(() -> {}); + } + public MultipartEncoderTckTest() { - super(new TestEnvironment(200)); + super(new TestEnvironment(500)); } @Override