Re: [PR] Add Bundle-Version to all wrapped bundles [camel-karaf]

via GitHub Mon, 27 May 2024 08:25:59 -0700


essobedo commented on code in PR #297:
URL: https://github.com/apache/camel-karaf/pull/297#discussion_r1616171568



##########
features/src/main/feature/camel-features.xml:
##########
@@ -540,28 +540,28 @@
     <feature name='camel-azure-servicebus' version='${project.version}' 
start-level='50'>
         <feature 
version='${camel.osgi.version.range}'>camel-cloudevents</feature>
         <feature version='[1.46,1.47)'>azure</feature>
-        <bundle 
dependency='true'>wrap:mvn:com.azure/azure-core-amqp/2.9.1</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.azure/azure-messaging-servicebus/7.15.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.azure/azure-core-amqp/2.9.1$Bundle-Version=2.9.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.azure/azure-messaging-servicebus/7.15.1$Bundle-Version=7.15.1</bundle>
         
<bundle>mvn:org.apache.camel.karaf/camel-azure-servicebus/${project.version}</bundle>
     </feature>
     <feature name='camel-azure-storage-blob' version='${project.version}' 
start-level='50'>
         <feature 
version='${camel.osgi.version.range}'>camel-cloudevents</feature>
         <feature version='[1.46,1.47)'>azure-storage</feature>
-        <bundle 
dependency='true'>wrap:mvn:com.azure/azure-storage-blob/12.25.2</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.azure/azure-storage-blob-changefeed/${azure-storage-blob-changefeed-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.azure/azure-storage-blob/12.25.2$Bundle-Version=12.25.2</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.azure/azure-storage-blob-changefeed/${azure-storage-blob-changefeed-version}$Bundle-Version=12.0.0.beta_19</bundle>

Review Comment:
   Why don't you use the maven property to set the version?



##########
features/src/main/feature/camel-features.xml:
##########
@@ -827,35 +827,35 @@
         <feature prerequisite='true'>wrap</feature>
         <feature version='[2.16,2.17)'>jackson</feature>
         <feature version="[4,5)">http-client</feature>
-        <bundle 
dependency='true'>wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1</bundle>
-        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1</bundle>
-        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}$Bundle-Version=${httpasyncclient-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1$Bundle-Version=8.12.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1$Bundle-Version=8.12.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1$Bundle-Version=8.12.1</bundle>

Review Comment:
   we are supposed to use `elasticsearch-java-client-sniffer-version`



##########
features/src/main/feature/camel-features.xml:
##########
@@ -1089,23 +1089,23 @@
         <bundle 
dependency='true'>mvn:com.google.api-client/google-api-client/${google-api-client-version}</bundle>
         <bundle 
dependency='true'>mvn:com.google.http-client/google-http-client-apache-v2/${google-cloud-http-client-version}</bundle>
         <bundle dependency='true'>mvn:org.threeten/threetenbp/1.6.8</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.google.api/api-common/2.28.0</bundle>
-        <bundle dependency='true'>wrap:mvn:com.google.api/gax/2.45.0</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.google.api/gax-httpjson/2.45.0</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.google.apis/google-api-services-storage/v1-rev20240209-2.0.0</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.google.auth/google-auth-library-credentials/${google-auth-library-oauth2-http-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.google.auth/google-auth-library-oauth2-http/${google-auth-library-oauth2-http-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.google.cloud/google-cloud-core/2.35.0</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.google.cloud/google-cloud-core-http/2.35.0</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.google.cloud/google-cloud-storage/2.35.0</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.google.http-client/google-http-client/${google-cloud-http-client-version}$overwrite=merge&amp;Import-Package=com.google.common*;version="[33,34)",*</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.google.http-client/google-http-client-appengine/${google-cloud-http-client-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.google.http-client/google-http-client-gson/${google-cloud-http-client-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-cloud-http-client-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client/${google-oauth-client-version}$overwrite=merge&amp;Import-Package=com.google.common*;version="[33,34)",*</bundle>
-        <bundle 
dependency='true'>wrap:mvn:io.grpc/grpc-api/${grpc-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:io.opencensus/opencensus-api/0.31.1</bundle>
-        <bundle 
dependency='true'>wrap:mvn:io.opencensus/opencensus-contrib-http-util/0.31.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.google.api/api-common/2.28.0$Bundle-Version=2.28.0</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.google.api/gax/2.45.0$Bundle-Version=2.45.0</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.google.api/gax-httpjson/2.45.0$Bundle-Version=2.45.0</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.google.apis/google-api-services-storage/v1-rev20240209-2.0.0$Bundle-Version=0.0.0.v1-rev20240209-2_0_0</bundle>

Review Comment:
   Is-this format supported?



##########
features/src/main/feature/camel-features.xml:
##########
@@ -756,10 +756,10 @@
     </feature>
     <feature name='camel-datasonnet' version='${project.version}' 
start-level='50'>
         <feature version='${camel.osgi.version.range}'>camel-core</feature>
-        <bundle 
dependency='true'>wrap:mvn:com.datasonnet/datasonnet-mapper/${datasonnet-mapper-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.datasonnet/datasonnet-mapper/${datasonnet-mapper-version}$Bundle-Version=2.5.2.jakarta4</bundle>

Review Comment:
   ditto. Is the version format compatible? If not let's avoid setting a version



##########
features/src/main/feature/camel-features.xml:
##########
@@ -827,35 +827,35 @@
         <feature prerequisite='true'>wrap</feature>
         <feature version='[2.16,2.17)'>jackson</feature>
         <feature version="[4,5)">http-client</feature>
-        <bundle 
dependency='true'>wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1</bundle>
-        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1</bundle>
-        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}$Bundle-Version=${httpasyncclient-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1$Bundle-Version=8.12.1</bundle>

Review Comment:
   We are supposed to use `elasticsearch-java-client-version`



##########
features/src/main/feature/camel-features.xml:
##########
@@ -827,35 +827,35 @@
         <feature prerequisite='true'>wrap</feature>
         <feature version='[2.16,2.17)'>jackson</feature>
         <feature version="[4,5)">http-client</feature>
-        <bundle 
dependency='true'>wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1</bundle>
-        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1</bundle>
-        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}$Bundle-Version=${httpasyncclient-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1$Bundle-Version=8.12.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1$Bundle-Version=8.12.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1$Bundle-Version=8.12.1</bundle>
         
<bundle>mvn:org.apache.camel.karaf/camel-elasticsearch/${project.version}</bundle>
     </feature>
     <feature name='camel-elasticsearch-rest-client' 
version='${project.version}' start-level='50'>
         <feature version='${camel.osgi.version.range}'>camel-core</feature>
         <feature prerequisite='true'>wrap</feature>
         <feature version='[2.16,2.17)'>jackson</feature>
         <feature version="[4,5)">http-client</feature>
-        <bundle 
dependency='true'>wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1</bundle>
-        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}$Bundle-Version=${httpasyncclient-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1$Bundle-Version=8.12.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1$Bundle-Version=8.12.1</bundle>

Review Comment:
   ditto



##########
features/src/main/feature/camel-features.xml:
##########
@@ -827,35 +827,35 @@
         <feature prerequisite='true'>wrap</feature>
         <feature version='[2.16,2.17)'>jackson</feature>
         <feature version="[4,5)">http-client</feature>
-        <bundle 
dependency='true'>wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1</bundle>
-        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1</bundle>
-        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client-sniffer/8.12.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:org.apache.httpcomponents/httpasyncclient/${httpasyncclient-version}$Bundle-Version=${httpasyncclient-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:co.elastic.clients/elasticsearch-java/8.12.1$Bundle-Version=8.12.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:org.elasticsearch.client/elasticsearch-rest-client/8.12.1$Bundle-Version=8.12.1</bundle>

Review Comment:
   ditto



##########
features/src/main/feature/camel-features.xml:
##########
@@ -1414,9 +1414,9 @@
     <feature name="camel-jq" version="${project.version}" start-level="50">
         <feature version='${camel.osgi.version.range}'>camel-core</feature>
         <feature version='[2.16,2.17)'>jackson</feature>
-        <bundle 
dependency='true'>wrap:mvn:net.thisptr/jackson-jq/${jackson-jq-version}$overwrite=merge&amp;Export-Package=net*;version=${jackson-jq-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:org.jruby.jcodings/jcodings/1.0.58</bundle>
-        <bundle dependency='true'>wrap:mvn:org.jruby.joni/joni/2.2.1</bundle>
+        <bundle 
dependency='true'>wrap:mvn:net.thisptr/jackson-jq/${jackson-jq-version}$overwrite=merge&amp;Bundle-Version=1.0.0.preview_20240207&amp;Export-Package=net*;version=${jackson-jq-version}</bundle>

Review Comment:
   same here, if you didn't use the maven property because of the format of the 
version, so let's not setting it



##########
features/src/main/feature/camel-features.xml:
##########
@@ -1822,30 +1822,30 @@
         <feature version='[2.16,2.17)'>jackson</feature>
         <feature version='[33,34)'>guava</feature>
         <!-- use wrap to override the guava version -->
-        <bundle 
dependency='true'>wrap:mvn:com.github.openstack4j.core/openstack4j-core/${openstack4j-version}$overwrite=merge&amp;Import-Package=com.fasterxml*,com.github*,javax*,org*,com.google*;version='[33,34)'</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.github.openstack4j.core.connectors/openstack4j-okhttp/${openstack4j-version}$overwrite=merge&amp;Import-Package=com.fasterxml*,okhttp3*,javax*,org*;resolution:=optional,com.google*;version='[33,34)'</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.github.java-json-tools/json-patch/${json-patch-version}$overwrite=merge&amp;Export-Package=com.github.fge*;version=${json-patch-version}&amp;Import-Package=com.fasterxml*,com.github*;javax*</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.github.java-json-tools/jackson-coreutils/2.0$overwrite=merge&amp;Export-Package=com.github.fge*;version=2.0&amp;Import-Package=com.fasterxml*,com.github*;javax*</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.github.openstack4j.core/openstack4j-core/${openstack4j-version}$overwrite=merge&amp;Bundle-Version=${openstack4j-version}&amp;Import-Package=com.fasterxml*,com.github*,javax*,org*,com.google*;version='[33,34)'</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.github.openstack4j.core.connectors/openstack4j-okhttp/${openstack4j-version}$overwrite=merge&amp;Bundle-Version=${openstack4j-version}&amp;Import-Package=com.fasterxml*,okhttp3*,javax*,org*;resolution:=optional,com.google*;version='[33,34)'</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.github.java-json-tools/json-patch/${json-patch-version}$overwrite=merge&amp;Bundle-Version=${json-patch-version}&amp;Export-Package=com.github.fge*;version=${json-patch-version}&amp;Import-Package=com.fasterxml*,com.github*;javax*</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.github.java-json-tools/jackson-coreutils/2.0$overwrite=merge&amp;Bundle-Version=2.0&amp;Export-Package=com.github.fge*;version=2.0&amp;Import-Package=com.fasterxml*,com.github*;javax*</bundle>
         <bundle 
dependency='true'>mvn:com.github.java-json-tools/msg-simple/1.2</bundle>
         <bundle 
dependency='true'>mvn:com.github.java-json-tools/btf/1.3</bundle>
         <bundle 
dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.squareup.okhttp3/okhttp/${squareup-okhttp-version}</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.squareup.okhttp3/logging-interceptor/${squareup-okhttp-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.squareup.okhttp3/okhttp/${squareup-okhttp-version}$Bundle-Version=${squareup-okhttp-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.squareup.okhttp3/logging-interceptor/${squareup-okhttp-version}$Bundle-Version=${squareup-okhttp-version}</bundle>
         
<bundle>mvn:org.apache.camel.karaf/camel-openstack/${project.version}</bundle>
     </feature>
     <feature name='camel-opentelemetry' version='${project.version}' 
start-level='50'>
         <feature version='${camel.osgi.version.range}'>camel-core</feature>
         <feature version='${camel.osgi.version.range}'>camel-tracing</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'>wrap:mvn:io.opentelemetry/opentelemetry-api/${opentelemetry-version}$Bundle-Version=${opentelemetry-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-sdk/${opentelemetry-version}$Bundle-Version=${opentelemetry-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-context/${opentelemetry-version}$Bundle-Version=${opentelemetry-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:io.opentelemetry/opentelemetry-semconv/${opentelemetry-alpha-version}$Bundle-Version=1.23.1.alpha</bundle>

Review Comment:
   ditto



##########
features/src/main/feature/camel-features.xml:
##########
@@ -2539,13 +2539,13 @@
         <bundle dependency='true'>mvn:org.jxmpp/jxmpp-jid/0.6.4</bundle>
         <bundle dependency='true'>mvn:org.jxmpp/jxmpp-core/0.6.4</bundle>
         <bundle dependency='true'>mvn:org.jxmpp/jxmpp-util-cache/0.6.4</bundle>
-        <bundle 
dependency='true'>wrap:mvn:org.minidns/minidns-core/${minidns-version}</bundle>
-        <bundle dependency='true'>wrap:mvn:xpp3/xpp3/${xpp3-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:org.minidns/minidns-core/${minidns-version}$Bundle-Version=${minidns-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:xpp3/xpp3/${xpp3-version}$Bundle-Version=1.1.0.4c</bundle>

Review Comment:
   use the maven property to set the version



##########
features/src/main/feature/camel-features.xml:
##########
@@ -2332,8 +2332,8 @@
     </feature>
     <feature name='camel-swift' version='${project.version}' start-level='50'>
         <feature version='${camel.osgi.version.range}'>camel-core</feature>
-        <bundle 
dependency='true'>wrap:mvn:com.prowidesoftware/pw-swift-core/SRU2023-10.1.13</bundle>
-        <bundle 
dependency='true'>wrap:mvn:com.prowidesoftware/pw-iso20022/${prowide-version}</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.prowidesoftware/pw-swift-core/SRU2023-10.1.13$Bundle-Version=0.0.0.SRU2023-10_1_13</bundle>
+        <bundle 
dependency='true'>wrap:mvn:com.prowidesoftware/pw-iso20022/${prowide-version}$Bundle-Version=0.0.0.SRU2023-10_1_4</bundle>

Review Comment:
   Use the maven property to set the version



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

Re: [PR] Add Bundle-Version to all wrapped bundles [camel-karaf]

Reply via email to