Fixes according latest upgrades
* Add `--add-opens` to `asciidoctor` Gradle task to avoid compilation warning * Upgrade to Kotlin `1.6.10` and modify its Gradle task respective * Add empty impl for new `AnnotationMetadataAdapter.getDeclaredMethods()` * Parse HTTP methods to new `String methodNames` property of the `RequestMapping` since `HttpMethod` is not an `enum` anymore. * Ignore JDBC tests which rely on a map property resolution: the `[]` placeholder is not handled in the latest SF anymore. * Fix `WebFluxInboundEndpoint` for deprecations
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2021 the original author or authors.
|
||||
* Copyright 2002-2022 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -18,6 +18,7 @@ package org.springframework.integration.config.xml;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.w3c.dom.Element;
|
||||
|
||||
@@ -25,6 +26,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
|
||||
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
|
||||
import org.springframework.beans.factory.xml.BeanDefinitionParser;
|
||||
import org.springframework.beans.factory.xml.ParserContext;
|
||||
import org.springframework.core.type.MethodMetadata;
|
||||
import org.springframework.integration.config.EnablePublisher;
|
||||
import org.springframework.integration.config.IntegrationRegistrar;
|
||||
import org.springframework.integration.config.PublisherRegistrar;
|
||||
@@ -84,6 +86,12 @@ public class AnnotationConfigParser implements BeanDefinitionParser {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Set<MethodMetadata> getDeclaredMethods() {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2002-2019 the original author or authors.
|
||||
* Copyright 2002-2022 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -18,12 +18,14 @@ package org.springframework.integration.config.xml;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
import org.w3c.dom.Element;
|
||||
|
||||
import org.springframework.beans.factory.config.BeanDefinition;
|
||||
import org.springframework.beans.factory.xml.BeanDefinitionParser;
|
||||
import org.springframework.beans.factory.xml.ParserContext;
|
||||
import org.springframework.core.type.MethodMetadata;
|
||||
import org.springframework.integration.config.MessageHistoryRegistrar;
|
||||
import org.springframework.integration.config.annotation.AnnotationMetadataAdapter;
|
||||
|
||||
@@ -51,6 +53,11 @@ public class MessageHistoryParser implements BeanDefinitionParser {
|
||||
return Collections.singletonMap("value", element.getAttribute("tracked-components"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<MethodMetadata> getDeclaredMethods() {
|
||||
return null;
|
||||
}
|
||||
|
||||
}, parserContext.getRegistry());
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user