This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 812debf7275 CAMEL-19511: camel-spring-boot - Remove spring.factories
(#877)
812debf7275 is described below
commit 812debf7275d557991b8aa80bc3b91e24d30ba6e
Author: Nicolas Filotto <[email protected]>
AuthorDate: Wed Jun 28 14:30:10 2023 +0200
CAMEL-19511: camel-spring-boot - Remove spring.factories (#877)
The auto-configurations are now register with the file
`org.springframework.boot.autoconfigure.AutoConfiguration.imports` instead of
`spring.factories`. The migration has been done properly but some small things
need to be fixed.
## Modifications:
* Removes the useless remaining `spring.factories`
* Defines the license header for the file
`org.springframework.boot.autoconfigure.AutoConfiguration.imports`
* Removes the useless remaining `add-opens` for the camel-swift test (not
related to the initial issue)
---
components-starter/camel-swift-starter/pom.xml | 11 -----------
.../src/main/resources/META-INF/spring.factories | 21 ---------------------
pom.xml | 2 +-
3 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/components-starter/camel-swift-starter/pom.xml
b/components-starter/camel-swift-starter/pom.xml
index 42162caa702..78ec8f7b7fc 100644
--- a/components-starter/camel-swift-starter/pom.xml
+++ b/components-starter/camel-swift-starter/pom.xml
@@ -81,15 +81,4 @@
</dependency>
<!--END OF GENERATED CODE-->
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>--add-opens java.base/java.time=ALL-UNNAMED
- </argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git
a/components-starter/camel-swift-starter/src/main/resources/META-INF/spring.factories
b/components-starter/camel-swift-starter/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index a0a35a8d9c1..00000000000
---
a/components-starter/camel-swift-starter/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,21 +0,0 @@
-## ---------------------------------------------------------------------------
-## Licensed to the Apache Software Foundation (ASF) under one or more
-## contributor license agreements. See the NOTICE file distributed with
-## this work for additional information regarding copyright ownership.
-## The ASF licenses this file to You under the Apache License, Version 2.0
-## (the "License"); you may not use this file except in compliance with
-## the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-## ---------------------------------------------------------------------------
-
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.dataformat.swift.mt.springboot.SwiftMtDataFormatAutoConfiguration,\
-org.apache.camel.dataformat.swift.mx.springboot.SwiftMxDataFormatAutoConfiguration
-
diff --git a/pom.xml b/pom.xml
index a8f8ffd3174..03e250f5bcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -828,7 +828,7 @@
<mapping>
<java>SLASHSTAR_STYLE</java>
<properties>CAMEL_PROPERTIES_STYLE</properties>
-
<spring.factories>CAMEL_PROPERTIES_STYLE</spring.factories>
+
<org.springframework.boot.autoconfigure.AutoConfiguration.imports>CAMEL_PROPERTIES_STYLE</org.springframework.boot.autoconfigure.AutoConfiguration.imports>
<spring.provides>CAMEL_PROPERTIES_STYLE</spring.provides>
</mapping>
<headerDefinitions>