You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2022/08/22 16:23:17 UTC

[servicemix-bundles] branch master updated: [SM-5256] Improve flexibility of google-http-client 1.41.8

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

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicemix-bundles.git


The following commit(s) were added to refs/heads/master by this push:
     new 171fcfa1a [SM-5256] Improve flexibility of google-http-client 1.41.8
     new bea41488f This closes #181
171fcfa1a is described below

commit 171fcfa1a0cc242b9e4c3610248c913819cc21d4
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Fri Aug 12 14:43:58 2022 +0200

    [SM-5256] Improve flexibility of google-http-client 1.41.8
---
 google-http-client-1.41.8/pom.xml | 17 +++++++++++------
 pom.xml                           |  1 +
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/google-http-client-1.41.8/pom.xml b/google-http-client-1.41.8/pom.xml
index 95142ffc4..5fccd57ec 100644
--- a/google-http-client-1.41.8/pom.xml
+++ b/google-http-client-1.41.8/pom.xml
@@ -41,19 +41,24 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/servicemix-bundles.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=servicemix-bundles.git</url>
-    <tag>HEAD</tag>
   </scm>
 
     <properties>
-	<servicemix.osgi.source.version>1.41.8.1</servicemix.osgi.source.version>
+	<servicemix.osgi.source.version>1.41.8.2</servicemix.osgi.source.version>
         <servicemix.osgi.export>
-		com.google.api.client.auth.oauth*;version="1.34.0",
-		com.google.api.client.http*;version="1.41.8",
-		com.google.api.client.json*;version="1.41.8",
-		com.google.api.client.util*;version="1.41.8"
+	    com.google.api.client.auth.oauth*;version="1.34.0",
+	    com.google.api.client.http*;version="1.41.8",
+	    com.google.api.client.json*;version="1.41.8",
+	    com.google.api.client.util*;version="1.41.8"
         </servicemix.osgi.export>
         <servicemix.osgi.import.pkg>
+	    !javax.annotation*,
+            com.google.common*;version="30.1",
+            *
         </servicemix.osgi.import.pkg>
+        <servicemix.osgi.private.pkg>
+            javax.annotation*
+        </servicemix.osgi.private.pkg>
     </properties>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 286f054ef..c8d6d0653 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,7 @@
        <module>google-gax-grpc-2.18.1</module>
        <module>google-cloud-pubsub-1.119.0</module>
        <module>okhttp-3.14.9</module>
+       <module>google-http-client-1.41.8</module>
     </modules>
 
 </project>