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.git
The following commit(s) were added to refs/heads/main by this push:
new 97172cd8c10 CAMEL-18100: Fixed split package for
org.apache.camel.resume. Add OSGi imports to make it work
97172cd8c10 is described below
commit 97172cd8c1090e2d1f2b7b79270f9b9c6aa08ab3
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed May 11 22:51:46 2022 +0200
CAMEL-18100: Fixed split package for org.apache.camel.resume. Add OSGi
imports to make it work
---
.../component/couchbase/integration/ConsumeResumeStrategyIT.java | 2 +-
.../apache/camel/component/couchdb/consumer/CouchDbResumable.java | 2 +-
.../src/main/java/org/apache/camel/component/file/GenericFile.java | 2 +-
.../camel/component/kafka/consumer/support/KafkaResumable.java | 2 +-
.../kafka/integration/KafkaConsumerWithResumeRouteStrategyIT.java | 2 +-
core/camel-core-xml/pom.xml | 1 +
.../component/file/FileConsumerResumeFromOffsetStrategyTest.java | 2 +-
.../apache/camel/component/file/FileConsumerResumeStrategyTest.java | 2 +-
.../main/java/org/apache/camel/{ => support}/resume/Offsets.java | 6 ++++--
.../main/java/org/apache/camel/{ => support}/resume/Resumables.java | 5 ++++-
core/camel-xml-jaxb/pom.xml | 1 +
11 files changed, 17 insertions(+), 10 deletions(-)
diff --git
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java
index 20b03444564..8925c5459bd 100644
---
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java
+++
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeResumeStrategyIT.java
@@ -25,7 +25,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.couchbase.CouchbaseResumeAdapter;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.resume.TransientResumeStrategy;
-import org.apache.camel.resume.Resumables;
+import org.apache.camel.support.resume.Resumables;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git
a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/CouchDbResumable.java
b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/CouchDbResumable.java
index d7a7e91311e..df8d2e10917 100644
---
a/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/CouchDbResumable.java
+++
b/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/consumer/CouchDbResumable.java
@@ -19,8 +19,8 @@ package org.apache.camel.component.couchdb.consumer;
import org.apache.camel.component.couchdb.CouchDbClientWrapper;
import org.apache.camel.resume.Offset;
-import org.apache.camel.resume.Offsets;
import org.apache.camel.resume.Resumable;
+import org.apache.camel.support.resume.Offsets;
/**
* Wraps the resume data for CouchDb
diff --git
a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFile.java
b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFile.java
index c1fcc9de5f9..ab00c178942 100644
---
a/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFile.java
+++
b/components/camel-file/src/main/java/org/apache/camel/component/file/GenericFile.java
@@ -25,7 +25,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.WrappedFile;
import org.apache.camel.component.file.consumer.GenericFileResumable;
import org.apache.camel.resume.Offset;
-import org.apache.camel.resume.Offsets;
+import org.apache.camel.support.resume.Offsets;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/KafkaResumable.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/KafkaResumable.java
index 03bc3a977b1..064b721c8cf 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/KafkaResumable.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/KafkaResumable.java
@@ -18,8 +18,8 @@
package org.apache.camel.component.kafka.consumer.support;
import org.apache.camel.resume.Offset;
-import org.apache.camel.resume.Offsets;
import org.apache.camel.resume.Resumable;
+import org.apache.camel.support.resume.Offsets;
public class KafkaResumable implements Resumable<String, String> {
private final String partition;
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerWithResumeRouteStrategyIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerWithResumeRouteStrategyIT.java
index 52388fd9081..57669df0920 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerWithResumeRouteStrategyIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerWithResumeRouteStrategyIT.java
@@ -32,9 +32,9 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.resume.TransientResumeStrategy;
import org.apache.camel.resume.Offset;
import org.apache.camel.resume.Resumable;
-import org.apache.camel.resume.Resumables;
import org.apache.camel.resume.ResumeAdapter;
import org.apache.camel.resume.UpdatableConsumerResumeStrategy;
+import org.apache.camel.support.resume.Resumables;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.ProducerRecord;
diff --git a/core/camel-core-xml/pom.xml b/core/camel-core-xml/pom.xml
index 6efb6401ac8..5d57997c1d1 100644
--- a/core/camel-core-xml/pom.xml
+++ b/core/camel-core-xml/pom.xml
@@ -34,6 +34,7 @@
<properties>
<firstVersion>2.4.0</firstVersion>
<camel.osgi.import>
+ org.apache.camel.resume;${camel.osgi.import.camel.version},
javax.xml.bind*;version="[2.2,3.0)",
*
</camel.osgi.import>
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeFromOffsetStrategyTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeFromOffsetStrategyTest.java
index 9053c2ca3d3..fcd015f04c0 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeFromOffsetStrategyTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeFromOffsetStrategyTest.java
@@ -32,7 +32,7 @@ import
org.apache.camel.component.file.consumer.GenericFileResumeAdapter;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.resume.TransientResumeStrategy;
import org.apache.camel.resume.Resumable;
-import org.apache.camel.resume.Resumables;
+import org.apache.camel.support.resume.Resumables;
import org.apache.camel.resume.UpdatableConsumerResumeStrategy;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeStrategyTest.java
b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeStrategyTest.java
index b0f6ef96026..aee27bb8fe7 100644
---
a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeStrategyTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerResumeStrategyTest.java
@@ -28,7 +28,7 @@ import org.apache.camel.component.file.consumer.FileResumeSet;
import org.apache.camel.component.file.consumer.FileSetResumeAdapter;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.resume.TransientResumeStrategy;
-import org.apache.camel.resume.Resumables;
+import org.apache.camel.support.resume.Resumables;
import org.junit.jupiter.api.Test;
public class FileConsumerResumeStrategyTest extends ContextTestSupport {
diff --git
a/core/camel-support/src/main/java/org/apache/camel/resume/Offsets.java
b/core/camel-support/src/main/java/org/apache/camel/support/resume/Offsets.java
similarity index 96%
rename from
core/camel-support/src/main/java/org/apache/camel/resume/Offsets.java
rename to
core/camel-support/src/main/java/org/apache/camel/support/resume/Offsets.java
index ab5421af693..cc2b0195ac5 100644
--- a/core/camel-support/src/main/java/org/apache/camel/resume/Offsets.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/resume/Offsets.java
@@ -15,19 +15,21 @@
* limitations under the License.
*/
-package org.apache.camel.resume;
+package org.apache.camel.support.resume;
+
+import org.apache.camel.resume.Offset;
/**
* Offset handling support
*/
public final class Offsets {
+
/**
* Default initial offset when using long offsets
*/
public static final Offset<Long> INITIAL_LONG = Offsets.of(0L);
private Offsets() {
-
}
/**
diff --git
a/core/camel-support/src/main/java/org/apache/camel/resume/Resumables.java
b/core/camel-support/src/main/java/org/apache/camel/support/resume/Resumables.java
similarity index 95%
rename from
core/camel-support/src/main/java/org/apache/camel/resume/Resumables.java
rename to
core/camel-support/src/main/java/org/apache/camel/support/resume/Resumables.java
index 05a931cfd6b..56698545bc6 100644
--- a/core/camel-support/src/main/java/org/apache/camel/resume/Resumables.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/resume/Resumables.java
@@ -15,7 +15,10 @@
* limitations under the License.
*/
-package org.apache.camel.resume;
+package org.apache.camel.support.resume;
+
+import org.apache.camel.resume.Offset;
+import org.apache.camel.resume.Resumable;
/**
* A wrapper for resumable entities
diff --git a/core/camel-xml-jaxb/pom.xml b/core/camel-xml-jaxb/pom.xml
index e5f7a56ab25..27f73403706 100644
--- a/core/camel-xml-jaxb/pom.xml
+++ b/core/camel-xml-jaxb/pom.xml
@@ -34,6 +34,7 @@
<properties>
<firstVersion>3.1.0</firstVersion>
<camel.osgi.import>
+ org.apache.camel.resume;${camel.osgi.import.camel.version},
org.apache.camel.model;${camel.osgi.import.camel.version},
org.apache.camel.model.cloud;${camel.osgi.import.camel.version},
org.apache.camel.model.config;${camel.osgi.import.camel.version},
