[build] Bump reflections to 0.10.2

Flowdalic · Nov 10, 2024 · d3cbe8c · d3cbe8c
1 parent f18d0df
commit d3cbe8c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/build-logic/src/main/groovy/org.igniterealtime.smack.java-common-conventions.gradle b/build-logic/src/main/groovy/org.igniterealtime.smack.java-common-conventions.gradle
@@ -41,7 +41,7 @@ ext {
 	bouncyCastleVersion = '1.73'
 	guavaVersion = '33.3.1-jre'
 	mockitoVersion = '5.14.2'
-	orgReflectionsVersion = '0.9.11'
+	orgReflectionsVersion = '0.10.2'
 
 	if (project.hasProperty("useSonatype")) {
 		useSonatype = project.getProperty("useSonatype").toBoolean()

diff --git a/smack-integration-test/build.gradle b/smack-integration-test/build.gradle
@@ -17,8 +17,6 @@ dependencies {
 	api project(':smack-resolver-dnsjava')
 	implementation project(':smack-websocket-java11')
 	implementation "com.google.guava:guava:${guavaVersion}"
-	// Do not upgrade to a higher reflections version until
-	// https://github.com/ronmamo/reflections/issues/273 is fixed.
 	implementation "org.reflections:reflections:${orgReflectionsVersion}"
 	api 'eu.geekplace.javapinning:java-pinning-java7:1.1.0-alpha1'
 	implementation group: 'commons-io', name: 'commons-io', version: "$commonsIoVersion"

diff --git a/...on-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java b/...on-test/src/main/java/org/igniterealtime/smack/inttest/SmackIntegrationTestFramework.java
@@ -77,10 +77,7 @@
 import org.igniterealtime.smack.inttest.debugger.SinttestDebugger;
 
 import org.reflections.Reflections;
-import org.reflections.scanners.MethodAnnotationsScanner;
-import org.reflections.scanners.MethodParameterScanner;
-import org.reflections.scanners.SubTypesScanner;
-import org.reflections.scanners.TypeAnnotationsScanner;
+import org.reflections.scanners.Scanners;
 
 public class SmackIntegrationTestFramework {
 
@@ -238,8 +235,8 @@ public synchronized TestRunResult run()
         else {
             testPackages = config.testPackages.toArray(new String[config.testPackages.size()]);
         }
-        Reflections reflections = new Reflections(testPackages, new SubTypesScanner(),
-                        new TypeAnnotationsScanner(), new MethodAnnotationsScanner(), new MethodParameterScanner());
+        Reflections reflections = new Reflections(testPackages, Scanners.SubTypes,
+                        Scanners.TypesAnnotated, Scanners.MethodsAnnotated, Scanners.MethodsParameter);
         Set<Class<? extends AbstractSmackIntegrationTest>> inttestClasses = reflections.getSubTypesOf(AbstractSmackIntegrationTest.class);
         Set<Class<? extends AbstractSmackLowLevelIntegrationTest>> lowLevelInttestClasses = reflections.getSubTypesOf(AbstractSmackLowLevelIntegrationTest.class);
 

diff --git a/...a11-full/src/test/java/org/jivesoftware/smack/full/ExtensionElementQNameDeclaredTest.java b/...a11-full/src/test/java/org/jivesoftware/smack/full/ExtensionElementQNameDeclaredTest.java
@@ -28,7 +28,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.reflections.Reflections;
-import org.reflections.scanners.SubTypesScanner;
+import org.reflections.scanners.Scanners;
 
 public class ExtensionElementQNameDeclaredTest {
 
@@ -38,7 +38,7 @@ public void qnameOrElementNamespaceDeclaredTest() {
                         "org.jivesoftware.smack",
                         "org.igniterealtime.smack",
         };
-        Reflections reflections = new Reflections(smackPackages, new SubTypesScanner());
+        Reflections reflections = new Reflections(smackPackages, Scanners.SubTypes);
         Set<Class<? extends ExtensionElement>> extensionElementClasses = reflections.getSubTypesOf(
                         ExtensionElement.class);