Only UI to depend on Classgraph. Fixes springdoc#1424.

Author: bnasslahsen

pom.xml

@@ -71,7 +71,7 @@
 		<swagger-api.version>2.1.12</swagger-api.version>
 		<swagger-ui.version>4.1.3</swagger-ui.version>
 		<spring-security-oauth2.version>2.3.8.RELEASE</spring-security-oauth2.version>
-		<classgraph.version>4.8.117</classgraph.version>
+		<classgraph.version>4.8.138</classgraph.version>
 		<webjars-locator-core.version>0.45</webjars-locator-core.version>
 		<gmavenplus-plugin.version>1.8.1</gmavenplus-plugin.version>
 		<jaxb-impl.version>2.1</jaxb-impl.version>
@@ -87,25 +87,9 @@
 			<!-- swagger dependencies -->
 			<dependency>
 				<groupId>io.swagger.core.v3</groupId>
-				<artifactId>swagger-models</artifactId>
+				<artifactId>swagger-core</artifactId>
 				<version>${swagger-api.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>io.swagger.core.v3</groupId>
-				<artifactId>swagger-annotations</artifactId>
-				<version>${swagger-api.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>io.swagger.core.v3</groupId>
-				<artifactId>swagger-integration</artifactId>
-				<version>${swagger-api.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>io.github.classgraph</groupId>
-						<artifactId>classgraph</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
 			<!-- swagger ui -->
 			<dependency>
 				<groupId>org.webjars</groupId>

springdoc-openapi-common/pom.xml

@@ -22,23 +22,7 @@
 		</dependency>
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-models</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-annotations</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.swagger.core.v3</groupId>
-			<artifactId>swagger-integration</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.github.classgraph</groupId>
-			<artifactId>classgraph</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
+			<artifactId>swagger-core</artifactId>
 		</dependency>
 		<!-- Actuator dependencies -->
 		<dependency>

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/AbstractSpringDocTest.java

@@ -23,7 +23,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import nonapi.io.github.classgraph.utils.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,9 +53,9 @@ public abstract class AbstractSpringDocTest {
 	@Autowired
 	protected MockMvc mockMvc;
 
-	public static String getContent(String fileName) throws Exception {
+	public static String getContent(String fileName) {
 		try {
-			Path path = Paths.get(FileUtils.class.getClassLoader().getResource(fileName).toURI());
+			Path path = Paths.get(AbstractSpringDocTest.class.getClassLoader().getResource(fileName).toURI());
 			byte[] fileBytes = Files.readAllBytes(path);
 			return new String(fileBytes, StandardCharsets.UTF_8);
 		}

springdoc-openapi-groovy/src/test/groovy/test/org/springdoc/api/AbstractSpringDocTest.java

@@ -23,7 +23,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import nonapi.io.github.classgraph.utils.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,7 +55,7 @@ public abstract class AbstractSpringDocTest {
 
 	public static String getContent(String fileName) throws Exception {
 		try {
-			Path path = Paths.get(FileUtils.class.getClassLoader().getResource(fileName).toURI());
+			Path path = Paths.get(AbstractSpringDocTest.class.getClassLoader().getResource(fileName).toURI());
 			byte[] fileBytes = Files.readAllBytes(path);
 			return new String(fileBytes, StandardCharsets.UTF_8);
 		}

springdoc-openapi-hateoas/src/test/java/test/org/springdoc/api/AbstractSpringDocTest.java

@@ -23,7 +23,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import nonapi.io.github.classgraph.utils.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,9 +53,9 @@ public abstract class AbstractSpringDocTest {
 	@Autowired
 	protected MockMvc mockMvc;
 
-	public static String getContent(String fileName) throws Exception {
+	public static String getContent(String fileName)  {
 		try {
-			Path path = Paths.get(FileUtils.class.getClassLoader().getResource(fileName).toURI());
+			Path path = Paths.get(AbstractSpringDocTest.class.getClassLoader().getResource(fileName).toURI());
 			byte[] fileBytes = Files.readAllBytes(path);
 			return new String(fileBytes, StandardCharsets.UTF_8);
 		}

springdoc-openapi-javadoc/src/test/java/test/org/springdoc/api/AbstractSpringDocTest.java

@@ -23,7 +23,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import nonapi.io.github.classgraph.utils.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -75,7 +74,7 @@ public abstract class AbstractSpringDocTest {
 	 */
 	public static String getContent(String fileName) throws Exception {
 		try {
-			Path path = Paths.get(FileUtils.class.getClassLoader().getResource(fileName).toURI());
+			Path path = Paths.get(AbstractSpringDocTest.class.getClassLoader().getResource(fileName).toURI());
 			byte[] fileBytes = Files.readAllBytes(path);
 			return new String(fileBytes, StandardCharsets.UTF_8);
 		}

springdoc-openapi-kotlin/src/test/java/test/org/springdoc/api/AbstractSpringDocTest.java

@@ -23,7 +23,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import nonapi.io.github.classgraph.utils.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 import org.springdoc.core.Constants;
@@ -41,9 +40,9 @@ public abstract class AbstractSpringDocTest {
 	@Autowired
 	private WebTestClient webTestClient;
 
-	public static String getContent(String fileName) throws Exception {
+	public static String getContent(String fileName) {
 		try {
-			Path path = Paths.get(FileUtils.class.getClassLoader().getResource(fileName).toURI());
+			Path path = Paths.get(AbstractSpringDocTest.class.getClassLoader().getResource(fileName).toURI());
 			byte[] fileBytes = Files.readAllBytes(path);
 			return new String(fileBytes, StandardCharsets.UTF_8);
 		}

springdoc-openapi-kotlin/src/test/kotlin/test/org/springdoc/api/AbstractKotlinSpringDocTest.kt

@@ -18,7 +18,6 @@
 
 package test.org.springdoc.api
 
-import nonapi.io.github.classgraph.utils.FileUtils
 import org.junit.jupiter.api.Test
 import org.skyscreamer.jsonassert.JSONAssert
 import org.springdoc.core.Constants
@@ -57,7 +56,7 @@ abstract class AbstractKotlinSpringDocTest {
 		@Throws(Exception::class)
 		fun getContent(fileName: String): String {
 			try {
-				val path = Paths.get(FileUtils::class.java.classLoader.getResource(fileName)!!.toURI())
+				val path = Paths.get(AbstractKotlinSpringDocTest::class.java.classLoader.getResource(fileName)!!.toURI())
 				val fileBytes = Files.readAllBytes(path)
 				return String(fileBytes, StandardCharsets.UTF_8)
 			} catch (e: Exception) {

springdoc-openapi-security/src/test/java/test/org/springdoc/api/AbstractSpringDocTest.java

@@ -23,7 +23,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import nonapi.io.github.classgraph.utils.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.springdoc.core.Constants;
 
@@ -53,9 +52,9 @@ public abstract class AbstractSpringDocTest {
 	@Autowired
 	protected MockMvc mockMvc;
 
-	public static String getContent(String fileName) throws Exception {
+	public static String getContent(String fileName) {
 		try {
-			Path path = Paths.get(FileUtils.class.getClassLoader().getResource(fileName).toURI());
+			Path path = Paths.get(AbstractSpringDocTest.class.getClassLoader().getResource(fileName).toURI());
 			byte[] fileBytes = Files.readAllBytes(path);
 			return new String(fileBytes, StandardCharsets.UTF_8);
 		}

springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/AbstractCommonTest.java

@@ -5,7 +5,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import nonapi.io.github.classgraph.utils.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,9 +22,9 @@ public abstract class AbstractCommonTest {
 	@Autowired
 	protected MockMvc mockMvc;
 
-	protected String getContent(String fileName) throws Exception {
+	protected String getContent(String fileName) {
 		try {
-			Path path = Paths.get(FileUtils.class.getClassLoader().getResource(fileName).toURI());
+			Path path = Paths.get(AbstractCommonTest.class.getClassLoader().getResource(fileName).toURI());
 			byte[] fileBytes = Files.readAllBytes(path);
 			return new String(fileBytes, StandardCharsets.UTF_8);
 		}

springdoc-openapi-webflux-core/src/test/java/test/org/springdoc/api/AbstractCommonTest.java

@@ -5,7 +5,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import nonapi.io.github.classgraph.utils.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,7 +29,7 @@ public abstract class AbstractCommonTest {
 
 	protected String getContent(String fileName) {
 		try {
-			Path path = Paths.get(FileUtils.class.getClassLoader().getResource(fileName).toURI());
+			Path path = Paths.get(AbstractCommonTest.class.getClassLoader().getResource(fileName).toURI());
 			byte[] fileBytes = Files.readAllBytes(path);
 			return new String(fileBytes, StandardCharsets.UTF_8);
 		}

springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/AbstractCommonTest.java

@@ -5,7 +5,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import nonapi.io.github.classgraph.utils.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,9 +22,9 @@ public abstract class AbstractCommonTest {
 	@Autowired
 	protected WebTestClient webTestClient;
 
-	protected String getContent(String fileName) throws Exception {
+	protected String getContent(String fileName) {
 		try {
-			Path path = Paths.get(FileUtils.class.getClassLoader().getResource(fileName).toURI());
+			Path path = Paths.get(AbstractCommonTest.class.getClassLoader().getResource(fileName).toURI());
 			byte[] fileBytes = Files.readAllBytes(path);
 			return new String(fileBytes, StandardCharsets.UTF_8);
 		}

springdoc-openapi-webflux-ui/src/test/java/test/org/springdoc/ui/AbstractSpringDocTest.java

@@ -23,7 +23,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import nonapi.io.github.classgraph.utils.FileUtils;
 import org.springdoc.core.Constants;
 import org.springdoc.core.SpringDocConfigProperties;
 import org.springdoc.core.SpringDocConfiguration;
@@ -54,7 +53,7 @@ public abstract class AbstractSpringDocTest extends AbstractCommonTest {
 
 	protected String getContent(String fileName) {
 		try {
-			Path path = Paths.get(FileUtils.class.getClassLoader().getResource(fileName).toURI());
+			Path path = Paths.get(AbstractSpringDocTest.class.getClassLoader().getResource(fileName).toURI());
 			byte[] fileBytes = Files.readAllBytes(path);
 			return new String(fileBytes, StandardCharsets.UTF_8);
 		}

springdoc-openapi-webmvc-core/src/test/java/test/org/springdoc/api/AbstractCommonTest.java

@@ -5,8 +5,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-import nonapi.io.github.classgraph.utils.FileUtils;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.test.context.ActiveProfiles;
@@ -26,7 +24,7 @@ public abstract class AbstractCommonTest {
 
 	protected String getContent(String fileName) throws Exception {
 		try {
-			Path path = Paths.get(FileUtils.class.getClassLoader().getResource(fileName).toURI());
+			Path path = Paths.get(AbstractCommonTest.class.getClassLoader().getResource(fileName).toURI());
 			byte[] fileBytes = Files.readAllBytes(path);
 			return new String(fileBytes, StandardCharsets.UTF_8);
 		}