GH-103 - Upgrade to Spring Framework 7.0 M2.

core/src/main/java/org/springframework/plugin/core/support/AbstractTypeAwareSupport.java

@@ -20,11 +20,10 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.function.Predicate;
 
 import org.springframework.aop.TargetSource;
 import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.context.ApplicationContext;
@@ -219,10 +218,10 @@ public abstract class AbstractTypeAwareSupport<T>
 
 		private Collection<Object> getBeansOfTypeExcept(Class<?> type, Collection<Class<?>> exceptions) {
 
-			return Arrays.stream(context.getBeanNamesForType(type, false, eagerInit)) //
-					.filter(it -> !exceptions.contains(context.getType(it))) //
-					.map(it -> context.getBean(it)) //
-					.collect(Collectors.toList());
+			return context.getBeanProvider(type, eagerInit)
+					.stream(Predicate.not(exceptions::contains))
+					.map(Object.class::cast)
+					.toList();
 		}
 	}
 }

pom.xml

@@ -49,7 +49,7 @@
 		<junit.version>5.9.1</junit.version>
 		<logback.version>1.4.4</logback.version>
 		<mockito.version>4.9.0</mockito.version>
-		<spring.version>6.0.0</spring.version>
+		<spring.version>7.0.0-SNAPSHOT</spring.version>
 		<slf4j.version>2.0.3</slf4j.version>
 
 		<artifactory-maven-plugin.version>3.4.0</artifactory-maven-plugin.version>
@@ -359,4 +359,21 @@
 		<url>https://github.com/spring-projects/spring-plugin/issues</url>
 	</issueManagement>
 
+	<repositories>
+		<repository>
+			<id>spring-milestone</id>
+			<url>https://repo.spring.io/milestone</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>spring-snapshot</id>
+			<url>https://repo.spring.io/snapshot</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+	</repositories>
+
 </project>