You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/06/08 09:15:51 UTC
[camel] branch main updated: camel-jira - Upgrade jira and add fiddle with pom due to poor maven pom.xml from Atlassian leading to harder to download artifacts.
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.git
The following commit(s) were added to refs/heads/main by this push:
new bf848547dcc camel-jira - Upgrade jira and add fiddle with pom due to poor maven pom.xml from Atlassian leading to harder to download artifacts.
bf848547dcc is described below
commit bf848547dcc059011171321559dccd3fed8efa56
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jun 8 11:15:37 2022 +0200
camel-jira - Upgrade jira and add fiddle with pom due to poor maven pom.xml from Atlassian leading to harder to download artifacts.
---
camel-dependencies/pom.xml | 4 ++--
components/camel-jira/pom.xml | 19 +++++++++++++++++++
.../oauth/OAuthAsynchronousHttpClientFactory.java | 17 +++++++++++++++++
parent/pom.xml | 4 ++--
4 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index f3a98af2c5b..4614ae1cdc1 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -231,7 +231,7 @@
<google-cloud-secretmanager-bom-version>2.1.1</google-cloud-secretmanager-bom-version>
<google-guava-version>20.0</google-guava-version>
<google-maps-services-version>0.10.1</google-maps-services-version>
- <google-oauth-client-version>1.33.3</google-oauth-client-version>
+ <google-oauth-client-version>1.34.0</google-oauth-client-version>
<graaljs-version>21.3.0</graaljs-version>
<graphql-java-version>14.0</graphql-java-version>
<grizzly-websockets-version>2.4.4</grizzly-websockets-version>
@@ -331,7 +331,7 @@
<jgroups-version>4.2.17.Final</jgroups-version>
<jib-version>0.21.0</jib-version>
<jira-guava-version>26.0-jre</jira-guava-version>
- <jira-rest-client-api-version>5.2.2</jira-rest-client-api-version>
+ <jira-rest-client-api-version>5.2.4</jira-rest-client-api-version>
<jnats-version>2.14.1</jnats-version>
<jodatime2-version>2.10.11</jodatime2-version>
<johnzon-version>1.2.17</johnzon-version>
diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml
index d43971270bf..3af367a4ad1 100644
--- a/components/camel-jira/pom.xml
+++ b/components/camel-jira/pom.xml
@@ -49,6 +49,10 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -58,11 +62,22 @@
</dependency>
<!-- atlassian jira dependencies -->
+ <dependency>
+ <groupId>com.atlassian.sal</groupId>
+ <artifactId>sal-api</artifactId>
+ <version>4.4.2</version>
+ <!-- force jar type -->
+ <type>jar</type>
+ </dependency>
<dependency>
<groupId>com.atlassian.jira</groupId>
<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>
@@ -78,6 +93,10 @@
<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>com.google.guava</groupId>
<artifactId>guava</artifactId>
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java
index 4df7f738ced..cda79cd300f 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java
@@ -19,7 +19,9 @@ package org.apache.camel.component.jira.oauth;
import java.io.File;
import java.io.InputStream;
import java.net.URI;
+import java.nio.file.Path;
import java.util.Date;
+import java.util.Optional;
import java.util.Properties;
import com.atlassian.event.api.EventPublisher;
@@ -148,10 +150,25 @@ public class OAuthAsynchronousHttpClientFactory {
return new File(".");
}
+ @Override
+ public Optional<Path> getLocalHomeDirectory() {
+ return Optional.empty();
+ }
+
+ @Override
+ public Optional<Path> getSharedHomeDirectory() {
+ return Optional.empty();
+ }
+
@Override
public String getPropertyValue(final String s) {
throw new UnsupportedOperationException("Not implemented");
}
+
+ @Override
+ public String getApplicationFileEncoding() {
+ return "UTF-8";
+ }
}
private static final class MavenUtils {
diff --git a/parent/pom.xml b/parent/pom.xml
index 36e85d01e05..35fa4d4ff2e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -206,7 +206,7 @@
<google-api-services-calendar-version>v3-rev20211229-1.32.1</google-api-services-calendar-version>
<google-api-services-sheets-version>v4-rev20210629-1.32.1</google-api-services-sheets-version>
<google-api-services-mail-version>v1-rev20211108-1.32.1</google-api-services-mail-version>
- <google-oauth-client-version>1.33.3</google-oauth-client-version>
+ <google-oauth-client-version>1.34.0</google-oauth-client-version>
<google-cloud-bom-version>25.2.0</google-cloud-bom-version>
<google-cloud-functions-bom-version>1.0.8</google-cloud-functions-bom-version>
<google-cloud-functions-gax-grpc-version>1.62.0</google-cloud-functions-gax-grpc-version>
@@ -316,7 +316,7 @@
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
<jib-version>0.21.0</jib-version>
<jira-guava-version>26.0-jre</jira-guava-version>
- <jira-rest-client-api-version>5.2.2</jira-rest-client-api-version>
+ <jira-rest-client-api-version>5.2.4</jira-rest-client-api-version>
<libthrift-version>0.14.1</libthrift-version>
<jodatime2-version>2.10.11</jodatime2-version>
<jota-version>1.0.0-beta9</jota-version>