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

apupier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 290915cd9e0d Upgrade Jira sal-api to 7.2.1
290915cd9e0d is described below

commit 290915cd9e0d3c85c7558c821310363959082603
Author: AurĂ©lien Pupier <[email protected]>
AuthorDate: Tue May 12 13:37:16 2026 +0200

    Upgrade Jira sal-api to 7.2.1
    
    the upgrade was blocked since this comment
    https://github.com/apache/camel/pull/12616#issuecomment-1870935904 which
    is following this revert from 5.1.4 to 5.2.0
    
https://github.com/apache/camel/commit/e26f1a92f684dfdcf85c0a0bfbcf845eadd7e00d
    
    Removed the exclusion as the sal-api is not (no more?) a transitive
    dependency of jira clients.
    
    not found a direct dependency in our codebase to sal-api, so wondering
    if we cannot remove it completely
    
    Signed-off-by: AurĂ©lien Pupier <[email protected]>
---
 components/camel-jira/pom.xml | 10 +---------
 parent/pom.xml                |  1 +
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml
index c8d5c2749c29..a79fe8687996 100644
--- a/components/camel-jira/pom.xml
+++ b/components/camel-jira/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.atlassian.sal</groupId>
             <artifactId>sal-api</artifactId>
-            <version>5.1.4</version>
+            <version>${jira-sal-api-version}</version>
             <!-- force jar type -->
             <type>jar</type>
         </dependency>
@@ -79,10 +79,6 @@
             <artifactId>jira-rest-java-client-api</artifactId>
             <version>${jira-rest-client-api-version}</version>
             <exclusions>
-                <exclusion>
-                    <groupId>com.atlassian.sal</groupId>
-                    <artifactId>sal-api</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>com.google.code.findbugs</groupId>
                     <artifactId>jsr305</artifactId>
@@ -94,10 +90,6 @@
             <artifactId>jira-rest-java-client-core</artifactId>
             <version>${jira-rest-client-api-version}</version>
             <exclusions>
-                <exclusion>
-                    <groupId>com.atlassian.sal</groupId>
-                    <artifactId>sal-api</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.codehaus.jettison</groupId>
                     <artifactId>jettison</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 3cc1d9705782..5bf144a663ed 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -296,6 +296,7 @@
         <jgroups-version>5.5.5.Final</jgroups-version>
         <jgroups-raft-version>1.1.4.Final</jgroups-raft-version>
         <jira-rest-client-api-version>6.0.2</jira-rest-client-api-version>
+        <jira-sal-api-version>7.2.1</jira-sal-api-version>
         <jline-version>4.1.0</jline-version>
         <libthrift-version>0.23.0</libthrift-version>
         <jodatime2-version>2.14.2</jodatime2-version>

Reply via email to