This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 21cb3d745 Update cache moudle jdk17 and springboot3 (#1055)
21cb3d745 is described below
commit 21cb3d745c8feaa97ff3a21bb3e8ff6d0bc17e6e
Author: hqbfz <[email protected]>
AuthorDate: Thu Mar 14 17:08:29 2024 +0800
Update cache moudle jdk17 and springboot3 (#1055)
---
2-advanced/dubbo-samples-cache/case-versions.conf | 6 ++--
.../dubbo-samples-cache-consumer/pom.xml | 3 +-
.../src/main/resources/log4j2.xml | 29 --------------------
.../dubbo-samples-cache-provider/pom.xml | 3 +-
.../dubbo/samples/cache/impl/CacheServiceImpl.java | 1 +
.../src/main/resources/log4j2.xml | 29 --------------------
2-advanced/dubbo-samples-cache/pom.xml | 32 +++-------------------
7 files changed, 10 insertions(+), 93 deletions(-)
diff --git a/2-advanced/dubbo-samples-cache/case-versions.conf
b/2-advanced/dubbo-samples-cache/case-versions.conf
index f7373a530..82aeb4560 100644
--- a/2-advanced/dubbo-samples-cache/case-versions.conf
+++ b/2-advanced/dubbo-samples-cache/case-versions.conf
@@ -20,6 +20,6 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
-spring.version=4.*, 5.*
-java.version= [>= 8]
+dubbo.version=3.3.*
+spring.version=6.*
+java.version= [>= 17]
diff --git
a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/pom.xml
b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/pom.xml
index 9caccb265..126530a33 100644
--- a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/pom.xml
+++ b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/pom.xml
@@ -33,8 +33,7 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
- <type>pom</type>
+
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
</dependency>
<!-- spring starter -->
diff --git
a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/src/main/resources/log4j2.xml
b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/src/main/resources/log4j2.xml
deleted file mode 100644
index 69e1321d2..000000000
---
a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-consumer/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<Configuration status="WARN">
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="%style{%d{HH:mm:ss.SSS}}{Magenta}
%style{|-}{White}%highlight{%-5p} [%t] %style{%40.40c}{Cyan}:%style{%-3L}{Blue}
%style{-|}{White}
%m%n%rEx{filters(jdk.internal.reflect,java.lang.reflect,sun.reflect)}"
disableAnsi="false" charset="UTF-8"/>
- </Console>
- </Appenders>
- <Loggers>
- <Root level="info">
- <AppenderRef ref="Console"/>
- </Root>
- </Loggers>
-</Configuration>
diff --git
a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/pom.xml
b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/pom.xml
index fc9613ce0..64bff55fd 100644
--- a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/pom.xml
+++ b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/pom.xml
@@ -41,8 +41,7 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
- <type>pom</type>
+
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
</dependency>
<!-- spring starter -->
diff --git
a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/java/org/apache/dubbo/samples/cache/impl/CacheServiceImpl.java
b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/java/org/apache/dubbo/samples/cache/impl/CacheServiceImpl.java
index 9c5fc261d..b4051b9ce 100644
---
a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/java/org/apache/dubbo/samples/cache/impl/CacheServiceImpl.java
+++
b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/java/org/apache/dubbo/samples/cache/impl/CacheServiceImpl.java
@@ -29,6 +29,7 @@ public class CacheServiceImpl implements CacheService {
private final AtomicInteger i = new AtomicInteger();
+ @Override
public String findCache(String id) {
return "request: " + id + ", response: " + i.getAndIncrement();
}
diff --git
a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/resources/log4j2.xml
b/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/resources/log4j2.xml
deleted file mode 100644
index 69e1321d2..000000000
---
a/2-advanced/dubbo-samples-cache/dubbo-samples-cache-provider/src/main/resources/log4j2.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<Configuration status="WARN">
- <Appenders>
- <Console name="Console" target="SYSTEM_OUT" follow="true">
- <PatternLayout pattern="%style{%d{HH:mm:ss.SSS}}{Magenta}
%style{|-}{White}%highlight{%-5p} [%t] %style{%40.40c}{Cyan}:%style{%-3L}{Blue}
%style{-|}{White}
%m%n%rEx{filters(jdk.internal.reflect,java.lang.reflect,sun.reflect)}"
disableAnsi="false" charset="UTF-8"/>
- </Console>
- </Appenders>
- <Loggers>
- <Root level="info">
- <AppenderRef ref="Console"/>
- </Root>
- </Loggers>
-</Configuration>
diff --git a/2-advanced/dubbo-samples-cache/pom.xml
b/2-advanced/dubbo-samples-cache/pom.xml
index 6d4ae6d77..059e78e05 100644
--- a/2-advanced/dubbo-samples-cache/pom.xml
+++ b/2-advanced/dubbo-samples-cache/pom.xml
@@ -36,12 +36,12 @@
<description>Dubbo Samples Cache</description>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <dubbo.version>3.2.6</dubbo.version>
- <spring-boot.version>2.7.8</spring-boot.version>
+ <dubbo.version>3.3.0-beta.1</dubbo.version>
+ <spring-boot.version>3.2.3</spring-boot.version>
<junit.version>4.13.1</junit.version>
</properties>
@@ -82,30 +82,6 @@
<scope>import</scope>
</dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-dependencies-zookeeper-curator5</artifactId>
- <version>${dubbo.version}</version>
- <type>pom</type>
- <exclusions>
- <exclusion>
- <artifactId>logback-classic</artifactId>
- <groupId>ch.qos.logback</groupId>
- </exclusion>
- <exclusion>
- <artifactId>logback-core</artifactId>
- <groupId>ch.qos.logback</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j</artifactId>
- <groupId>log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>junit</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
