cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buhhu...@apache.org
Subject [cxf-fediz] branch master updated: Update Jetty
Date Mon, 16 Sep 2019 12:28:04 GMT
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git


The following commit(s) were added to refs/heads/master by this push:
     new 4f453d0  Update Jetty
4f453d0 is described below

commit 4f453d038b4ddf8944715e868081a9f4dc5b8403
Author: Alexey Markevich <buhhunyx@gmail.com>
AuthorDate: Mon Sep 16 14:25:41 2019 +0300

    Update Jetty
---
 pom.xml                                                         | 2 +-
 systests/jetty9/src/test/resources/fediz_config.xml             | 9 +++------
 systests/jetty9/src/test/resources/fediz_config_client_cert.xml | 5 ++---
 systests/jetty9/src/test/resources/rp-client-cert-server.xml    | 5 +++--
 systests/jetty9/src/test/resources/rp-server.xml                | 4 ++--
 5 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8af08c1..a7776d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
         <javax.el.version>3.0.0</javax.el.version>
         <javax.validation.version>2.0.1.Final</javax.validation.version>
         <jaxb.version>2.3.2</jaxb.version>
-        <jetty9.version>9.4.14.v20181114</jetty9.version>
+        <jetty9.version>9.4.20.v20190813</jetty9.version>
         <junit.version>4.12</junit.version>
         <kerby.version>1.1.1</kerby.version>
         <log4j.version>1.2.17</log4j.version>
diff --git a/systests/jetty9/src/test/resources/fediz_config.xml b/systests/jetty9/src/test/resources/fediz_config.xml
index 415881c..32cfa93 100644
--- a/systests/jetty9/src/test/resources/fediz_config.xml
+++ b/systests/jetty9/src/test/resources/fediz_config.xml
@@ -28,8 +28,7 @@
         </audienceUris>
         <certificateStores>
             <trustManager>
-                <keyStore file="clienttrust.jks" password="storepass"
-                          type="JKS" />
+                <keyStore file="clienttrust.jks" password="storepass" type="JKS" />
             </trustManager>
         </certificateStores>
         <trustedIssuers>
@@ -63,8 +62,7 @@
         </audienceUris>
         <certificateStores>
             <trustManager>
-                <keyStore file="clienttrust.jks" password="storepass"
-                          type="JKS" />
+                <keyStore file="clienttrust.jks" password="storepass" type="JKS" />
             </trustManager>
         </certificateStores>
         <trustedIssuers>
@@ -97,8 +95,7 @@
         </audienceUris>
         <certificateStores>
             <trustManager>
-                <keyStore file="clienttrust.jks" password="storepass"
-                          type="JKS" />
+                <keyStore file="clienttrust.jks" password="storepass" type="JKS" />
             </trustManager>
         </certificateStores>
         <trustedIssuers>
diff --git a/systests/jetty9/src/test/resources/fediz_config_client_cert.xml b/systests/jetty9/src/test/resources/fediz_config_client_cert.xml
index 6b62e33..1e5f019 100644
--- a/systests/jetty9/src/test/resources/fediz_config_client_cert.xml
+++ b/systests/jetty9/src/test/resources/fediz_config_client_cert.xml
@@ -36,7 +36,7 @@
         </trustedIssuers>
         <maximumClockSkew>1000</maximumClockSkew>
         <signingKey keyAlias="mytomidpkey" keyPassword="tompass">
-            <keyStore file="test-classes/server.jks" password="tompass" type="JKS" />
+            <keyStore file="server.jks" password="tompass" type="JKS" />
         </signingKey>
         <protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:type="federationProtocolType" version="1.0.0">
@@ -72,7 +72,7 @@
         </trustedIssuers>
         <maximumClockSkew>1000</maximumClockSkew>
         <signingKey keyAlias="mytomidpkey" keyPassword="tompass">
-            <keyStore file="test-classes/server.jks" password="tompass" type="JKS" />
+            <keyStore file="server.jks" password="tompass" type="JKS" />
         </signingKey>
         <protocol xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:type="federationProtocolType" version="1.0.0">
@@ -94,6 +94,5 @@
         <logoutURL>/secure/logout</logoutURL>
         <logoutRedirectTo>/index.html</logoutRedirectTo>
     </contextConfig>
-    
 </FedizConfig>
 
diff --git a/systests/jetty9/src/test/resources/rp-client-cert-server.xml b/systests/jetty9/src/test/resources/rp-client-cert-server.xml
index e75ca65..9a83bf1 100644
--- a/systests/jetty9/src/test/resources/rp-client-cert-server.xml
+++ b/systests/jetty9/src/test/resources/rp-client-cert-server.xml
@@ -33,6 +33,7 @@
       <Set name="KeyManagerPassword">tompass</Set>
       <Set name="TrustStorePath">./target/test-classes/server.jks</Set>
       <Set name="TrustStorePassword">tompass</Set>
+      <Set name="EndpointIdentificationAlgorithm"></Set>
       <Set name="WantClientAuth">true</Set>
     </New>
    
@@ -76,7 +77,7 @@
          </New>
       </Arg>
     </Call>
-    
+
     <Set name="handler">
       <New class="org.eclipse.jetty.server.handler.HandlerList">
         <Set name="handlers">
@@ -111,7 +112,7 @@
                   </Set>
                 </Get>
               </New>
-            </Item>		
+            </Item>
           </Array>
         </Set>
       </New>
diff --git a/systests/jetty9/src/test/resources/rp-server.xml b/systests/jetty9/src/test/resources/rp-server.xml
index b41f40c..15431b3 100644
--- a/systests/jetty9/src/test/resources/rp-server.xml
+++ b/systests/jetty9/src/test/resources/rp-server.xml
@@ -72,7 +72,7 @@
            <Set name="idleTimeout">30000</Set>
          </New>
       </Arg>
-   </Call>
+    </Call>
 
     <Set name="handler">
       <New class="org.eclipse.jetty.server.handler.HandlerList">
@@ -108,7 +108,7 @@
                   </Set>
                 </Get>
               </New>
-            </Item>		    
+            </Item>
           </Array>
         </Set>
       </New>


Mime
View raw message