JDT issue in spring-security project

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ParameterizedTypeBinding.java

@@ -208,8 +208,12 @@ public ParameterizedTypeBinding capture(Scope scope, int start, int end) {
 					if (wildcard.boundKind == Wildcard.SUPER && wildcard.bound.id == TypeIds.T_JavaLangObject) {
 						capturedArguments[i] = wildcard.bound;
 					} else {
-						capturedArguments[i] = this.environment.createCapturedWildcard(wildcard, contextType, start, end, cud, compilationUnitScope::nextCaptureID);
-						freshCaptures[i] = true;
+						if (wildcard.boundKind == Wildcard.EXTENDS && wildcard.otherBounds == null && wildcard.bound instanceof CaptureBinding) {
+							capturedArguments[i] = wildcard.bound;
+						} else {
+							capturedArguments[i] = this.environment.createCapturedWildcard(wildcard, contextType, start, end, cud, compilationUnitScope::nextCaptureID);
+							freshCaptures[i] = true;
+						}
 					}
 				} else {
 					capturedArguments[i] = argument;

org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.core.tests.compiler;singleton:=true
-Bundle-Version: 3.13.1100.qualifier
+Bundle-Version: 3.13.1200.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jdt.core.tests.compiler,

org.eclipse.jdt.core.tests.compiler/pom.xml

@@ -19,7 +19,7 @@
     <relativePath>../tests-pom/</relativePath>
   </parent>
   <artifactId>org.eclipse.jdt.core.tests.compiler</artifactId>
-  <version>3.13.1100-SNAPSHOT</version>
+  <version>3.13.1200-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>

org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_1_8.java

@@ -10964,4 +10964,32 @@ <X, Y extends One<X>> void foo2(Y y1) {
 			"The method bar(One<Inner<?>>) in the type Bug is not applicable for the arguments (One<Inner<X>>)\n" +
 			"----------\n");
 	}
+	// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/4867
+	public void testGH4867() {
+		runConformTest(
+			new String[] {
+				"MessageExpressionVoterTests.java",
+				"""
+				public class MessageExpressionVoterTests {
+					MessageMatcher<?> matcher = new MessageMatcher<String>() {
+					};
+
+					public boolean voteGranted() {
+						return this.matcher.matcher(ArgumentMatchers.any());
+					}
+				}
+				interface MessageMatcher<T> {
+					default boolean matcher(Message<? extends T> message) {
+						return true;
+					}
+				}
+				interface Message<T> {}
+				class ArgumentMatchers {
+					public static <T> T any() {
+						return null;
+					}
+				}
+				"""
+			});
+	}
 }