From 717307aab4f96bce06e00bcc7db83ec9d73bb8b5 Mon Sep 17 00:00:00 2001
From: S0ra-ai <172572177+S0ra-ai@users.noreply.github.com>
Date: Tue, 22 Sep 2026 11:54:50 +0800
Subject: [PATCH] fix: migrate dubbo-samples-triple-rest-openapi-generator to
 SpringBoot3

- Upgrade spring-boot-starter-parent from 2.7.18 to 3.2.3
- Replace javax.annotation-api with jakarta.annotation-api
- Update all Java sources from javax.annotation.Generated to
  jakarta.annotation.Generated

Fixes #13862
---
 .../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 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

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")