[camel] branch main 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 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 722f16d  [CAMEL-15403] follow up: to work on Azul Zulu JDK8 as well
     new 77f53af  Merge branch 'main' of github.com:apache/camel into main
722f16d is described below

commit 722f16d098e29efd226393d771323e399212b46a
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
---
 .../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\"?>"