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/06/28 16:07:08 UTC

[servicemix-bundles] 01/03: [SM-5186] Improve atlassian-jira-client 5.2.4 bundle wiring

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

commit 8c7a7d528f6208c7ebe7e5255f677367cc98f2a2
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Tue Jun 28 18:04:00 2022 +0200

    [SM-5186] Improve atlassian-jira-client 5.2.4 bundle wiring
---
 atlassian-jira-client-5.2.4/pom.xml | 33 ++++++++++++++++++++++++++++-----
 pom.xml                             |  1 +
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/atlassian-jira-client-5.2.4/pom.xml b/atlassian-jira-client-5.2.4/pom.xml
index 728ac3ee6..1f8130020 100644
--- a/atlassian-jira-client-5.2.4/pom.xml
+++ b/atlassian-jira-client-5.2.4/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>14</version>
+        <version>15</version>
         <relativePath>../bundles-pom/pom.xml</relativePath>
     </parent>
 
@@ -61,11 +61,12 @@
     <properties>
         <pkgGroupId>com.atlassian.jira</pkgGroupId>
         <pkgVersion>5.2.4</pkgVersion>
+	<pkgSourceVersion>5.2.4.1</pkgSourceVersion>
         <servicemix.osgi.export>
             com.atlassian.jira.rest.client*;version=${pkgVersion},
             com.atlassian.httpclient*;version=${pkgVersion},
             com.atlassian.event*;version=${pkgVersion},
-            com.atlassian.sal*;version=3.0.7,
+            com.atlassian.sal*;version=4.4.2,
             io.atlassian.fugue*;version=3.0.0,
             io.atlassian.util*,
             com.atlassian.fugue*;version=3.0.0
@@ -81,14 +82,29 @@
             !io.atlassian.fugue*,
             !com.atlassian.fugue*,
             !io.atlassian.util*,
-            com.google.common*;version="[20,30)",
-            org.springframework*;resolition:=optional,
+            !com.google.common*,
+	    !com.google.appengine*,
+	    !com.google.apphosting*,
+	    !com.google.errorprone*,
+	    !com.google.thirdparty*,
+	    !javax.annotation*,
+	    !org.checkerframework*,
+	    javax.servlet*;resolution:=optional,
+            org.springframework*;resolution:=optional,
+	    net.jcip*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
            com.atlassian.analytics*,
            com.atlassian.inject*,
-           com.atlassian.plugin*
+	   com.atlassian.plugin*,
+	   com.google.common*,
+	   com.google.appengine*,
+	   com.google.apphosting*,
+	   com.google.errorprone*,
+	   com.google.thirdparty*,
+		javax.annotation*,
+		org.checkerframework*
         </servicemix.osgi.private.pkg>
     </properties>
 
@@ -105,6 +121,13 @@
             <version>${pkgVersion}</version>
             <optional>false</optional>
         </dependency>
+	<dependency>
+            <groupId>com.atlassian.sal</groupId>
+            <artifactId>sal-api</artifactId>
+            <version>4.4.2</version>
+	    <type>jar</type>
+            <optional>false</optional>
+	</dependency>
         <dependency>
             <groupId>io.atlassian.fugue</groupId>
             <artifactId>fugue</artifactId>
diff --git a/pom.xml b/pom.xml
index 827baf22a..1010726d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
     <name>Apache ServiceMix :: Bundles</name>
 
     <modules>
+      <module>atlassian-jira-client-5.2.4</module>
     </modules>
 
 </project>