From 2591b16a25421c991604df808a8faea859bdb92d Mon Sep 17 00:00:00 2001
From: loong10k <20489781+loong10k@users.noreply.github.com>
Date: Fri, 14 Aug 2026 03:01:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20pf4j2=20=E7=A4=BA=E4=BE=8B=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=20org.pf4j=202.2.0=20=E2=86=92=203.14.1=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20CVE-2025-70952=EF=BC=88Zip=20Slip=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- pf4j 3.0 移除了 org.pf4j.PluginException（改为运行时异常
  PluginRuntimeException），同步迁移 pf4j2-plugin-api 中的
  异常声明与 PluginInvokeException 父类
- 替代 Dependabot PR #32（Dependabot 无法处理源码级 API 迁移）
---
 .../java/pf4j2/plugin/api/AuthcExtensionPoint.java     | 10 +++++-----
 .../pf4j2/plugin/api/AuthcExtensionPointAdepter.java   | 10 +++++-----
 .../plugin/api/exception/PluginInvokeException.java    |  4 ++--
 spring-boot-sample-pf4j2/pf4j2-plugin-sample/pom.xml   |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/src/main/java/pf4j2/plugin/api/AuthcExtensionPoint.java b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/src/main/java/pf4j2/plugin/api/AuthcExtensionPoint.java
index 6cdc2e1..27e7a75 100644
--- a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/src/main/java/pf4j2/plugin/api/AuthcExtensionPoint.java
+++ b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/src/main/java/pf4j2/plugin/api/AuthcExtensionPoint.java
@@ -20,15 +20,15 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.pf4j.ExtensionPoint;
-import org.pf4j.PluginException;
+import org.pf4j.PluginRuntimeException;
 
 public interface AuthcExtensionPoint extends ExtensionPoint {
 
-	String getToken(Map<String, Object> par,HttpServletRequest req) throws PluginException;
+	String getToken(Map<String, Object> par,HttpServletRequest req) throws PluginRuntimeException;
 	
-	void handleHeaderParams(Map<String, Object> par,HttpServletRequest req) throws PluginException;
+	void handleHeaderParams(Map<String, Object> par,HttpServletRequest req) throws PluginRuntimeException;
 	
-	void handleRequestParams(Map<String, Object> par,HttpServletRequest req) throws PluginException;
+	void handleRequestParams(Map<String, Object> par,HttpServletRequest req) throws PluginRuntimeException;
 	
-	Object handleResult(Object res) throws PluginException;
+	Object handleResult(Object res) throws PluginRuntimeException;
 }
diff --git a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/src/main/java/pf4j2/plugin/api/AuthcExtensionPointAdepter.java b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/src/main/java/pf4j2/plugin/api/AuthcExtensionPointAdepter.java
index 9c32b7d..eacc446 100644
--- a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/src/main/java/pf4j2/plugin/api/AuthcExtensionPointAdepter.java
+++ b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/src/main/java/pf4j2/plugin/api/AuthcExtensionPointAdepter.java
@@ -19,25 +19,25 @@
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.pf4j.PluginException;
+import org.pf4j.PluginRuntimeException;
 
 public class AuthcExtensionPointAdepter implements AuthcExtensionPoint{
 
 	@Override
-	public String getToken(Map<String, Object> par, HttpServletRequest req) throws PluginException{
+	public String getToken(Map<String, Object> par, HttpServletRequest req) throws PluginRuntimeException{
 		return null;
 	}
 
 	@Override
-	public void handleHeaderParams(Map<String, Object> par, HttpServletRequest req) throws PluginException {
+	public void handleHeaderParams(Map<String, Object> par, HttpServletRequest req) throws PluginRuntimeException {
 	}
 
 	@Override
-	public void handleRequestParams(Map<String, Object> par, HttpServletRequest req) throws PluginException {
+	public void handleRequestParams(Map<String, Object> par, HttpServletRequest req) throws PluginRuntimeException {
 	}
 
 	@Override
-	public Object handleResult(Object res) throws PluginException {
+	public Object handleResult(Object res) throws PluginRuntimeException {
 		return res;
 	}
 
diff --git a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/src/main/java/pf4j2/plugin/api/exception/PluginInvokeException.java b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/src/main/java/pf4j2/plugin/api/exception/PluginInvokeException.java
index 774ff01..e54a1c6 100644
--- a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/src/main/java/pf4j2/plugin/api/exception/PluginInvokeException.java
+++ b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pf4j2-plugin-api/src/main/java/pf4j2/plugin/api/exception/PluginInvokeException.java
@@ -15,10 +15,10 @@
  */
 package pf4j2.plugin.api.exception;
 
-import org.pf4j.PluginException;
+import org.pf4j.PluginRuntimeException;
 
 @SuppressWarnings("serial")
-public class PluginInvokeException extends PluginException{
+public class PluginInvokeException extends PluginRuntimeException{
 
 	private String pluginId;
 	
diff --git a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pom.xml b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pom.xml
index cc5902d..f2a88e1 100644
--- a/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pom.xml
+++ b/spring-boot-sample-pf4j2/pf4j2-plugin-sample/pom.xml
@@ -23,7 +23,7 @@
         <commons-lang.version>2.6</commons-lang.version>
         <fastjson.version>1.2.61</fastjson.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
-        <pf4j.version>2.2.0</pf4j.version>
+        <pf4j.version>3.14.1</pf4j.version>
         <pf4j-update.version>2.0.0</pf4j-update.version>
         <pf4j-spring.version>0.4.0</pf4j-spring.version>
         <slf4j.version>1.7.21</slf4j.version>