[camel-karaf] branch CAMEL-16484/dropbox-v5 updated (ad92b331 -> c9f2aa4a)

[nf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nfilotto pushed a change to branch CAMEL-16484/dropbox-v5
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git


 discard ad92b331 CAMEL-16484: camel-dropbox - Bump to Dropbox 5.4.2
     new c9f2aa4a CAMEL-16484: camel-dropbox - Bump to Dropbox 5.4.2

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   (ad92b331)
            \
             N -- N -- N   refs/heads/CAMEL-16484/dropbox-v5 (c9f2aa4a)

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 1 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:
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[camel-karaf] 01/01: CAMEL-16484: camel-dropbox - Bump to Dropbox 5.4.2

[nf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nfilotto pushed a commit to branch CAMEL-16484/dropbox-v5
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git

commit c9f2aa4a46eff78cff1576cb7e77ce732f1c9111
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Fri Oct 14 12:18:02 2022 +0200

    CAMEL-16484: camel-dropbox - Bump to Dropbox 5.4.2
---
 platforms/karaf/features/src/main/resources/features.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 8e1a40d7..c7a402fb 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -801,13 +801,8 @@
     <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
     <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
     <bundle dependency='true'>mvn:com.dropbox.core/dropbox-core-sdk/${dropbox-version}</bundle>
-    <!-- sadly dropbox-core-sdk include test scoped dependencies in its MANIFEST.MF OSGi import
-         so we need a bunch of other bundles here -->
-    <bundle dependency='true'>wrap:mvn:com.google.android/android/4.1.1.4</bundle>
-    <bundle dependency='true'>wrap:mvn:com.google.appengine/appengine-api-1.0-sdk/1.9.38</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${squareup-okhttp-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}</bundle>
-    <bundle dependency='true'>wrap:mvn:com.squareup.okhttp3/okhttp/3.5.0</bundle>
+    <!-- Should not be required -->
+    <bundle dependency='true'>mvn:org.jetbrains.kotlin/kotlin-osgi-bundle/1.6.21</bundle>
     <bundle>mvn:org.apache.camel/camel-dropbox/${project.version}</bundle>
   </feature>
   <feature name='camel-ehcache' version='${project.version}' start-level='50'>