suit sprignboot 3.2.0

HzjNeverStop · Nov 24, 2023 · 1cba60e · 1cba60e
1 parent ad0126e
commit 1cba60e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/sofa-ark-bom/pom.xml b/sofa-ark-bom/pom.xml
@@ -47,7 +47,7 @@
         <maven.plugin.plugin>3.6.1</maven.plugin.plugin>
         <surefire.version>2.22.2</surefire.version>
         <netty.version>4.1.90.Final</netty.version>
-        <spring.boot.version>3.0.9</spring.boot.version>
+        <spring.boot.version>3.2.0</spring.boot.version>
     </properties>
 
     <dependencyManagement>

diff --git a/sofa-ark-parent/support/ark-springboot-integration/ark-springboot-starter/pom.xml b/sofa-ark-parent/support/ark-springboot-integration/ark-springboot-starter/pom.xml
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <spring.boot.version>3.0.9</spring.boot.version>
+        <spring.boot.version>3.2.0</spring.boot.version>
     </properties>
 
     <artifactId>sofa-ark-springboot-starter</artifactId>

diff --git a/...er/src/main/java/com/alipay/sofa/ark/springboot/listener/ArkApplicationStartListener.java b/...er/src/main/java/com/alipay/sofa/ark/springboot/listener/ArkApplicationStartListener.java
@@ -27,7 +27,7 @@
 import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.boot.context.event.SpringApplicationEvent;
-import org.springframework.boot.loader.LaunchedURLClassLoader;
+import org.springframework.boot.loader.launch.LaunchedClassLoader;
 import org.springframework.context.ApplicationListener;
 
 /**
@@ -47,7 +47,7 @@ public class ArkApplicationStartListener implements ApplicationListener<SpringAp
     public void onApplicationEvent(SpringApplicationEvent event) {
         try {
             if (ArkConfigs.isEmbedEnable()
-                || LaunchedURLClassLoader.class.isAssignableFrom(this.getClass().getClassLoader()
+                || LaunchedClassLoader.class.isAssignableFrom(this.getClass().getClassLoader()
                     .getClass())) {
                 ArkConfigs.setEmbedEnable(true);
                 startUpArkEmbed(event);

diff --git a/...ter/src/main/java/com/alipay/sofa/ark/springboot/loader/CachedLaunchedURLClassLoader.java b/...ter/src/main/java/com/alipay/sofa/ark/springboot/loader/CachedLaunchedURLClassLoader.java
@@ -16,8 +16,8 @@
  */
 package com.alipay.sofa.ark.springboot.loader;
 
-import org.springframework.boot.loader.LaunchedURLClassLoader;
-import org.springframework.boot.loader.archive.Archive;
+import org.springframework.boot.loader.launch.Archive;
+import org.springframework.boot.loader.launch.LaunchedClassLoader;
 
 import java.io.IOException;
 import java.net.URL;
@@ -36,7 +36,7 @@
  *
  * @author bingjie.lbj
  */
-public class CachedLaunchedURLClassLoader extends LaunchedURLClassLoader {
+public class CachedLaunchedURLClassLoader extends LaunchedClassLoader {
     private final Map<String, LoadClassResult>            classCache        = new ConcurrentHashMap<>(
                                                                                 3000);
     private final Map<String, Optional<URL>>              resourceUrlCache  = new ConcurrentHashMap<>(

diff --git a/...k-springboot-starter/src/main/java/com/alipay/sofa/ark/springboot/loader/JarLauncher.java b/...k-springboot-starter/src/main/java/com/alipay/sofa/ark/springboot/loader/JarLauncher.java
@@ -17,20 +17,24 @@
 package com.alipay.sofa.ark.springboot.loader;
 
 import java.net.URL;
+import java.util.Collection;
 
 /**
  * A JarLauncher to load classes with CachedLaunchedURLClassLoader
  *
  * @author bingjie.lbj
  */
-public class JarLauncher extends org.springframework.boot.loader.JarLauncher {
+public class JarLauncher extends org.springframework.boot.loader.launch.JarLauncher {
+    public JarLauncher() throws Exception {
+    }
+
     public static void main(String[] args) throws Exception {
         new JarLauncher().launch(args);
     }
 
     @Override
-    protected ClassLoader createClassLoader(URL[] urls) throws Exception {
-        return new CachedLaunchedURLClassLoader(isExploded(), getArchive(), urls, getClass()
+    protected ClassLoader createClassLoader(Collection<URL> urls) throws Exception {
+        return new CachedLaunchedURLClassLoader(isExploded(), getArchive(), urls.toArray(new URL[0]), getClass()
             .getClassLoader());
     }
 }
diff --git a/sofa-ark-plugin/web-ark-plugin/pom.xml b/sofa-ark-plugin/web-ark-plugin/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>web-ark-plugin</artifactId>
 
     <properties>
-        <spring.boot.version>3.0.9</spring.boot.version>
+        <spring.boot.version>3.2.0</spring.boot.version>
     </properties>
 
     <dependencies>