This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git.
discard 7cd8198 Regen for commit f865febc7f2b12d6bc0de2931747c20516c556d1 add 61f8109 CAMEL-16005: Fix route template duplicate id clash for auto assinged ids. Thanks to Marco Collovati for reporting and the unit test. add f9504a3 Regen for commit 61f8109005e8a94ff085d229cac12780120d6ea8 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 (7cd8198) \ N -- N -- N refs/heads/regen_bot (f9504a3) 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. No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/spi/IdAware.java | 9 +++++ .../impl/engine/DefaultExecutorServiceManager.java | 3 +- .../org/apache/camel/impl/DefaultCamelContext.java | 4 ++ .../org/apache/camel/model/ChoiceDefinition.java | 8 ++-- .../camel/model/OptionalIdentifiedDefinition.java | 12 ++++-- .../camel/model/ProcessorDefinitionHelper.java | 29 +++++++++++++ .../core/xml/AbstractCamelContextFactoryBean.java | 2 +- ...java => RouteTemplateDuplicateIdIssueTest.java} | 47 ++++++++++++---------- .../camel/main/DefaultConfigurationConfigurer.java | 2 +- .../java/org/apache/camel/xml/in/ModelParser.java | 9 +++-- 10 files changed, 90 insertions(+), 35 deletions(-) copy core/camel-core/src/test/java/org/apache/camel/builder/{RouteModelLifecycleTest.java => RouteTemplateDuplicateIdIssueTest.java} (51%)