This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 4ddd153 [SCB-2347] Bump netty version to 4.1.68 vertx version to
4.1.5 (#2614)
4ddd153 is described below
commit 4ddd153bb4c902ed3ecf72ac96711b1d999facbe
Author: ZhangJian He <[email protected]>
AuthorDate: Sat Oct 30 10:35:35 2021 +0800
[SCB-2347] Bump netty version to 4.1.68 vertx version to 4.1.5 (#2614)
---
dependencies/default/pom.xml | 6 +++---
.../src/main/java/io/vertx/core/impl/SyncContext.java | 2 +-
.../servicecomb/foundation/vertx/client/TestClientPoolManager.java | 6 +++---
.../servicecomb/transport/rest/vertx/TestTransportConfig.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index 2760aab..e14dcd4 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -80,7 +80,7 @@
<mock-server.version>3.10.4</mock-server.version>
<narayana.version>5.3.2.Final</narayana.version>
<netflix-commons.version>0.3.0</netflix-commons.version>
- <netty.version>4.1.67.Final</netty.version>
+ <netty.version>4.1.68.Final</netty.version>
<okhttp3.version>3.14.2</okhttp3.version>
<powermock.version>1.6.2</powermock.version>
<prometheus.version>0.6.0</prometheus.version>
@@ -102,10 +102,10 @@
<stax2-api.version>4.2</stax2-api.version>
<swagger.version>1.6.2</swagger.version>
<swagger2markup.version>1.3.3</swagger2markup.version>
- <tcnetty.version>2.0.40.Final</tcnetty.version>
+ <tcnetty.version>2.0.43.Final</tcnetty.version>
<tec-zkclient.version>0.10</tec-zkclient.version>
<tomakehurst.version>2.6.0</tomakehurst.version>
- <vertx.version>4.1.2</vertx.version>
+ <vertx.version>4.1.5</vertx.version>
<xstream.version>1.4.11.1</xstream.version>
<zipkin.version>2.19.1</zipkin.version>
<zipkin-reporter.version>2.7.13</zipkin-reporter.version>
diff --git
a/foundations/foundation-test-scaffolding/src/main/java/io/vertx/core/impl/SyncContext.java
b/foundations/foundation-test-scaffolding/src/main/java/io/vertx/core/impl/SyncContext.java
index ec2536b..c1f09b5 100644
---
a/foundations/foundation-test-scaffolding/src/main/java/io/vertx/core/impl/SyncContext.java
+++
b/foundations/foundation-test-scaffolding/src/main/java/io/vertx/core/impl/SyncContext.java
@@ -29,7 +29,7 @@ public class SyncContext extends EventLoopContext {
}
public SyncContext(VertxInternal vertx) {
- super(vertx, null, null, null, null, null, null);
+ super(vertx, null, null, null, null, null, null, false);
}
public VertxInternal owner() {
diff --git
a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/client/TestClientPoolManager.java
b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/client/TestClientPoolManager.java
index dc86d9b..dacffc6 100644
---
a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/client/TestClientPoolManager.java
+++
b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/client/TestClientPoolManager.java
@@ -49,7 +49,7 @@ public class TestClientPoolManager {
List<HttpClientWithContext> pools;
- Map<String, Object> contextMap = new HashMap<>();
+ Map<Object, Object> contextMap = new HashMap<>();
@Mocked
Context context;
@@ -61,13 +61,13 @@ public class TestClientPoolManager {
pools = Deencapsulation.getField(poolMgr, "pools");
new MockUp<Context>(context) {
@Mock
- void put(String key, Object value) {
+ void put(Object key, Object value) {
contextMap.put(key, value);
}
@SuppressWarnings("unchecked")
@Mock
- <T> T get(String key) {
+ <T> T get(Object key) {
return (T) contextMap.get(key);
}
diff --git
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestTransportConfig.java
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestTransportConfig.java
index 4cacf9e..641ad49 100644
---
a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestTransportConfig.java
+++
b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestTransportConfig.java
@@ -98,7 +98,7 @@ public class TestTransportConfig {
@Test
public void testGetMaxFormAttributeSize() {
- Assert.assertEquals(2048, TransportConfig.getMaxFormAttributeSize());
+ Assert.assertEquals(8192, TransportConfig.getMaxFormAttributeSize());
ArchaiusUtils.setProperty("servicecomb.rest.server.maxFormAttributeSize",
3072);
Assert.assertEquals(3072, TransportConfig.getMaxFormAttributeSize());
}
