Merge branch 'main' into gradle/build-cache

jrhee17 · Aug 23, 2023 · f9e3d61 · f9e3d61
2 parents bbb13e4 + 59baf81
commit f9e3d61
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
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
@@ -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<HttpData> {
 
     // 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

diff --git 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

diff --git a/logback/logback/build.gradle b/logback/logback/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
     // Logback
-    api libs.logback12
+    api project(':logback12')
 }
diff --git a/site/src/pages/release-notes/1.25.1.mdx 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
+
+<ThankYou usernames={[
+  'ikhoon',
+  'jrhee17',
+  'minwoox',
+  'trustin'
+]} />