From 64daf104c417e3c449d7ab228466c4a91014b979 Mon Sep 17 00:00:00 2001
From: zengbohan1 <310902929+zengbohan1@users.noreply.github.com>
Date: Wed, 26 Aug 2026 14:13:29 +0800
Subject: [PATCH 1/2] Migrate dubbo-samples-triple-rest-openapi-generator to
 Spring Boot 3.2.3 (#13862)

- Bump spring-boot-starter-parent from 2.7.18 to 3.2.3, aligning the
  module with the dubbo-samples-triple-rest aggregate parent BOM; this
  was the last sample still on Spring Boot 2.x
- Replace javax.annotation-api with jakarta.annotation-api and migrate
  the generated sources to jakarta.annotation.Generated
- Enable useJakartaEe in the openapi-generator config so regenerated
  sources stay on the jakarta namespace
- Update README system requirements to Java 17+

Verified with 'mvn clean package -DskipTests' (same as CI build opts):
build succeeds on Spring Boot 3.2.3 / JDK 17.
---
 .../dubbo-samples-triple-rest-openapi-generator/README.md   | 4 ++--
 .../pom-generator.xml                                       | 1 +
 .../dubbo-samples-triple-rest-openapi-generator/pom.xml     | 6 +++---
 .../dubbo/rest/demo/api/consumer/DemoServiceController.java | 2 +-
 .../apache/dubbo/rest/demo/api/interfaces/DemoService.java  | 2 +-
 .../dubbo/rest/demo/api/provider/DemoServiceImpl.java       | 2 +-
 .../main/java/org/apache/dubbo/rest/demo/model/Error.java   | 2 +-
 .../java/org/apache/dubbo/rest/demo/model/HelloRequest.java | 2 +-
 .../main/java/org/apache/dubbo/rest/demo/model/User.java    | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/README.md b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/README.md
index c2334d5c4..cbbe24fbb 100644
--- a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/README.md
+++ b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/README.md
@@ -11,7 +11,7 @@ This is a microservice project based on Apache Dubbo, generated by [OpenAPI Gene
 ## Technology Stack
 
 - **Framework**: Apache Dubbo 3.3.3
-- **Java**: 8+
+- **Java**: 17+
 - **Build Tool**: Maven 3.6+
 - **Registry**: zookeeper://127.0.0.1:2181
 - **Serialization**: Jackson JSON
@@ -19,7 +19,7 @@ This is a microservice project based on Apache Dubbo, generated by [OpenAPI Gene
 ## System Requirements
 
 Building and running this project requires:
-1. Java 8+
+1. Java 17+
 2. Maven 3.6+
 3. Registry Center (Nacos or Zookeeper)
 
diff --git a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/pom-generator.xml b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/pom-generator.xml
index 5255e91ae..2b388b052 100644
--- a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/pom-generator.xml
+++ b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/pom-generator.xml
@@ -77,6 +77,7 @@
                                 <dubboVersion>${dubbo.version}</dubboVersion>
                                 <registryAddress>zookeeper://127.0.0.1:2181</registryAddress>
                                 <interfaceOnly>false</interfaceOnly>
+                                <useJakartaEe>true</useJakartaEe>
                             </configOptions>
                         </configuration>
                     </execution>
diff --git a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/pom.xml b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/pom.xml
index 41a17dd30..c0e5d55a0 100644
--- a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/pom.xml
+++ b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.18</version>
+        <version>3.2.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -67,8 +67,8 @@
             <scope>test</scope>
         </dependency>
       <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
+        <groupId>jakarta.annotation</groupId>
+        <artifactId>jakarta.annotation-api</artifactId>
       </dependency>
     </dependencies>
 
diff --git a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/api/consumer/DemoServiceController.java b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/api/consumer/DemoServiceController.java
index 1f4a9339e..098643e6e 100644
--- a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/api/consumer/DemoServiceController.java
+++ b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/api/consumer/DemoServiceController.java
@@ -29,7 +29,7 @@
 import java.time.LocalDateTime;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.web.bind.annotation.*;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 
 
 @Generated(value = "org.openapitools.codegen.languages.JavaDubboServerCodegen", comments = "Generator version: 7.16.0-SNAPSHOT")
diff --git a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/api/interfaces/DemoService.java b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/api/interfaces/DemoService.java
index ca8097be2..1f624a695 100644
--- a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/api/interfaces/DemoService.java
+++ b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/api/interfaces/DemoService.java
@@ -26,7 +26,7 @@
 import java.time.OffsetDateTime;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 
 
 @Generated(value = "org.openapitools.codegen.languages.JavaDubboServerCodegen", comments = "Generator version: 7.16.0-SNAPSHOT")
diff --git a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/api/provider/DemoServiceImpl.java b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/api/provider/DemoServiceImpl.java
index 1b268b728..34ec3056b 100644
--- a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/api/provider/DemoServiceImpl.java
+++ b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/api/provider/DemoServiceImpl.java
@@ -30,7 +30,7 @@
 import org.apache.dubbo.config.annotation.DubboService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 
 
 @Generated(value = "org.openapitools.codegen.languages.JavaDubboServerCodegen", comments = "Generator version: 7.16.0-SNAPSHOT")
diff --git a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/model/Error.java b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/model/Error.java
index a37bb49fe..133aa19e3 100644
--- a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/model/Error.java
+++ b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/model/Error.java
@@ -20,7 +20,7 @@
 import java.util.Objects;
 import java.io.Serializable;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 import java.time.*;
 import java.math.*;
 @Generated(value = "org.openapitools.codegen.languages.JavaDubboServerCodegen", comments = "Generator version: 7.16.0-SNAPSHOT")
diff --git a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/model/HelloRequest.java b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/model/HelloRequest.java
index 527d44737..a1d97c32a 100644
--- a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/model/HelloRequest.java
+++ b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/model/HelloRequest.java
@@ -21,7 +21,7 @@
 import java.util.Objects;
 import java.io.Serializable;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 import java.time.*;
 import java.math.*;
 @Generated(value = "org.openapitools.codegen.languages.JavaDubboServerCodegen", comments = "Generator version: 7.16.0-SNAPSHOT")
diff --git a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/model/User.java b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/model/User.java
index 180f4fb3c..de879ca25 100644
--- a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/model/User.java
+++ b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-openapi-generator/src/main/java/org/apache/dubbo/rest/demo/model/User.java
@@ -20,7 +20,7 @@
 import java.util.Objects;
 import java.io.Serializable;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import javax.annotation.Generated;
+import jakarta.annotation.Generated;
 import java.time.*;
 import java.math.*;
 @Generated(value = "org.openapitools.codegen.languages.JavaDubboServerCodegen", comments = "Generator version: 7.16.0-SNAPSHOT")

From fd73f9346997daa7391970b214f2daed7cdcb5d5 Mon Sep 17 00:00:00 2001
From: zengbohan1 <310902929+zengbohan1@users.noreply.github.com>
Date: Wed, 26 Aug 2026 15:28:05 +0800
Subject: [PATCH 2/2] chore: re-trigger CI

Previous run failed on unrelated infra issues:
- build-samples: Maven Central returned 502 while resolving
  spring-boot-starter-aop:2.3.12.RELEASE for dubbo-samples-spring-boot-hystrix
- Integration Test (Java21, Job5): dubbo-samples-triple-rest-spring-security
  build failure against dubbo.version=3.3.7-SNAPSHOT