You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ji...@apache.org on 2023/12/01 10:33:51 UTC
(camel-quarkus) 11/11: Fix of upgraded spring-version to 6.1.1
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 66a3fd95784adf6bb7fbf1532a9d80588d8760c7
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Fri Dec 1 11:33:03 2023 +0100
Fix of upgraded spring-version to 6.1.1
---
.../support/spring/graal/SpringKotlinSubstitutions.java | 16 ----------------
.../support/spring/graal/SpringSubstitutions.java | 5 -----
extensions-support/spring/shade/beans/pom.xml | 1 +
3 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringKotlinSubstitutions.java b/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringKotlinSubstitutions.java
index 08c61492c5..51bed4412f 100644
--- a/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringKotlinSubstitutions.java
+++ b/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringKotlinSubstitutions.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.quarkus.support.spring.graal;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
@@ -53,20 +51,6 @@ final class SubstituteKotlinDetector {
final class SubstituteKotlinReflectionParameterNameDiscoverer {
}
-@TargetClass(className = "org.springframework.beans.BeanUtils$KotlinDelegate")
-final class SubstituteBeanUtilsKotlinDelegate {
- @Substitute
- public static <T> Constructor<T> findPrimaryConstructor(Class<T> clazz) {
- throw new UnsupportedOperationException("Kotlin is not supported");
- }
-
- @Substitute
- public static <T> T instantiateClass(Constructor<T> ctor, Object... args)
- throws IllegalAccessException, InvocationTargetException, InstantiationException {
- throw new UnsupportedOperationException("Kotlin is not supported");
- }
-}
-
@TargetClass(className = "org.springframework.core.MethodParameter$KotlinDelegate")
final class SubstituteMethodParameterKotlinDelegate {
@Substitute
diff --git a/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringSubstitutions.java b/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringSubstitutions.java
index b0bad899c1..559ac4b260 100644
--- a/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringSubstitutions.java
+++ b/extensions-support/spring/runtime/src/main/java/org/apache/camel/quarkus/support/spring/graal/SpringSubstitutions.java
@@ -44,11 +44,6 @@ final class SubstituteDefaultParameterNameDiscoverer {
final class SubstituteStandardReflectionParameterNameDiscoverer {
}
-@TargetClass(className = "org.springframework.core.LocalVariableTableParameterNameDiscoverer")
-@Delete
-final class SubstituteLocalVariableTableParameterNameDiscoverer {
-}
-
@TargetClass(className = "org.springframework.core.io.VfsUtils")
@Delete
final class SubstituteVfsUtils {
diff --git a/extensions-support/spring/shade/beans/pom.xml b/extensions-support/spring/shade/beans/pom.xml
index 7f067ee6ed..c774af7104 100644
--- a/extensions-support/spring/shade/beans/pom.xml
+++ b/extensions-support/spring/shade/beans/pom.xml
@@ -70,6 +70,7 @@
</includes>
<excludes>
<exclude>org/springframework/beans/factory/groovy/**</exclude>
+ <exclude>org/springframework/beans/BeanUtils$Kotlin*</exclude>
</excludes>
</filter>
</filters>