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 2beae075678 Upgrade protobuf 4.27.1 (#14496)
2beae075678 is described below
commit 2beae0756783683e16798c0dec42ad637bae4811
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Jun 13 10:45:50 2024 +0200
Upgrade protobuf 4.27.1 (#14496)
---
components/camel-protobuf/pom.xml | 8 ++++----
parent/pom.xml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/components/camel-protobuf/pom.xml
b/components/camel-protobuf/pom.xml
index 5ae40ace129..8169d029ae6 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -74,9 +74,9 @@
If the platform doesn't support, the protobuf test code
generation, their
assembly and launch will be skipped
Supported platforms are:
- - Linux (x86 32 and 64-bit)
- - Windows (x86 32 and 64-bit)
- - OSX (x86 32 and 64-bit)
+ - Linux: x86_32, x86_64, aarch_64, ppcle_64 & s390_64
+ - Windows: x86_32 & x86_64
+ - OSX: x86_64 & aarch_64
-->
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
@@ -91,7 +91,7 @@
<configuration>
<scripts>
<script><![CDATA[
-
project.properties['skipTests']=project.properties['os.detected.classifier'].matches('^.*?(linux|windows|osx)-x86.*$')
? 'false' : 'true';
+
project.properties['skipTests']=project.properties['os.detected.classifier'].matches('^(linux-(x86_(32|64)|aarch_64|ppcle_64|s390_64)|windows-x86_(32|64)|osx-(x86_64|aarch_64))$')
? 'false' : 'true';
]]></script>
</scripts>
</configuration>
diff --git a/parent/pom.xml b/parent/pom.xml
index 2528777facb..111d225c3f5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -403,7 +403,7 @@
<pooled-jms-version>3.1.6</pooled-jms-version>
<properties-maven-plugin-version>1.2.1</properties-maven-plugin-version>
<proto-google-common-protos-version>2.22.0</proto-google-common-protos-version>
- <protobuf-version>3.25.3</protobuf-version>
+ <protobuf-version>4.27.1</protobuf-version>
<protobuf-maven-plugin-version>0.6.1</protobuf-maven-plugin-version>
<protonpack-version>1.8</protonpack-version>
<protostream-version>5.0.5.Final</protostream-version>
