You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2021/10/02 16:01:25 UTC

[cxf] branch 3.3.x-fixes updated (806bb39 -> 75db2ce)

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

reta pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from 806bb39  Fixing PMD warning
     new 008f364  Update Jetty to 9.4.44.v20210927 (#859)
     new 75db2ce  Recording .gitmergeinfo Changes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo                                                          | 3 +++
 parent/pom.xml                                                         | 2 +-
 .../org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml         | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

[cxf] 01/02: Update Jetty to 9.4.44.v20210927 (#859)

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 008f36477cb92147d6c43c7ef5c0d4e3472a3946
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Oct 2 09:10:09 2021 -0400

    Update Jetty to 9.4.44.v20210927 (#859)
    
    (cherry picked from commit a2fc449969afa082065b1be644a3af890abcc1db)
    (cherry picked from commit 54a009938cfdfac65a04c849cf2268d8be9899b7)
---
 parent/pom.xml                                                          | 2 +-
 .../org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml          | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 3337341..8112650 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -146,7 +146,7 @@
         <cxf.jdom.version>1.0</cxf.jdom.version>
         <cxf.jettison.version>1.4.1</cxf.jettison.version>
         <cxf.jetty.osgi.version>[9.2,10)</cxf.jetty.osgi.version>
-        <cxf.jetty9.version>9.4.43.v20210629</cxf.jetty9.version>
+        <cxf.jetty9.version>9.4.44.v20210927</cxf.jetty9.version>
         <cxf.jetty.version>${cxf.jetty9.version}</cxf.jetty.version>
         <cxf.jexl.version>2.1.1</cxf.jexl.version>
         <cxf.joda.time.version>2.10.10</cxf.joda.time.version>
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml
index 69e5b52..3e83a07 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jettyBasicAuthServer.xml
@@ -26,6 +26,7 @@
         <httpj:engine port="${testutil.ports.JettyBasicAuthServer}">
             <httpj:handlers>
                 <bean class="org.eclipse.jetty.security.ConstraintSecurityHandler">
+                    <property name="authMethod" value="BASIC"/>
                     <property name="loginService" ref="securityLoginService"/>
                     <property name="constraintMappings">
                         <list>

[cxf] 02/02: Recording .gitmergeinfo Changes

Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 75db2ce7a7614a9d1dfba69a1997a44b6b8b5838
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Oct 2 10:58:23 2021 -0400

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 59b8f87..d18cb13 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -42,6 +42,7 @@ B 108fdf84a8e3cc5374f053214ad86f17fcb42998
 B 10ef461c261a9242025b1369556f5368711435d7
 B 119b68779316174145b168fc538f1747e06a51ee
 B 11de1e0dfff9a8f9b157e23983c8e25f8503f868
+B 1220bc9ed1a7b93ded065b0b8f19b704d7d06e1a
 B 1257d85f9e296ceffbbf1558f6682b5282afab95
 B 1279837f4879cb5446ae402cec432010455151fa
 B 127c8a800b8912fe69a35e4ac5bbcb952693ea4a
@@ -799,6 +800,7 @@ M 28a7e6259935df43394c4caa1d1afa230e42f553
 M 29482be8df227ddbcac01e957c84e4807211865d
 M 299d6a844b99a69555355b2f9baca3e6ec13a918
 M 29f9d03b69ee071d3b83e4f0509a6b6e01b96564
+M 29fa1f31d11f347b21d5744213bba1ea595c225b
 M 2a5629fc31676b9397233fa4819d7810bd2482ae
 M 2b396d836a8edc80c7c98067d6efbf8d1206e548
 M 2c7b64383d81db5e7bd14abc90fbbbf0597044af
@@ -853,6 +855,7 @@ M 507719b5f70a2fba0a83b2f260fd588ffe546200
 M 523d6cc11b0e0d50d9b889bed09091d15c2e070a
 M 528b35178ec31860cf5ad2095d6f3cc3c951d914
 M 535f75e575f151634316fb0bb19c28faee2b257c
+M 54a009938cfdfac65a04c849cf2268d8be9899b7
 M 55abc6f8416fd81f26627fa42a37f903f9ef7965
 M 56e962c295f48e9f48dbd0884df79e5e48601284
 M 589e321622b72ae57fab910d76b3e4fb0c160979