chore: support jakarta web methods

mebigfatguy · Jan 18, 2025 · 0626b79 · 0626b79
1 parent cbbdfe3
commit 0626b79
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/build.properties b/build.properties
@@ -3,4 +3,4 @@
 #	Dave Brosius
 
 
-deadmethods.version = 0.9.2
+deadmethods.version = 0.9.3
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.mebigfatguy.deadmethods</groupId>
 	<artifactId>deadmethods</artifactId>
-	<version>0.9.2</version>
+	<version>0.9.3</version>
 
 	<parent>
 		<groupId>org.sonatype.oss</groupId>
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>org.ow2.asm</groupId>
 			<artifactId>asm</artifactId>
-			<version>9.7</version>
+			<version>9.7.1</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.servlet</groupId>
@@ -59,17 +59,17 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>5.3.34</version>
+			<version>5.3.39</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>5.3.34</version>
+			<version>5.3.39</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.ant</groupId>
 			<artifactId>ant</artifactId>
-			<version>1.10.14</version>
+			<version>1.10.15</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

diff --git a/src/main/java/com/mebigfatguy/deadmethods/DeadMethods.java b/src/main/java/com/mebigfatguy/deadmethods/DeadMethods.java
@@ -470,12 +470,25 @@ private void removeSPIClasses(ClassRepository repo, Set<String> methods) throws
 	}
 
 	private void removeWebMethods(ClassRepository repo, Set<String> methods) throws IOException {
-		ClassInfo info = repo.getClassInfo("javax/servlet/http/HttpServlet");
-
-		for (MethodInfo methodInfo : info.getMethodInfo()) {
-			clearDerivedMethods(methods, info, methodInfo.toString());
+		try {
+			ClassInfo info = repo.getClassInfo("javax/servlet/http/HttpServlet");
+
+			for (MethodInfo methodInfo : info.getMethodInfo()) {
+				clearDerivedMethods(methods, info, methodInfo.toString());
+			}
+			logger.verbose("Standard javax Web methods removed");
+		} catch (IOException e) {
+		}
+
+		try {
+			ClassInfo info = repo.getClassInfo("jakarta/servlet/http/HttpServlet");
+
+			for (MethodInfo methodInfo : info.getMethodInfo()) {
+				clearDerivedMethods(methods, info, methodInfo.toString());
+			}
+			logger.verbose("Standard jakarta Web methods removed");
+		} catch (IOException e) {
 		}
-		logger.verbose("Standard Web methods removed");
 	}
 
 	private void clearDerivedMethods(Set<String> methods, ClassInfo info, String methodInfo) {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,4 @@
		# Dave Brosius


		deadmethods.version = 0.9.2
		deadmethods.version = 0.9.3