You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2023/08/02 13:10:12 UTC
[camel] branch CAMEL-19695/fix-CVE-2022-45688 updated (4ecdb5bc0e2 -> 79c4ca6e9a5)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch CAMEL-19695/fix-CVE-2022-45688
in repository https://gitbox.apache.org/repos/asf/camel.git
discard 4ecdb5bc0e2 CAMEL-19695: camel-google-bigquery - Upgrade org.json to resolve CVE-2022-45688
new 79c4ca6e9a5 CAMEL-19695: camel-google-bigquery - Bump org.json to 20230618
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (4ecdb5bc0e2)
\
N -- N -- N refs/heads/CAMEL-19695/fix-CVE-2022-45688 (79c4ca6e9a5)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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.
Summary of changes:
[camel] 01/01: CAMEL-19695: camel-google-bigquery - Bump org.json to 20230618
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch CAMEL-19695/fix-CVE-2022-45688
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 79c4ca6e9a5768752e2a7590cf045343021a7afe
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Wed Aug 2 15:07:59 2023 +0200
CAMEL-19695: camel-google-bigquery - Bump org.json to 20230618
---
camel-dependencies/pom.xml | 1 +
components/camel-google/camel-google-bigquery/pom.xml | 8 ++++++++
parent/pom.xml | 6 ++++++
3 files changed, 15 insertions(+)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index f530fee557c..a39c4ba02b0 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -348,6 +348,7 @@
<jslt-version>0.1.11</jslt-version>
<jsmpp-version>2.3.11</jsmpp-version>
<json-api>1.0</json-api>
+ <json-org-version>20230618</json-org-version>
<json-patch-version>1.13</json-patch-version>
<json-path-version>2.8.0</json-path-version>
<json-schema-validator-version>2.2.14</json-schema-validator-version>
diff --git a/components/camel-google/camel-google-bigquery/pom.xml b/components/camel-google/camel-google-bigquery/pom.xml
index f676dc48bb6..28584214028 100644
--- a/components/camel-google/camel-google-bigquery/pom.xml
+++ b/components/camel-google/camel-google-bigquery/pom.xml
@@ -76,8 +76,16 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 08e2c71ced1..5197a8380b3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -333,6 +333,7 @@
<jsmpp-version>2.3.11</jsmpp-version>
<jsch-version>0.2.1</jsch-version>
<json-api>1.0</json-api>
+ <json-org-version>20230618</json-org-version>
<jsonassert-version>1.5.1</jsonassert-version>
<json-path-version>2.8.0</json-path-version>
<json-patch-version>1.13</json-patch-version>
@@ -3211,6 +3212,11 @@
<artifactId>jaxp-ri</artifactId>
<version>1.4.5</version>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>${json-org-version}</version>
+ </dependency>
<!-- logging -->
<dependency>