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 2025/12/17 02:40:20 UTC

(cxf) branch 4.0.x-fixes updated (ed0e868894 -> ce008a4bd3)

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

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


    from ed0e868894 Recording .gitmergeinfo Changes
     new 984e67c6b6 Adapt AXRS20ClientServerBookTest::testGetGenericBookManyClientsInParallel to JDK-27 HttpClient changes (that use virtual threads for selectors by default) (#2783)
     new 920618b503 Bump actions/setup-java from 5.0.0 to 5.1.0 (#2784)
     new 3195ecd125 Bump org.apache.maven.plugins:maven-release-plugin from 3.3.0 to 3.3.1 (#2785)
     new 3926cca0c4 Fix JAXRSJweJwsTest::testJweRsaJwsRsaEncryptThenSign test case (#2782)
     new 97f89a9e5e Update Netty to 4.1.130.Final
     new ce008a4bd3 Recording .gitmergeinfo Changes

The 6 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:
 .github/workflows/codeql-analysis.yml              |   2 +-
 .github/workflows/pull-request-build.yml           |   2 +-
 .gitmergeinfo                                      |   4 ++++
 distribution/src/main/release/samples/pom.xml      |   2 +-
 parent/pom.xml                                     |   2 +-
 pom.xml                                            |   2 +-
 .../systest/jaxrs/JAXRS20ClientServerBookTest.java |  21 +++++++++++++++++----
 .../security/jose/jwejws/JAXRSJweJwsTest.java      |   9 ++++++---
 .../src/test/resources/keys/alice-jwejws.jks       | Bin 0 -> 4125 bytes
 .../src/test/resources/keys/bob-jwejws.jks         | Bin 0 -> 4122 bytes
 ...ce.rs.properties => alice-jwejws.rs.properties} |   2 +-
 ...{bob.rs.properties => bob-jwejws.rs.properties} |   2 +-
 .../systest/jaxrs/security/jose/jwejws/server.xml  |   4 ++--
 13 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 systests/rs-security/src/test/resources/keys/alice-jwejws.jks
 create mode 100644 systests/rs-security/src/test/resources/keys/bob-jwejws.jks
 copy systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/{alice.rs.properties => alice-jwejws.rs.properties} (95%)
 copy systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/{bob.rs.properties => bob-jwejws.rs.properties} (95%)


(cxf) 05/06: Update Netty to 4.1.130.Final

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

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

commit 97f89a9e5e32867fa7ff64a6644df4734d0e1274
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Dec 16 07:15:18 2025 -0500

    Update Netty to 4.1.130.Final
    
    (cherry picked from commit 9b2fb74a6fa85ee8bedc0bb7049e753a0484584e)
    
    # Conflicts:
    #       distribution/src/main/release/samples/pom.xml
---
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 27a17ccba4..a702976c1b 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -34,7 +34,7 @@
         <cxf.spring.boot.version>3.0.13</cxf.spring.boot.version>
         <cxf.spring.cloud.eureka.version>4.0.4</cxf.spring.cloud.eureka.version>
         <cxf.jetty11.version>11.0.26</cxf.jetty11.version>
-        <cxf.netty.version>4.1.128.Final</cxf.netty.version>
+        <cxf.netty.version>4.1.130.Final</cxf.netty.version>
         <cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
         <cxf.swagger.ui.version>5.30.3</cxf.swagger.ui.version>
         <cxf.tika.version>2.9.1</cxf.tika.version>
diff --git a/parent/pom.xml b/parent/pom.xml
index a4200000fe..afade54d8a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -187,7 +187,7 @@
         <cxf.msv.version>2022.7</cxf.msv.version>
         <cxf.neethi.version>3.2.1</cxf.neethi.version>
         <cxf.netty.version.range>[4,5)</cxf.netty.version.range>
-        <cxf.netty.version>4.1.128.Final</cxf.netty.version>
+        <cxf.netty.version>4.1.130.Final</cxf.netty.version>
         <cxf.netty.tcnative.version>2.0.69.Final</cxf.netty.tcnative.version>
         <cxf.olingo.version>2.0.13</cxf.olingo.version>
         <cxf.openjpa.version>3.2.2</cxf.openjpa.version>


(cxf) 03/06: Bump org.apache.maven.plugins:maven-release-plugin from 3.3.0 to 3.3.1 (#2785)

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

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

commit 3195ecd125cd26c119decd390ef6dee7144dcfb0
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Dec 15 11:08:20 2025 -0500

    Bump org.apache.maven.plugins:maven-release-plugin from 3.3.0 to 3.3.1 (#2785)
    
    Bumps [org.apache.maven.plugins:maven-release-plugin](https://github.com/apache/maven-release) from 3.3.0 to 3.3.1.
    - [Release notes](https://github.com/apache/maven-release/releases)
    - [Commits](https://github.com/apache/maven-release/compare/maven-release-3.3.0...maven-release-3.3.1)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-release-plugin
      dependency-version: 3.3.1
      dependency-type: direct:production
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit 674c93145211a969fb7324e5dfaa9bba89dc0911)
    (cherry picked from commit 0ed38187684968d87ea1e8015e49c44e29e90db3)
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 38dd72b508..7e0d3459c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -466,7 +466,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.3.1</version>
                     <configuration>
                         <useReleaseProfile>false</useReleaseProfile>
                         <preparationGoals>${preparationGoals}</preparationGoals>


(cxf) 01/06: Adapt AXRS20ClientServerBookTest::testGetGenericBookManyClientsInParallel to JDK-27 HttpClient changes (that use virtual threads for selectors by default) (#2783)

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

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

commit 984e67c6b6a2c2e11aba583e0dc128b78d7894ea
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Dec 15 08:39:06 2025 -0500

    Adapt AXRS20ClientServerBookTest::testGetGenericBookManyClientsInParallel to JDK-27 HttpClient changes (that use virtual threads for selectors by default) (#2783)
    
    (cherry picked from commit 2ef38ff211b391e4faeb49365f6d0b3c50d3a61e)
    (cherry picked from commit 69e8adf0f0428bbdf4b5759630bc6d3a850254ce)
---
 .../systest/jaxrs/JAXRS20ClientServerBookTest.java  | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
index 1c89da9388..3279eac836 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java
@@ -160,7 +160,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
         final ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
         final AtomicLong httpClientThreads = new AtomicLong(); 
 
-        final Supplier<Long> captureHttpClientThreads = () ->
+        final Supplier<Long> captureHttpClientSelectorThreads = () ->
             Arrays
                 .stream(threadMXBean.getAllThreadIds())
                 .mapToObj(id -> threadMXBean.getThreadInfo(id))
@@ -169,8 +169,16 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
                 .filter(t -> t.getThreadName().endsWith("-SelectorManager"))
                 .count();
 
+        final Supplier<Long> captureHttpClientThreads = () ->
+            Arrays
+                .stream(threadMXBean.getAllThreadIds())
+                .mapToObj(id -> threadMXBean.getThreadInfo(id))
+                .filter(Objects::nonNull)
+                .filter(t -> t.getThreadName().startsWith("HttpClient-"))
+                .count();
+
         // Capture the number of client threads at start
-        final long expectedHttpClientThreads = captureHttpClientThreads.get();
+        final long expectedHttpClientSelectorThreads = captureHttpClientSelectorThreads.get();
         final Collection<WebClient> clients = new ArrayList<>();
         try {
             final String target = "http://localhost:" + PORT + "/bookstore/genericbooks/123";
@@ -195,7 +203,12 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
         } finally {
             pool.shutdown();
             assertThat(pool.awaitTermination(1, TimeUnit.MINUTES), is(true));
-            assertThat(captureHttpClientThreads.get(), greaterThan(0L));
+            // Since JDK-27, HttpClient selector thread is a virtual thread by default
+            if (Runtime.version().feature() >= 27) {
+                assertThat(captureHttpClientSelectorThreads.get(), equalTo(0L));
+            } else {
+                assertThat(captureHttpClientSelectorThreads.get(), greaterThan(0L));
+            }
             assertThat(httpClientThreads.get(), greaterThan(0L));
             assertThat(httpClientThreads.get(), lessThan(150L)); /* a bit higher that pool size */
         }
@@ -204,7 +217,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase
     
         // Since JDK-21, HttpClient Implements AutoCloseable
         if (Runtime.version().feature() >= 21) { 
-            assertThat(captureHttpClientThreads.get(), lessThanOrEqualTo(expectedHttpClientThreads));
+            assertThat(captureHttpClientSelectorThreads.get(), lessThanOrEqualTo(expectedHttpClientSelectorThreads));
         }
     }
 


(cxf) 02/06: Bump actions/setup-java from 5.0.0 to 5.1.0 (#2784)

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

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

commit 920618b503e286cc5137fbdf34f7dfb33902210d
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Mon Dec 15 09:10:44 2025 -0500

    Bump actions/setup-java from 5.0.0 to 5.1.0 (#2784)
    
    Bumps [actions/setup-java](https://github.com/actions/setup-java) from 5.0.0 to 5.1.0.
    - [Release notes](https://github.com/actions/setup-java/releases)
    - [Commits](https://github.com/actions/setup-java/compare/dded0888837ed1f317902acf8a20df0ad188d165...f2beeb24e141e01a676f977032f5a29d81c9e27e)
    
    ---
    updated-dependencies:
    - dependency-name: actions/setup-java
      dependency-version: 5.1.0
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <su...@github.com>
    Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
    (cherry picked from commit 3ad8c9c26bf9ffd8c9de896222284732f72a0550)
    
    # Conflicts:
    #       .github/workflows/codeql-analysis.yml
    #       .github/workflows/pull-request-build.yml
    (cherry picked from commit 415947c1eb2210e3737bdda8fc3fce918e83a818)
    
    # Conflicts:
    #       .github/workflows/pull-request-build.yml
---
 .github/workflows/codeql-analysis.yml    | 2 +-
 .github/workflows/pull-request-build.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index a3db8fe878..53d88af0fd 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -31,7 +31,7 @@ jobs:
       uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
     - name: Setup JDK 17
-      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+      uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
       with:
         distribution: 'temurin'
         java-version: '17'
diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml
index c0e52b9f78..ac7f6a385c 100644
--- a/.github/workflows/pull-request-build.yml
+++ b/.github/workflows/pull-request-build.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v3.6.0
       - name: Set up JDK ${{ matrix.jdk }}
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
         with:
           java-version: ${{ matrix.jdk }}
           distribution: 'temurin'


(cxf) 06/06: 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 4.0.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit ce008a4bd3aa7ab6e8609e34f6ec2b1c1c3ce95b
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Dec 16 21:30:59 2025 -0500

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

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4f401f4959..205070b33d 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -4,6 +4,7 @@ B 2e5c1ba89f96b9a11cc2a75bbb61281520100035
 B 30174222e3f120a3c20be0872c8a98dca8feb1d0
 B 331c64bf5020904ecf179c521691a955fdfe11f3
 B 3bdbc420f641131a6786f9e17e1e232ed64d33c0
+B 5182b3ca8587fb8b18157d99ee3d9199db3e4ecb
 B 5aef1e4fbef4877f7e1b310e054dfb8e7af25a85
 B 5b660b5f9d26ae1e606c6291e8beb61ef0d7fcc8
 B 625fc2657107a3db6b82d7133a2e926331ce08fb
@@ -25,6 +26,7 @@ B ccd6438b0368cee6c025610085235639f4530ed8
 B dfc41a208007e782fb894161f67cf6800bea60ec
 B e357375064695b9ab33a2a5a887a225be15e5b66
 B ebebdb0b9f611be7df9a2ddab204a6cc14c32164
+B fe9ce80546528fe29f1397415edb6630ca10c59f
 M 0070f87fe33df910ae99ac46039828ae50c165cf
 M 0081e7364684b8e5307901825daa8c1385d1a458
 M 00cf7b3974b4be5fcf3e34b080ab7e4d8518ef82
@@ -228,6 +230,7 @@ M 3fcb8c500d4285d477dab0a8df6f0b8a079b5a58
 M 40c4973f0201b4645f2a7a583517525f4e3bde12
 M 40fdadbdd3dfb3d4d8a1ea179b47faf45f8be6d6
 M 415869c2eeba4d814677ab447df81d41c110f6ed
+M 415947c1eb2210e3737bdda8fc3fce918e83a818
 M 415fbfd41683fb518ca9094b431174ab23e13292
 M 4191634a9f7fdfb54d4e35bf325cb1552062f228
 M 431528736a7ea0b5628c20a8e92c5f5a0889dc6c
@@ -501,6 +504,7 @@ M 99d60a742fcd1474ec902cd8c7c65d245e446196
 M 9a6702ad89c283c3c281c7d035d9f4b95ae62c78
 M 9a9fbe94ca928bb619fbcff326c08fcf4f482c22
 M 9b09bfcbdf596bef5c4bc1c511caa2e0ad4cc92e
+M 9b2fb74a6fa85ee8bedc0bb7049e753a0484584e
 M 9bef7a027c3ff17fed3568f9ef1e338c43132d36
 M 9c792208c1419d97d7b1815dba3282f5391b7325
 M 9cdc5e53db22c0362ed63080fe82399adc06f2b2


(cxf) 04/06: Fix JAXRSJweJwsTest::testJweRsaJwsRsaEncryptThenSign test case (#2782)

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

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

commit 3926cca0c4a4c2cfae213406cfdd7df00f4778f3
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Mon Dec 15 11:26:12 2025 -0500

    Fix JAXRSJweJwsTest::testJweRsaJwsRsaEncryptThenSign test case (#2782)
    
    (cherry picked from commit f853577e5fc5fdf1361fd097eda8ead40d5a5a77)
    (cherry picked from commit 00b2d5893f4116adc0d1c62a91f34175c3f4f199)
---
 .../security/jose/jwejws/JAXRSJweJwsTest.java      |   9 +++++---
 .../src/test/resources/keys/alice-jwejws.jks       | Bin 0 -> 4125 bytes
 .../src/test/resources/keys/bob-jwejws.jks         | Bin 0 -> 4122 bytes
 .../jaxrs/security/alice-jwejws.rs.properties      |  23 +++++++++++++++++++
 .../jaxrs/security/bob-jwejws.rs.properties        |  25 +++++++++++++++++++++
 .../systest/jaxrs/security/jose/jwejws/server.xml  |   4 ++--
 6 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java
index 1f189977e9..7ca16379c0 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java
@@ -62,6 +62,10 @@ public class JAXRSJweJwsTest extends AbstractBusClientServerTestBase {
         "org/apache/cxf/systest/jaxrs/security/bob.rs.properties";
     private static final String SERVER_JWEJWS_PROPERTIES =
         "org/apache/cxf/systest/jaxrs/security/alice.rs.properties";
+    private static final String CLIENT_SIGN_JWEJWS_PROPERTIES =
+            "org/apache/cxf/systest/jaxrs/security/bob-jwejws.rs.properties";
+    private static final String SERVER_SIGN_JWEJWS_PROPERTIES =
+            "org/apache/cxf/systest/jaxrs/security/alice-jwejws.rs.properties";
     private static final String ENCODED_MAC_KEY = "AyM1SysPpbyDfgZld3umj1qzKObwVMkoqQ-EstJQLr_T-1qS0gZH75"
         + "aKtMN3Yj0iPS4hcgUuTwjAzZr1Z9CAow";
     @BeforeClass
@@ -175,7 +179,6 @@ public class JAXRSJweJwsTest extends AbstractBusClientServerTestBase {
     }
 
     @Test
-    @org.junit.Ignore // TODO not working since keys were upgraded for some reason
     public void testJweRsaJwsRsaEncryptThenSign() throws Exception {
         String address = "https://localhost:" + PORT + "/jwejwsrsaencrsign";
 
@@ -194,8 +197,8 @@ public class JAXRSJweJwsTest extends AbstractBusClientServerTestBase {
         jwsWriter.setUseJwsOutputStream(true);
         providers.add(jwsWriter);
         bean.setProviders(providers);
-        bean.getProperties(true).put("rs.security.encryption.out.properties", SERVER_JWEJWS_PROPERTIES);
-        bean.getProperties(true).put("rs.security.signature.out.properties", CLIENT_JWEJWS_PROPERTIES);
+        bean.getProperties(true).put("rs.security.encryption.out.properties", SERVER_SIGN_JWEJWS_PROPERTIES);
+        bean.getProperties(true).put("rs.security.signature.out.properties", CLIENT_SIGN_JWEJWS_PROPERTIES);
         PrivateKeyPasswordProvider provider = new PrivateKeyPasswordProviderImpl();
         bean.getProperties(true).put("rs.security.signature.key.password.provider", provider);
         BookStore bs = bean.create(BookStore.class);
diff --git a/systests/rs-security/src/test/resources/keys/alice-jwejws.jks b/systests/rs-security/src/test/resources/keys/alice-jwejws.jks
new file mode 100644
index 0000000000..213b26cac3
Binary files /dev/null and b/systests/rs-security/src/test/resources/keys/alice-jwejws.jks differ
diff --git a/systests/rs-security/src/test/resources/keys/bob-jwejws.jks b/systests/rs-security/src/test/resources/keys/bob-jwejws.jks
new file mode 100644
index 0000000000..55509125b4
Binary files /dev/null and b/systests/rs-security/src/test/resources/keys/bob-jwejws.jks differ
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice-jwejws.rs.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice-jwejws.rs.properties
new file mode 100644
index 0000000000..58bbf085f2
--- /dev/null
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice-jwejws.rs.properties
@@ -0,0 +1,23 @@
+#    Licensed to the Apache Software Foundation (ASF) under one
+#    or more contributor license agreements. See the NOTICE file
+#    distributed with this work for additional information
+#    regarding copyright ownership. The ASF licenses this file
+#    to you under the Apache License, Version 2.0 (the
+#    "License"); you may not use this file except in compliance
+#    with the License. You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing,
+#    software distributed under the License is distributed on an
+#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied. See the License for the
+#    specific language governing permissions and limitations
+#    under the License.
+rs.security.keystore.type=jks
+rs.security.keystore.password=password
+rs.security.keystore.alias=alice
+rs.security.keystore.file=keys/alice-jwejws.jks
+rs.security.encryption.content.algorithm=A128GCM
+rs.security.encryption.key.algorithm=RSA-OAEP
+rs.security.signature.algorithm=RS256
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob-jwejws.rs.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob-jwejws.rs.properties
new file mode 100644
index 0000000000..c1ffc53310
--- /dev/null
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob-jwejws.rs.properties
@@ -0,0 +1,25 @@
+#
+#    Licensed to the Apache Software Foundation (ASF) under one
+#    or more contributor license agreements. See the NOTICE file
+#    distributed with this work for additional information
+#    regarding copyright ownership. The ASF licenses this file
+#    to you under the Apache License, Version 2.0 (the
+#    "License"); you may not use this file except in compliance
+#    with the License. You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing,
+#    software distributed under the License is distributed on an
+#    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#    KIND, either express or implied. See the License for the
+#    specific language governing permissions and limitations
+#    under the License.
+#
+rs.security.keystore.type=jks
+rs.security.keystore.password=password
+rs.security.keystore.alias=bob
+rs.security.keystore.file=keys/bob-jwejws.jks
+rs.security.encryption.content.algorithm=A128GCM
+rs.security.encryption.key.algorithm=RSA-OAEP
+rs.security.signature.algorithm=RS256
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml
index 425e817776..ebf21f6244 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml
@@ -119,8 +119,8 @@ under the License.
             <ref bean="encrSignJwsInFilter"/>
         </jaxrs:providers>
         <jaxrs:properties>
-            <entry key="rs.security.encryption.in.properties" value="org/apache/cxf/systest/jaxrs/security/alice.rs.properties"/>
-            <entry key="rs.security.signature.in.properties" value="org/apache/cxf/systest/jaxrs/security/bob.rs.properties"/>
+            <entry key="rs.security.encryption.in.properties" value="org/apache/cxf/systest/jaxrs/security/alice-jwejws.rs.properties"/>
+            <entry key="rs.security.signature.in.properties" value="org/apache/cxf/systest/jaxrs/security/bob-jwejws.rs.properties"/>
             <entry key="rs.security.decryption.key.password.provider" value-ref="keyPasswordProvider"/>
         </jaxrs:properties>
     </jaxrs:server>