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-karaf.git


The following commit(s) were added to refs/heads/main by this push:
     new 24290ef  More OSGi fixes
24290ef is described below

commit 24290ef563301d68a55309d31098e6858a077b42
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Jun 10 14:35:36 2021 +0200

    More OSGi fixes
---
 .../features/src/main/resources/bundles.properties |  1 -
 .../karaf/features/src/main/resources/features.xml | 40 ++--------------------
 pom.xml                                            |  7 ++--
 3 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/platforms/karaf/features/src/main/resources/bundles.properties 
b/platforms/karaf/features/src/main/resources/bundles.properties
index 3e98d70..5898381 100644
--- a/platforms/karaf/features/src/main/resources/bundles.properties
+++ b/platforms/karaf/features/src/main/resources/bundles.properties
@@ -42,7 +42,6 @@ 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemar
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.hamcrest/${hamcrest-bundle-version}/jar
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.hapi/${hapi-bundle-version}/jar
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.hystrix/${hystrix-bundle-version}/jar
-org.apache.servicemix.bundles/org.apache.servicemix.bundles.ibatis-sqlmap/${ibatis-bundle-version}/jar
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.irclib/${irclib-bundle-version}/jar
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}/jar
 
org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcr-api/${jcr-bundle-version}/jar
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 0b79dcb..c9e9246 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -889,42 +889,8 @@
     <bundle 
dependency='true'>wrap:mvn:io.krakens/java-grok/${java-grok-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-grok/${project.version}</bundle>
   </feature>
-  <feature name='camel-grpc' version='${project.version}' start-level='50'>
-    <feature version='${project.version}'>camel-core</feature>
-    <!-- gRPC netty dependencies -->
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.grpc/${grpc-bundle-version}</bundle>
-    <bundle 
dependency='true'>mvn:io.netty/netty-handler/${netty-version}</bundle>
-    <bundle 
dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle>
-    <bundle 
dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle>
-    <bundle 
dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
-    <bundle 
dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle>
-    <bundle 
dependency='true'>mvn:io.netty/netty-codec-http2/${netty-version}</bundle>
-    <bundle 
dependency='true'>mvn:io.netty/netty-codec-socks/${netty-version}</bundle>
-    <bundle 
dependency='true'>mvn:io.netty/netty-handler-proxy/${netty-version}</bundle>
-    <bundle 
dependency='true'>mvn:io.netty/netty-resolver/${netty-version}</bundle>
-    <bundle 
dependency='true'>mvn:io.netty/netty-transport/${netty-version}</bundle>
-    <bundle 
dependency='true'>mvn:io.netty/netty-tcnative-boringssl-static/${grpc-netty-tcnative-boringssl-static-version}</bundle>
-    <bundle 
dependency='true'>mvn:com.google.guava/guava/${grpc-guava-version}</bundle>
-    <bundle 
dependency='true'>wrap:mvn:com.google.errorprone/error_prone_annotations/${grpc-errorprone-version}</bundle>
-    <bundle dependency='true'>mvn:com.google.guava/failureaccess/1.0.1</bundle>
-    <!-- Third party dependencies -->
-    <bundle 
dependency='true'>mvn:org.javassist/javassist/${javassist-version}</bundle>
-    <bundle 
dependency='true'>wrap:mvn:io.perfmark/perfmark-api/${perfmark-version}</bundle>
-    <bundle 
dependency='true'>wrap:mvn:com.auth0/java-jwt/${grpc-java-jwt-version}</bundle>
-    <bundle 
dependency='true'>wrap:mvn:com.google.auth/google-auth-library-credentials/${grpc-google-auth-library-version}</bundle>
-    <bundle 
dependency='true'>wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${grpc-google-auth-library-version}</bundle>
-    <bundle 
dependency='true'>mvn:com.google.code.findbugs/jsr305/${google-findbugs-jsr305-version}</bundle>
-    <bundle 
dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
-    <bundle 
dependency='true'>mvn:com.google.protobuf.nano/protobuf-javanano/${protobuf-javanano-version}</bundle>
-    <bundle 
dependency='true'>mvn:com.google.protobuf/protobuf-java-util/${protobuf-version}</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:io.opencensus/opencensus-contrib-grpc-metrics/${opencensus-api-version}</bundle>
-    <bundle 
dependency='true'>wrap:mvn:io.opencensus/opencensus-api/${opencensus-api-version}</bundle>
-    <bundle 
dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
-    <bundle 
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit-bundle-version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-grpc/${project.version}</bundle>
-  </feature>
+
+
   <feature name='camel-gson' version='${project.version}' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle 
dependency='true'>mvn:com.google.code.gson/gson/${gson-version}</bundle>
@@ -1648,11 +1614,11 @@
   <feature name='camel-opentelemetry' version='${project.version}' 
start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <feature version='${project.version}'>camel-tracing</feature>
-    <feature version='${project.version}'>camel-grpc</feature>
     <bundle 
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-api/${opentelemetry-version}</bundle>
     <bundle 
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-sdk/${opentelemetry-version}</bundle>
     <bundle 
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-context/${opentelemetry-version}</bundle>
     <bundle 
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-semconv/${opentelemetry-alpha-version}</bundle>
+    <bundle 
dependency='true'>com.guicedee.services/jakarta.annotation-api/1.1.7</bundle>
     
<bundle>mvn:org.apache.camel/camel-opentelemetry/${project.version}</bundle>
   </feature>
   <feature name='camel-paho' version='${project.version}' start-level='50'>
diff --git a/pom.xml b/pom.xml
index 380e421..d86f77e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,15 +179,14 @@
         <google-findbugs-jsr305-version>3.0.2</google-findbugs-jsr305-version>
         
<google-findbugs-annotations2-version>2.0.3</google-findbugs-annotations2-version>
         <google-truth-version>0.30</google-truth-version>
-        <groovy-version>3.0.3</groovy-version>
-        <grpc-bundle-version>1.28.0_1</grpc-bundle-version>
+        <groovy-version>3.0.8</groovy-version>
+        <grpc-bundle-version>1.38.0_1</grpc-bundle-version>
         <grpc-errorprone-version>2.3.4</grpc-errorprone-version>
         <guice-bundle-version>3.0_1</guice-bundle-version>
         <hikaricp-version>2.4.13</hikaricp-version>
         <hk2-osgi-resource-version>1.0.1</hk2-osgi-resource-version>
         <htmlunit-bundle-version>2.24_1</htmlunit-bundle-version>
         <hystrix-bundle-version>1.5.18_1</hystrix-bundle-version>
-        <ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
         
<influx-java-driver-bundle-version>2.20_1</influx-java-driver-bundle-version>
         <irclib-bundle-version>1.10_5</irclib-bundle-version>
         <ironmq-bundle-version>3.0.5_1</ironmq-bundle-version>
@@ -245,7 +244,7 @@
         <pax-tiny-bundle-version>3.0.0</pax-tiny-bundle-version>
         <pax-logging-version>1.11.2</pax-logging-version>
         <perfmark-version>0.17.0</perfmark-version>
-        <protobuf-guava-version>28.2-jre</protobuf-guava-version>
+        <protobuf-guava-version>30.1.1-jre</protobuf-guava-version>
         <protobuf-javanano-version>3.1.0</protobuf-javanano-version>
         <reflections-bundle-version>0.9.12_1</reflections-bundle-version>
         <regexp-bundle-version>1.4_1</regexp-bundle-version>

Reply via email to