You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2024/11/22 09:44:55 UTC
(dubbo) branch feature/xds updated: Revert some changes
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch feature/xds
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/feature/xds by this push:
new f532c184d7 Revert some changes
f532c184d7 is described below
commit f532c184d7d473d0fe2564af9d92ee3dcb0da9c3
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Fri Nov 22 17:44:42 2024 +0800
Revert some changes
---
.../dubbo-demo-spring-boot-consumer/pom.xml | 6 ++
.../src/main/resources/application.yml | 3 -
.../dubbo-demo-spring-boot-provider/pom.xml | 12 ----
.../springboot/demo/provider/DemoServiceImpl.java | 2 +-
.../springboot/demo/provider/FooApplication.java | 66 ---------------------
.../demo/provider/ProviderApplication.java} | 19 +++++-
dubbo-distribution/dubbo-all-shaded/pom.xml | 1 +
dubbo-distribution/dubbo-bom/pom.xml | 5 --
dubbo-metadata/dubbo-metadata-api/pom.xml | 7 +++
dubbo-registry/dubbo-registry-api/pom.xml | 6 ++
.../main/java/org/apache/dubbo/rpc/BaseFilter.java | 1 -
.../pom.xml | 7 ---
.../dubbo-spring-boot-3-starter/pom.xml | 68 ----------------------
.../java/org/apache/dubbo/dependency/FileTest.java | 22 +++----
pom.xml | 32 +---------
15 files changed, 49 insertions(+), 208 deletions(-)
diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml
index 0af5f78051..081a8a7031 100644
--- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml
+++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/pom.xml
@@ -101,6 +101,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/src/main/resources/application.yml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/src/main/resources/application.yml
index 10d0ec74e7..20bee1f724 100644
--- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/src/main/resources/application.yml
+++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-consumer/src/main/resources/application.yml
@@ -32,7 +32,4 @@ dubbo:
metadata-report:
address: zookeeper://127.0.0.1:2181
-logging:
- pattern:
- level: '%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]'
diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml
index fc339f7137..1f135f5621 100644
--- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml
+++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/pom.xml
@@ -31,18 +31,6 @@
</properties>
<dependencies>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-rpc-triple</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-xds</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-demo-spring-boot-interface</artifactId>
diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/src/main/java/org/apache/dubbo/springboot/demo/provider/DemoServiceImpl.java b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/src/main/java/org/apache/dubbo/springboot/demo/provider/DemoServiceImpl.java
index f95197e81f..6468826fd0 100644
--- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/src/main/java/org/apache/dubbo/springboot/demo/provider/DemoServiceImpl.java
+++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/src/main/java/org/apache/dubbo/springboot/demo/provider/DemoServiceImpl.java
@@ -23,7 +23,7 @@ import org.apache.dubbo.springboot.demo.DemoService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@DubboService(parameters = {"security", "mTLS,sa_jwt"})
+@DubboService
public class DemoServiceImpl implements DemoService {
private static final Logger logger = LoggerFactory.getLogger(DemoServiceImpl.class);
diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/src/main/java/org/apache/dubbo/springboot/demo/provider/FooApplication.java b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/src/main/java/org/apache/dubbo/springboot/demo/provider/FooApplication.java
deleted file mode 100644
index b96af3da25..0000000000
--- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/src/main/java/org/apache/dubbo/springboot/demo/provider/FooApplication.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.
- */
-package org.apache.dubbo.springboot.demo.provider;
-
-import org.apache.dubbo.config.annotation.DubboReference;
-import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
-import org.apache.dubbo.springboot.demo.DemoService2;
-import org.apache.dubbo.xds.istio.IstioConstant;
-
-import java.util.Scanner;
-import java.util.concurrent.CountDownLatch;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ConfigurableApplicationContext;
-
-@SpringBootApplication
-@EnableDubbo(scanBasePackages = {"org.apache.dubbo.springboot.demo.provider"})
-public class FooApplication {
-
- // @DubboReference(cluster = "xds", providedBy = "httpbin")
- @DubboReference(
- lazy = true,
- parameters = {"security", "mTLS,sa_jwt"})
- private DemoService2 demoService;
-
- public static void main(String[] args) throws Exception {
- System.setProperty(IstioConstant.WORKLOAD_NAMESPACE_KEY, "foo");
- IstioConstant.KUBERNETES_SA_PATH = "/Users/nameles/Desktop/test_secrets/kubernetes.io/serviceaccount/token_foo";
- System.setProperty(IstioConstant.SERVICE_NAME_KEY, "httpbin");
-
- System.setProperty("NAMESPACE", "foo");
- System.setProperty("SERVICE_NAME", "httpbin");
- System.setProperty("API_SERVER_PATH", "https://127.0.0.1:6443");
- System.setProperty("SA_CA_PATH", "/Users/nameles/Desktop/test_secrets/kubernetes.io/serviceaccount/ca.crt");
- System.setProperty(
- "SA_TOKEN_PATH", "/Users/nameles/Desktop/test_secrets/kubernetes.io/serviceaccount/token_foo");
-
- ConfigurableApplicationContext context = SpringApplication.run(FooApplication.class, args);
- FooApplication application = context.getBean(FooApplication.class);
- application.sayHello();
- new CountDownLatch(1).await();
- }
-
- public void sayHello() throws InterruptedException {
- new Scanner(System.in).nextLine();
- while (true) {
- Thread.sleep(2000);
- System.out.println(demoService.sayHello("hello from foo"));
- }
- }
-}
diff --git a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-interface/src/main/java/org/apache/dubbo/springboot/demo/DemoService2.java b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/src/main/java/org/apache/dubbo/springboot/demo/provider/ProviderApplication.java
similarity index 55%
rename from dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-interface/src/main/java/org/apache/dubbo/springboot/demo/DemoService2.java
rename to dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/src/main/java/org/apache/dubbo/springboot/demo/provider/ProviderApplication.java
index 75a5c18d55..db237d38ba 100644
--- a/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-interface/src/main/java/org/apache/dubbo/springboot/demo/DemoService2.java
+++ b/dubbo-demo/dubbo-demo-spring-boot/dubbo-demo-spring-boot-provider/src/main/java/org/apache/dubbo/springboot/demo/provider/ProviderApplication.java
@@ -14,8 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.springboot.demo;
+package org.apache.dubbo.springboot.demo.provider;
-public interface DemoService2 {
- String sayHello(String name);
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
+
+import java.util.concurrent.CountDownLatch;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+@EnableDubbo(scanBasePackages = {"org.apache.dubbo.springboot.demo.provider"})
+public class ProviderApplication {
+ public static void main(String[] args) throws Exception {
+ SpringApplication.run(ProviderApplication.class, args);
+ System.out.println("dubbo service started");
+ new CountDownLatch(1).await();
+ }
}
diff --git a/dubbo-distribution/dubbo-all-shaded/pom.xml b/dubbo-distribution/dubbo-all-shaded/pom.xml
index 037679a68a..6066525a2a 100644
--- a/dubbo-distribution/dubbo-all-shaded/pom.xml
+++ b/dubbo-distribution/dubbo-all-shaded/pom.xml
@@ -327,6 +327,7 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
+
<!-- remoting -->
<dependency>
<groupId>org.apache.dubbo</groupId>
diff --git a/dubbo-distribution/dubbo-bom/pom.xml b/dubbo-distribution/dubbo-bom/pom.xml
index 5a5ea7c763..c9213b9ad2 100644
--- a/dubbo-distribution/dubbo-bom/pom.xml
+++ b/dubbo-distribution/dubbo-bom/pom.xml
@@ -493,11 +493,6 @@
<artifactId>dubbo-spring-boot-starter</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-3-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-spring-boot</artifactId>
diff --git a/dubbo-metadata/dubbo-metadata-api/pom.xml b/dubbo-metadata/dubbo-metadata-api/pom.xml
index 58424332ce..44e01099bd 100644
--- a/dubbo-metadata/dubbo-metadata-api/pom.xml
+++ b/dubbo-metadata/dubbo-metadata-api/pom.xml
@@ -37,6 +37,13 @@
<version>${project.parent.version}</version>
<optional>true</optional>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-cluster</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metrics-api</artifactId>
diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml
index 625461277d..df9e6739e1 100644
--- a/dubbo-registry/dubbo-registry-api/pom.xml
+++ b/dubbo-registry/dubbo-registry-api/pom.xml
@@ -38,6 +38,12 @@
<version>${project.parent.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.dubbo</groupId>
+ <artifactId>dubbo-cluster</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-api</artifactId>
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/BaseFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/BaseFilter.java
index 1c6c5b7353..02c643abf5 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/BaseFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/BaseFilter.java
@@ -17,7 +17,6 @@
package org.apache.dubbo.rpc;
public interface BaseFilter {
-
/**
* Always call invoker.invoke() in the implementation to hand over the request to the next filter node.
*/
diff --git a/dubbo-spring-boot-project/dubbo-spring-boot-compatible/dubbo-spring-boot-autoconfigure-compatible/pom.xml b/dubbo-spring-boot-project/dubbo-spring-boot-compatible/dubbo-spring-boot-autoconfigure-compatible/pom.xml
index 77e33866a4..455533ad50 100644
--- a/dubbo-spring-boot-project/dubbo-spring-boot-compatible/dubbo-spring-boot-autoconfigure-compatible/pom.xml
+++ b/dubbo-spring-boot-project/dubbo-spring-boot-compatible/dubbo-spring-boot-autoconfigure-compatible/pom.xml
@@ -54,13 +54,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-triple-servlet</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
-
<dependency>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-config-spring</artifactId>
diff --git a/dubbo-spring-boot/dubbo-spring-boot-3-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-3-starter/pom.xml
deleted file mode 100644
index a74b8bd4fb..0000000000
--- a/dubbo-spring-boot/dubbo-spring-boot-3-starter/pom.xml
+++ /dev/null
@@ -1,68 +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.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot</artifactId>
- <version>${revision}</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>dubbo-spring-boot-3-starter</artifactId>
- <packaging>jar</packaging>
- <description>Apache Dubbo Spring Boot 3 Starter</description>
-
- <properties>
- <spring-boot.version>3.2.1</spring-boot.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring-boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <!-- Spring Boot dependencies -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-autoconfigure</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.dubbo</groupId>
- <artifactId>dubbo-spring-boot-3-autoconfigure</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java b/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java
index 9d0f0e388b..b7f487faa2 100644
--- a/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java
+++ b/dubbo-test/dubbo-test-modules/src/test/java/org/apache/dubbo/dependency/FileTest.java
@@ -238,8 +238,8 @@ class FileTest {
.filter(doc -> !Objects.equals("pom", doc.elementText("packaging")))
.filter(doc -> Objects.isNull(doc.element("properties"))
|| (!Objects.equals("true", doc.element("properties").elementText("skip_maven_deploy"))
- && !Objects.equals(
- "true", doc.element("properties").elementText("maven.deploy.skip"))))
+ && !Objects.equals(
+ "true", doc.element("properties").elementText("maven.deploy.skip"))))
.map(doc -> doc.elementText("artifactId"))
.sorted()
.collect(Collectors.toList());
@@ -326,8 +326,8 @@ class FileTest {
.map(Document::getRootElement)
.filter(doc -> Objects.isNull(doc.element("properties"))
|| (!Objects.equals("true", doc.element("properties").elementText("skip_maven_deploy"))
- && !Objects.equals(
- "true", doc.element("properties").elementText("maven.deploy.skip"))))
+ && !Objects.equals(
+ "true", doc.element("properties").elementText("maven.deploy.skip"))))
.filter(doc -> !Objects.equals("pom", doc.elementText("packaging")))
.map(doc -> doc.elementText("artifactId"))
.sorted()
@@ -433,8 +433,8 @@ class FileTest {
.map(Document::getRootElement)
.filter(doc -> Objects.isNull(doc.element("properties"))
|| (!Objects.equals("true", doc.element("properties").elementText("skip_maven_deploy"))
- && !Objects.equals(
- "true", doc.element("properties").elementText("maven.deploy.skip"))))
+ && !Objects.equals(
+ "true", doc.element("properties").elementText("maven.deploy.skip"))))
.filter(doc -> !Objects.equals("pom", doc.elementText("packaging")))
.map(doc -> doc.elementText("artifactId"))
.sorted()
@@ -709,7 +709,7 @@ class FileTest {
if (content != null && content.contains("@SPI")) {
String absolutePath = path.getAbsolutePath();
absolutePath = absolutePath.substring(absolutePath.lastIndexOf(
- "src" + File.separator + "main" + File.separator + "java" + File.separator)
+ "src" + File.separator + "main" + File.separator + "java" + File.separator)
+ ("src" + File.separator + "main" + File.separator + "java" + File.separator).length());
absolutePath = absolutePath.substring(0, absolutePath.lastIndexOf(".java"));
absolutePath = absolutePath.replaceAll(Matcher.quoteReplacement(File.separator), ".");
@@ -736,11 +736,11 @@ class FileTest {
+ "META-INF" + File.separator + "dubbo" + File.separator + "internal" + File.separator)) {
String absolutePath = path.getAbsolutePath();
absolutePath = absolutePath.substring(absolutePath.lastIndexOf("src" + File.separator + "main"
- + File.separator + "resources" + File.separator + "META-INF" + File.separator + "dubbo"
- + File.separator + "internal" + File.separator)
+ + File.separator + "resources" + File.separator + "META-INF" + File.separator + "dubbo"
+ + File.separator + "internal" + File.separator)
+ ("src" + File.separator + "main" + File.separator + "resources" + File.separator + "META-INF"
- + File.separator + "dubbo" + File.separator + "internal" + File.separator)
- .length());
+ + File.separator + "dubbo" + File.separator + "internal" + File.separator)
+ .length());
absolutePath = absolutePath.replaceAll(Matcher.quoteReplacement(File.separator), ".");
spis.put(path, absolutePath);
}
diff --git a/pom.xml b/pom.xml
index 098d64b384..2c066ef983 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,7 +172,7 @@
<grpc_version>1.54.0</grpc_version>
<spotless-maven-plugin.version>2.43.0</spotless-maven-plugin.version>
<dubbo-shared-resources.version>1.0.0</dubbo-shared-resources.version>
-
+ <palantirJavaFormat.version>2.38.0</palantirJavaFormat.version>
<revision>3.3.3-SNAPSHOT</revision>
</properties>
@@ -886,36 +886,6 @@
</properties>
</profile>
- <profile>
- <id>jdk9-jdk11-spotless</id>
- <activation>
- <jdk>[1.8, 11)</jdk>
- </activation>
- <properties>
- <palantirJavaFormat.version>1.1.0</palantirJavaFormat.version>
- </properties>
- </profile>
-
- <profile>
- <id>jdk11-jdk21-spotless</id>
- <activation>
- <jdk>[11, 21)</jdk>
- </activation>
- <properties>
- <palantirJavaFormat.version>2.28.0</palantirJavaFormat.version>
- </properties>
- </profile>
-
- <profile>
- <id>jdk21-spotless</id>
- <activation>
- <jdk>[21,)</jdk>
- </activation>
- <properties>
- <palantirJavaFormat.version>2.39.0</palantirJavaFormat.version>
- </properties>
- </profile>
-
<profile>
<id>jacoco089</id>
<properties>