This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 2434e04 Upgrade Californium to version 2.0.0-M15
new 4229a76 CAMEL-13627: camel-main - Reuse options for main and
camel-spring-boot
new 9d4c91b CAMEL-13632: Deprecate and remove ReloadStrategy
new 1e28296 CAMEL-13627: camel-main - Reuse options for main and
camel-spring-boot
new 1276d43 CAMEL-13627: camel-main - Reuse options for main and
camel-spring-boot
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
MIGRATION.md | 2 +-
components/camel-spring-boot/pom.xml | 4 +
.../src/main/docs/spring-boot.adoc | 18 +-
.../camel/spring/boot/CamelAutoConfiguration.java | 9 +-
.../spring/boot/CamelConfigurationProperties.java | 553 +---------
.../main/java/org/apache/camel/CamelContext.java | 13 -
.../java/org/apache/camel/spi/ReloadStrategy.java | 54 -
.../camel/impl/engine/AbstractCamelContext.java | 17 -
.../camel/reload/FileWatcherReloadStrategy.java | 161 ---
.../apache/camel/reload/ReloadStrategySupport.java | 242 -----
.../impl/model/FileWatcherReloadStrategyTest.java | 188 ----
...es.java => DefaultConfigurationProperties.java} | 550 +++-------
.../camel/main/MainConfigurationProperties.java | 1110 +-------------------
.../java/org/apache/camel/main/MainSupport.java | 83 +-
.../ManagedFileWatcherReloadStrategyTest.java | 68 --
.../components/modules/ROOT/pages/spring-boot.adoc | 18 +-
examples/README.adoc | 3 -
examples/camel-example-reload/Readme.md | 47 -
examples/camel-example-reload/pom.xml | 89 --
.../camel/example/reload/CamelReloadMain.java | 39 -
.../example/reload/CamelReloadRecursivelyMain.java | 40 -
.../src/main/resources/META-INF/LICENSE.txt | 203 ----
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../resources/META-INF/spring/bar/barContext.xml | 38 -
.../resources/META-INF/spring/camel-context.xml | 59 --
.../src/main/resources/log4j2.properties | 23 -
examples/pom.xml | 1 -
27 files changed, 183 insertions(+), 3460 deletions(-)
delete mode 100644
core/camel-api/src/main/java/org/apache/camel/spi/ReloadStrategy.java
delete mode 100644
core/camel-core/src/main/java/org/apache/camel/reload/FileWatcherReloadStrategy.java
delete mode 100644
core/camel-core/src/main/java/org/apache/camel/reload/ReloadStrategySupport.java
delete mode 100644
core/camel-core/src/test/java/org/apache/camel/impl/model/FileWatcherReloadStrategyTest.java
copy
core/camel-main/src/main/java/org/apache/camel/main/{MainConfigurationProperties.java
=> DefaultConfigurationProperties.java} (68%)
delete mode 100644
core/camel-management-impl/src/test/java/org/apache/camel/management/ManagedFileWatcherReloadStrategyTest.java
delete mode 100644 examples/camel-example-reload/Readme.md
delete mode 100644 examples/camel-example-reload/pom.xml
delete mode 100644
examples/camel-example-reload/src/main/java/org/apache/camel/example/reload/CamelReloadMain.java
delete mode 100644
examples/camel-example-reload/src/main/java/org/apache/camel/example/reload/CamelReloadRecursivelyMain.java
delete mode 100644
examples/camel-example-reload/src/main/resources/META-INF/LICENSE.txt
delete mode 100644
examples/camel-example-reload/src/main/resources/META-INF/NOTICE.txt
delete mode 100644
examples/camel-example-reload/src/main/resources/META-INF/spring/bar/barContext.xml
delete mode 100644
examples/camel-example-reload/src/main/resources/META-INF/spring/camel-context.xml
delete mode 100644
examples/camel-example-reload/src/main/resources/log4j2.properties
