[camel] branch camel-3.7.x updated: [CAMEL-15403] follow up: to work on Azul Zulu JDK8 as well

[ffang]

This is an automated email from the ASF dual-hosted git repository.

ffang pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-3.7.x by this push:
     new 06765cf  [CAMEL-15403] follow up: to work on Azul Zulu JDK8 as well
06765cf is described below

commit 06765cf99e34397f0a2a5fa5f7d9af840601941b
Author: Freeman Fang <freeman.f...@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)
    (cherry picked from commit ee783b955250658ea1fa296c7192a4c0baf88adb)
---
 .../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 a0dd936..9f9e9e6 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 83c9e39..796186e 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 94e11dc..9aad2a2 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 1463034..51d4ce1 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 4da6947..a1e28fd 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\"?>"