You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2021/09/22 15:12:07 UTC
[camel] branch camel-3.11.x updated: [CAMEL-15403] follow up: to
work on Azul Zulu JDK8 as well
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch camel-3.11.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.11.x by this push:
new ee783b9 [CAMEL-15403] follow up: to work on Azul Zulu JDK8 as well
ee783b9 is described below
commit ee783b955250658ea1fa296c7192a4c0baf88adb
Author: Freeman Fang <fr...@gmail.com>
AuthorDate: Wed Sep 22 11:08:39 2021 -0400
[CAMEL-15403] follow up: to work on Azul Zulu JDK8 as well
(cherry picked from commit 722f16d098e29efd226393d771323e399212b46a)
---
.../org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java | 2 +-
.../org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java | 2 +-
.../apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java | 3 ++-
.../camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java | 2 +-
.../java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java
index a90bca8..c332e94 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/ECDSASignatureTest.java
@@ -59,7 +59,7 @@ public class ECDSASignatureTest extends CamelTestSupport {
static {
boolean includeNewLine = true;
if (TestSupport.getJavaMajorVersion() >= 9
- || TestSupport.isJava18_261_later()) {
+ || TestSupport.isJava18_261_later() && !TestSupport.isJavaVendor("Azul")) {
includeNewLine = false;
}
payload = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
index bde2ec3..b6ff351 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureAlgorithmTest.java
@@ -89,7 +89,7 @@ public class SignatureAlgorithmTest extends CamelTestSupport {
static {
boolean includeNewLine = true;
if (TestSupport.getJavaMajorVersion() >= 9
- || TestSupport.isJava18_261_later()) {
+ || TestSupport.isJava18_261_later() && !TestSupport.isJavaVendor("Azul")) {
includeNewLine = false;
}
payload = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
index a2d738c..4c3703d 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/SignatureDigestMethodTest.java
@@ -87,7 +87,8 @@ public class SignatureDigestMethodTest extends CamelTestSupport {
static {
boolean includeNewLine = true;
- if (TestSupport.getJavaMajorVersion() >= 9 || TestSupport.isJava18_261_later()) {
+ if (TestSupport.getJavaMajorVersion() >= 9
+ || TestSupport.isJava18_261_later() && !TestSupport.isJavaVendor("Azul")) {
includeNewLine = false;
}
payload = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
index aaa8ef1..41f5504 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
@@ -87,7 +87,7 @@ public class XAdESSignaturePropertiesTest extends CamelTestSupport {
static {
boolean includeNewLine = true;
if (TestSupport.getJavaMajorVersion() >= 9
- || TestSupport.isJava18_261_later()) {
+ || TestSupport.isJava18_261_later() && !TestSupport.isJavaVendor("Azul")) {
includeNewLine = false;
}
payload = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
index 13272f1..6b2e143 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java
@@ -120,7 +120,7 @@ public class XmlSignatureTest extends CamelTestSupport {
static {
if (TestSupport.getJavaMajorVersion() >= 9
- || TestSupport.isJava18_261_later()) {
+ || TestSupport.isJava18_261_later() && !TestSupport.isJavaVendor("Azul")) {
includeNewLine = false;
}
payload = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"