This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 06c5faa17d2 CAMEL-21514: camel-jgropus - Upgrade to 5.4 and remove
cluster lock
06c5faa17d2 is described below
commit 06c5faa17d28ded49315690fac7947d894b7b8d6
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Dec 4 13:23:33 2024 +0100
CAMEL-21514: camel-jgropus - Upgrade to 5.4 and remove cluster lock
---
.../springboot/catalog/components/aws2-ec2.json | 2 +-
.../camel-jgroups-cluster-service-starter/pom.xml | 48 -----
.../src/main/docs/jgroups-cluster-service.json | 37 ----
...JGroupsLockClusterServiceAutoConfiguration.java | 54 ------
.../JGroupsLockClusterServiceConfiguration.java | 74 --------
.../src/main/resources/META-INF/LICENSE.txt | 203 ---------------------
.../src/main/resources/META-INF/NOTICE.txt | 11 --
...rk.boot.autoconfigure.AutoConfiguration.imports | 18 --
...upsLockClusterServiceAutoConfigurationTest.java | 67 -------
.../src/test/resources/logback.xml | 42 -----
components-starter/pom.xml | 1 -
tooling/camel-spring-boot-bom/pom.xml | 5 -
tooling/camel-spring-boot-dependencies/pom.xml | 5 -
13 files changed, 1 insertion(+), 566 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
index 365ff91b099..f0b041364f1 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
@@ -49,7 +49,7 @@
},
"headers": {
"CamelAwsEC2ImageId": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "An image ID of the AWS marketplace", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#IMAGE_ID" },
- "CamelAwsEC2InstanceType": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType":
"software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [
"a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal",
"c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge",
"c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge",
"c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", [...]
+ "CamelAwsEC2InstanceType": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType":
"software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [
"a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal",
"c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge",
"c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge",
"c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", [...]
"CamelAwsEC2Operation": { "index": 2, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The operation we want to perform", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#OPERATION" },
"CamelAwsEC2InstanceMinCount": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The minimum number of instances we want
to run.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MIN_COUNT" },
"CamelAwsEC2InstanceMaxCount": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The maximum number of instances we want
to run.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MAX_COUNT" },
diff --git a/components-starter/camel-jgroups-cluster-service-starter/pom.xml
b/components-starter/camel-jgroups-cluster-service-starter/pom.xml
deleted file mode 100644
index 7356abc4bd8..00000000000
--- a/components-starter/camel-jgroups-cluster-service-starter/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>components-starter</artifactId>
- <version>4.9.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-jgroups-cluster-service-starter</artifactId>
- <packaging>jar</packaging>
- <name>Camel SB Starters :: JGroups Cluster Service</name>
- <description>Spring-Boot Starter for Camel Cluster Service based on
JGroups</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-jgroups-starter</artifactId>
- </dependency>
- <!--START OF GENERATED CODE-->
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <!--END OF GENERATED CODE-->
- </dependencies>
-</project>
diff --git
a/components-starter/camel-jgroups-cluster-service-starter/src/main/docs/jgroups-cluster-service.json
b/components-starter/camel-jgroups-cluster-service-starter/src/main/docs/jgroups-cluster-service.json
deleted file mode 100644
index 79001e466da..00000000000
---
a/components-starter/camel-jgroups-cluster-service-starter/src/main/docs/jgroups-cluster-service.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "groups": [
- {
- "name": "camel.cluster.jgroups",
- "type":
"org.apache.camel.component.jgroups.springboot.cluster.JGroupsLockClusterServiceConfiguration",
- "sourceType":
"org.apache.camel.component.jgroups.springboot.cluster.JGroupsLockClusterServiceConfiguration"
- }
- ],
- "properties": [
- {
- "name": "camel.cluster.jgroups.enabled",
- "type": "java.lang.Boolean",
- "description": "Sets if the jgroups lock cluster service should be
enabled or not, default is true.",
- "sourceType":
"org.apache.camel.component.jgroups.springboot.cluster.JGroupsLockClusterServiceConfiguration",
- "defaultValue": true
- },
- {
- "name": "camel.cluster.jgroups.id",
- "type": "java.lang.String",
- "description": "Cluster Service ID",
- "sourceType":
"org.apache.camel.component.jgroups.springboot.cluster.JGroupsLockClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.jgroups.jgroups-cluster-name",
- "type": "java.lang.String",
- "description": "JGroups Cluster name",
- "sourceType":
"org.apache.camel.component.jgroups.springboot.cluster.JGroupsLockClusterServiceConfiguration"
- },
- {
- "name": "camel.cluster.jgroups.jgroups-config",
- "type": "java.lang.String",
- "description": "JGrups configuration File name",
- "sourceType":
"org.apache.camel.component.jgroups.springboot.cluster.JGroupsLockClusterServiceConfiguration"
- }
- ],
- "hints": []
-}
\ No newline at end of file
diff --git
a/components-starter/camel-jgroups-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/JGroupsLockClusterServiceAutoConfiguration.java
b/components-starter/camel-jgroups-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/JGroupsLockClusterServiceAutoConfiguration.java
deleted file mode 100644
index 7c59947d0ce..00000000000
---
a/components-starter/camel-jgroups-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/JGroupsLockClusterServiceAutoConfiguration.java
+++ /dev/null
@@ -1,54 +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.
- */
-package org.apache.camel.component.jgroups.springboot.cluster;
-
-import org.apache.camel.cluster.CamelClusterService;
-import org.apache.camel.component.jgroups.cluster.JGroupsLockClusterService;
-import org.apache.camel.spring.boot.CamelAutoConfiguration;
-import
org.apache.camel.spring.boot.cluster.ClusteredRouteControllerAutoConfiguration;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import
org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-
-import java.util.Optional;
-
-@Configuration
-@AutoConfigureBefore({ ClusteredRouteControllerAutoConfiguration.class,
CamelAutoConfiguration.class })
-@ConditionalOnProperty(prefix = "camel.cluster.jgroups", name = "enabled",
matchIfMissing = true)
-@EnableConfigurationProperties(JGroupsLockClusterServiceConfiguration.class)
-public class JGroupsLockClusterServiceAutoConfiguration {
-
- @Autowired
- private JGroupsLockClusterServiceConfiguration configuration;
-
- @Bean(name = "jgroups-lock-cluster-service")
- @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON)
- public CamelClusterService zookeeperClusterService() throws Exception {
- JGroupsLockClusterService service = new JGroupsLockClusterService();
-
- Optional.ofNullable(configuration.getId()).ifPresent(service::setId);
-
Optional.ofNullable(configuration.getJgroupsClusterName()).ifPresent(service::setJgroupsClusterName);
-
Optional.ofNullable(configuration.getJgroupsConfig()).ifPresent(service::setJgroupsConfig);
-
- return service;
- }
-}
diff --git
a/components-starter/camel-jgroups-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/JGroupsLockClusterServiceConfiguration.java
b/components-starter/camel-jgroups-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/JGroupsLockClusterServiceConfiguration.java
deleted file mode 100644
index f8fca7bbea2..00000000000
---
a/components-starter/camel-jgroups-cluster-service-starter/src/main/java/org/apache/camel/component/jgroups/springboot/cluster/JGroupsLockClusterServiceConfiguration.java
+++ /dev/null
@@ -1,74 +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.
- */
-package org.apache.camel.component.jgroups.springboot.cluster;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "camel.cluster.jgroups")
-public class JGroupsLockClusterServiceConfiguration {
- /**
- * Sets if the jgroups lock cluster service should be enabled or not,
default is true.
- */
- private boolean enabled = true;
-
- /**
- * Cluster Service ID
- */
- private String id;
-
- /**
- * JGrups configuration File name
- */
- private String jgroupsConfig;
-
- /**
- * JGroups Cluster name
- */
- private String jgroupsClusterName;
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getJgroupsConfig() {
- return jgroupsConfig;
- }
-
- public void setJgroupsConfig(String jgroupsConfig) {
- this.jgroupsConfig = jgroupsConfig;
- }
-
- public String getJgroupsClusterName() {
- return jgroupsClusterName;
- }
-
- public void setJgroupsClusterName(String jgroupsClusterName) {
- this.jgroupsClusterName = jgroupsClusterName;
- }
-}
diff --git
a/components-starter/camel-jgroups-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
b/components-starter/camel-jgroups-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
deleted file mode 100644
index 6b0b1270ff0..00000000000
---
a/components-starter/camel-jgroups-cluster-service-starter/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
diff --git
a/components-starter/camel-jgroups-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
b/components-starter/camel-jgroups-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
deleted file mode 100644
index 2e215bf2e6b..00000000000
---
a/components-starter/camel-jgroups-cluster-service-starter/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
- =========================================================================
- == NOTICE file corresponding to the section 4 d of ==
- == the Apache License, Version 2.0, ==
- == in this case for the Apache Camel distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
-
- Please read the different LICENSE files present in the licenses directory of
- this distribution.
diff --git
a/components-starter/camel-jgroups-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
b/components-starter/camel-jgroups-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
deleted file mode 100644
index 9971c3320e5..00000000000
---
a/components-starter/camel-jgroups-cluster-service-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+++ /dev/null
@@ -1,18 +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.apache.camel.component.jgroups.springboot.cluster.JGroupsLockClusterServiceAutoConfiguration
\ No newline at end of file
diff --git
a/components-starter/camel-jgroups-cluster-service-starter/src/test/java/org/apache/camel/component/jgroups/springboot/cluster/JGroupsLockClusterServiceAutoConfigurationTest.java
b/components-starter/camel-jgroups-cluster-service-starter/src/test/java/org/apache/camel/component/jgroups/springboot/cluster/JGroupsLockClusterServiceAutoConfigurationTest.java
deleted file mode 100644
index 02e9f648153..00000000000
---
a/components-starter/camel-jgroups-cluster-service-starter/src/test/java/org/apache/camel/component/jgroups/springboot/cluster/JGroupsLockClusterServiceAutoConfigurationTest.java
+++ /dev/null
@@ -1,67 +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.
- */
-package org.apache.camel.component.jgroups.springboot.cluster;
-
-import org.apache.camel.component.jgroups.cluster.JGroupsLockClusterService;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.autoconfigure.AutoConfigurations;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.context.annotation.Configuration;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class JGroupsLockClusterServiceAutoConfigurationTest {
-
- @Test
- public void testDisable() {
- new ApplicationContextRunner()
-
.withConfiguration(AutoConfigurations.of(JGroupsLockClusterServiceAutoConfiguration.class))
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cluster.jgroups.enabled=false")
- .run(
- context -> {
-
assertThat(context).doesNotHaveBean(JGroupsLockClusterService.class);
- });
- }
-
- /**
- * Testing that the service can be enabled and configured completely.
- */
- @Test
- public void testPropertiesMapped() {
- new ApplicationContextRunner()
-
.withConfiguration(AutoConfigurations.of(JGroupsLockClusterServiceAutoConfiguration.class))
- .withUserConfiguration(TestConfiguration.class)
- .withPropertyValues(
- "spring.main.banner-mode=off",
- "camel.cluster.jgroups.id=myid1")
- .run(
- context -> {
- final JGroupsLockClusterService clusterService =
context.getBean(JGroupsLockClusterService.class);
-
- assertThat(clusterService.getId()).isEqualTo("myid1");
- });
- }
-
- @EnableAutoConfiguration
- @Configuration
- public static class TestConfiguration {
- }
-}
diff --git
a/components-starter/camel-jgroups-cluster-service-starter/src/test/resources/logback.xml
b/components-starter/camel-jgroups-cluster-service-starter/src/test/resources/logback.xml
deleted file mode 100644
index 31fc824328b..00000000000
---
a/components-starter/camel-jgroups-cluster-service-starter/src/test/resources/logback.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<configuration>
-
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <!-- encoders are assigned the type
- ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger -
%msg%n</pattern>
- </encoder>
- </appender>
-
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <encoder>
- <pattern>%d{HH:mm:ss.SSS} [%-15.15thread] %-5level %-30.30logger -
%msg%n</pattern>
- </encoder>
- <file>target/camel-jgroups-cluster-service-starter-test.log</file>
- </appender>
-
- <root level="INFO">
- <!--<appender-ref ref="STDOUT"/>-->
- <appender-ref ref="FILE"/>
- </root>
-
-</configuration>
\ No newline at end of file
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 8b6de370879..22b8927549c 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -275,7 +275,6 @@
<module>camel-jdbc-starter</module>
<module>camel-jetty-starter</module>
<module>camel-jfr-starter</module>
- <module>camel-jgroups-cluster-service-starter</module>
<module>camel-jgroups-raft-cluster-service-starter</module>
<module>camel-jgroups-raft-starter</module>
<module>camel-jgroups-starter</module>
diff --git a/tooling/camel-spring-boot-bom/pom.xml
b/tooling/camel-spring-boot-bom/pom.xml
index 21d41f9fc83..27d2dde0c42 100644
--- a/tooling/camel-spring-boot-bom/pom.xml
+++ b/tooling/camel-spring-boot-bom/pom.xml
@@ -913,11 +913,6 @@
<artifactId>camel-jfr-starter</artifactId>
<version>4.9.0-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-jgroups-cluster-service-starter</artifactId>
- <version>4.9.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-jgroups-raft-cluster-service-starter</artifactId>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 1bc79b7e905..cd3a44fc99a 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -5392,11 +5392,6 @@
<artifactId>camel-jfr-starter</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.camel.springboot</groupId>
- <artifactId>camel-jgroups-cluster-service-starter</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-jgroups-raft-cluster-service-starter</artifactId>
