You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2023/11/02 10:36:21 UTC
(camel) branch box created (now 278c5615e43)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch box
in repository https://gitbox.apache.org/repos/asf/camel.git
at 278c5615e43 Camel-Box: Upgrade to Jose4j to version 0.9.3 and exclusion version 0.9.0
This branch includes the following new commits:
new 60471a0ad8f Upgrade Azurite container image to version 3.27.0
new 278c5615e43 Camel-Box: Upgrade to Jose4j to version 0.9.3 and exclusion version 0.9.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(camel) 02/02: Camel-Box: Upgrade to Jose4j to version 0.9.3 and exclusion version 0.9.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch box
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 278c5615e43c52adbf882f348d1dd7ebc4c23154
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 2 11:33:28 2023 +0100
Camel-Box: Upgrade to Jose4j to version 0.9.3 and exclusion version 0.9.0
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
components/camel-box/camel-box-api/pom.xml | 12 ++++++++++++
components/camel-box/camel-box-component/pom.xml | 12 ++++++++++++
parent/pom.xml | 3 ++-
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/components/camel-box/camel-box-api/pom.xml b/components/camel-box/camel-box-api/pom.xml
index 85e48dba735..d4b39e51196 100644
--- a/components/camel-box/camel-box-api/pom.xml
+++ b/components/camel-box/camel-box-api/pom.xml
@@ -43,6 +43,18 @@
<groupId>com.box</groupId>
<artifactId>box-java-sdk</artifactId>
<version>${box-java-sdk-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.box</groupId>
+ <artifactId>box-java-sdk</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.bitbucket.b_c</groupId>
+ <artifactId>jose4j</artifactId>
+ <version>${jose4j-version}</version>
</dependency>
<dependency>
diff --git a/components/camel-box/camel-box-component/pom.xml b/components/camel-box/camel-box-component/pom.xml
index ca8fc264929..41631533cf5 100644
--- a/components/camel-box/camel-box-component/pom.xml
+++ b/components/camel-box/camel-box-component/pom.xml
@@ -57,6 +57,18 @@
<groupId>com.box</groupId>
<artifactId>box-java-sdk</artifactId>
<version>${box-java-sdk-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.box</groupId>
+ <artifactId>box-java-sdk</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.bitbucket.b_c</groupId>
+ <artifactId>jose4j</artifactId>
+ <version>${jose4j-version}</version>
</dependency>
<dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index abf89a36c15..43abcfe59e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -272,7 +272,8 @@
<jolt-version>0.1.8</jolt-version>
<jool-version>0.9.15</jool-version>
<jooq-version>3.18.7</jooq-version>
- <joor-version>0.9.14</joor-version>
+ <joor-version>0.9.14</joor-version>
+ <jose4j-version>0.9.3</jose4j-version>
<johnzon-version>1.2.21</johnzon-version>
<jslt-version>0.1.14</jslt-version>
<jsmpp-version>3.0.0</jsmpp-version>
(camel) 01/02: Upgrade Azurite container image to version 3.27.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch box
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 60471a0ad8f1dfa1487788dff954d78e47cf7093
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Nov 2 10:54:03 2023 +0100
Upgrade Azurite container image to version 3.27.0
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../apache/camel/test/infra/azure/common/services/AzuriteContainer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
index 0243d763e0b..0a100fecc6b 100644
--- a/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
+++ b/test-infra/camel-test-infra-azure-common/src/test/java/org/apache/camel/test/infra/azure/common/services/AzuriteContainer.java
@@ -26,7 +26,7 @@ public class AzuriteContainer extends GenericContainer<AzuriteContainer> {
public static final String DEFAULT_ACCOUNT_KEY
= "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==";
- public static final String IMAGE_NAME = "mcr.microsoft.com/azure-storage/azurite:3.26.0";
+ public static final String IMAGE_NAME = "mcr.microsoft.com/azure-storage/azurite:3.27.0";
public AzuriteContainer() {
this(IMAGE_NAME);