This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch CAMEL-13563
in repository https://gitbox.apache.org/repos/asf/camel.git.
discard eeb3193 Removing Jetty 9.2 altogether
discard 41918a1 Updating CXF to 3.3.2. This is needed to avoid a NPE when
shutting down Jetty
discard e40aaef Fixing camel-ahc errors with Jetty upgrade
discard 20e53b3 Missing file from last commit
discard 0d44f7a CAMEL-13563 - Update Jetty to 9.4.18 + fix client
authentication issues
add 2081777 Upgrade Qpid JMS client to version 0.43.0
add aac2d99 Upgrade Proton-J to version 0.33.1
add c75924c Upgrade Box Java SDK to version 2.34.0
add 1ba3ed4 Upgrade Fabric8 Maven Plugin to version 4.1.0
add 8eee607 add my pgp key
add de081e9 Upgrade Karaf to version 4.2.6
add 2434e04 Upgrade Californium to version 2.0.0-M15
add 4229a76 CAMEL-13627: camel-main - Reuse options for main and
camel-spring-boot
add 9d4c91b CAMEL-13632: Deprecate and remove ReloadStrategy
add 1e28296 CAMEL-13627: camel-main - Reuse options for main and
camel-spring-boot
add 1276d43 CAMEL-13627: camel-main - Reuse options for main and
camel-spring-boot
new 94bf64c CAMEL-13563 - Update Jetty to 9.4.18 + fix client
authentication issues
new cce51dc Missing file from last commit
new 6f9f1eb Fixing camel-ahc errors with Jetty upgrade
new 22734bb Updating CXF to 3.3.2. This is needed to avoid a NPE when
shutting down Jetty
new 42375ed Removing Jetty 9.2 altogether
new 71a9283 Fixing tests with older Jetty version
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (eeb3193)
\
N -- N -- N refs/heads/CAMEL-13563 (71a9283)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 6 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:
KEYS | 55 +
MIGRATION.md | 2 +-
.../camel/component/cometd/CometdComponent.java | 3 +-
.../component/salesforce/SalesforceComponent.java | 4 +-
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 +---------
.../component/websocket/WebsocketComponent.java | 6 +-
.../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 -
parent/pom.xml | 12 +-
32 files changed, 252 insertions(+), 3471 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
