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 2026/02/14 15:06:26 UTC
(cxf) branch 3.6.x-fixes updated (bab9d8d9de -> 67235fc386)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
from bab9d8d9de [maven-release-plugin] prepare for next development iteration
new 9fdaa017a2 Bump org.apache.maven.plugins:maven-dependency-plugin (#2881)
new 32ab34b54e Bump cxf.openfeign.version from 13.6 to 13.7 (#2882)
new 3baa1f1140 Bump net.sourceforge.pmd:pmd-java from 7.20.0 to 7.21.0 (#2878)
new c8388b5932 Bump org.apache.maven.plugins:maven-checkstyle-plugin from 3.2.2 to 3.6.0 (#2863)
new e93745b55a Recording .gitmergeinfo Changes
new 67235fc386 Fix checkstyle violations (post-merge)
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:
.gitmergeinfo | 6 ++++
.../cxf/configuration/spring/bean.properties | 36 ++++++++++++----------
distribution/src/main/release/samples/pom.xml | 2 +-
.../jca/src/test/resources/logging.properties | 4 +--
.../resources/projects/basic/archetype.properties | 20 ++++++++++++
parent/pom.xml | 4 +--
pom.xml | 4 +--
.../aegis/src/test/java/log4j.properties | 30 +++++++++---------
.../logging/src/test/resources/log4j.properties | 20 ++++++++++++
.../src/test/resources/jws/signature.properties | 20 ++++++++++++
.../sso/saml/src/test/resources/alice.properties | 4 +++
.../xml/src/test/resources/alice.properties | 4 +++
.../transport/http_jetty/spring/bean.properties | 32 ++++++++++---------
.../http/netty/server/spring/bean.properties | 32 ++++++++++---------
.../transport/http_undertow/spring/bean.properties | 32 ++++++++++---------
rt/ws/security/src/test/resources/alice.properties | 4 +++
rt/ws/security/src/test/resources/cxfca.properties | 4 +++
.../security/src/test/resources/logging.properties | 4 +--
.../src/test/resources/saml_hok.properties | 20 ++++++++++++
.../security/src/test/resources/saml_sv.properties | 20 ++++++++++++
rt/wsdl/src/test/resources/logging.properties | 4 +--
.../sts-core/src/test/resources/logging.properties | 33 ++++++++++----------
.../src/test/resources/clientKeystore.properties | 29 ++++++++---------
.../src/test/resources/eveKeystore.properties | 29 ++++++++---------
.../advanced/src/test/resources/logging.properties | 33 ++++++++++----------
.../cxf/systest/sts/deployment/sts.properties | 29 ++++++++---------
.../sts/realms/stsKeystoreRealms.properties | 29 ++++++++---------
.../src/test/resources/serviceKeystore.properties | 29 ++++++++---------
.../src/test/resources/stsKeystore.properties | 29 ++++++++---------
.../src/test/resources/clientKeystore.properties | 29 ++++++++---------
.../src/test/resources/eveKeystore.properties | 29 ++++++++---------
.../basic/src/test/resources/logging.properties | 33 ++++++++++----------
.../cxf/systest/sts/deployment/sts/sts.properties | 29 ++++++++---------
.../src/test/resources/serviceKeystore.properties | 29 ++++++++---------
.../src/test/resources/serviceKeystore2.properties | 29 ++++++++---------
.../src/test/resources/stsKeystore.properties | 29 ++++++++---------
.../src/test/resources/clientKeystore.properties | 30 +++++++++---------
.../wsn-core/src/test/resources/logging.properties | 20 ++++++++++++
.../jaxrs/resources/logging_atompush.properties | 20 ++++++++++++
.../resources/logging_atompush_atompub.properties | 20 ++++++++++++
.../resources/logging_atompush_batch.properties | 21 ++++++++++++-
.../resources/logging_atompush_disabled.properties | 20 ++++++++++++
.../systest/jaxrs/security/jetty-realm.properties | 20 ++++++++++++
.../src/test/resources/files/swagger.properties | 20 ++++++++++++
.../jaxrs/src/test/resources/logging.properties | 4 +--
.../kerberos/src/test/resources/alice.properties | 4 +++
.../kerberos/src/test/resources/bob.properties | 4 +++
.../src/test/resources/clientKeystore.properties | 30 +++++++++---------
.../kerberos/src/test/resources/logging.properties | 4 +--
.../src/test/resources/serviceKeystore.properties | 30 +++++++++---------
.../src/test/resources/stsKeystore.properties | 30 +++++++++---------
systests/ldap/src/test/resources/ldap.properties | 30 +++++++++---------
.../ldap/src/test/resources/logging.properties | 4 +--
.../src/test/resources/logging.properties | 4 +--
.../jaxrs/security/alice-jwejws.rs.properties | 4 +++
.../systest/jaxrs/security/alice.jwk.properties | 4 +++
.../cxf/systest/jaxrs/security/alice.properties | 4 +++
.../cxf/systest/jaxrs/security/alice.rs.properties | 4 +++
.../jaxrs/security/alice.rs.storeonly.properties | 4 +++
.../cxf/systest/jaxrs/security/bethal.properties | 30 +++++++++---------
.../jaxrs/security/bob-jwejws.rs.properties | 2 ++
.../cxf/systest/jaxrs/security/bob.jwk.properties | 2 ++
.../cxf/systest/jaxrs/security/bob.properties | 2 ++
.../cxf/systest/jaxrs/security/bob.rs.properties | 2 ++
.../jaxrs/security/bob.rs.storeonly.properties | 2 ++
.../httpsignature/alice.httpsig.properties | 4 +++
.../security/httpsignature/bob.httpsig.properties | 4 +++
.../systest/jaxrs/security/jwe.direct.properties | 4 +++
.../cxf/systest/jaxrs/security/jwejson1.properties | 4 +++
.../cxf/systest/jaxrs/security/jwejson2.properties | 4 +++
.../jaxrs/security/jws.ec.private.properties | 4 +++
.../jaxrs/security/jws.ec.public.properties | 4 +++
.../cxf/systest/jaxrs/security/morpit.properties | 4 +++
.../systest/jaxrs/security/morpittrust.properties | 4 +++
.../secret.aescbchmac.inlinejwk.properties | 4 +++
.../secret.aescbchmac.inlineset.properties | 4 +++
.../jaxrs/security/secret.aescbchmac.properties | 4 +++
.../jaxrs/security/secret.jwk.bad.properties | 4 +++
.../jaxrs/security/secret.jwk.hmac.properties | 4 +++
.../systest/jaxrs/security/secret.jwk.properties | 4 +++
.../cxf/systest/jaxrs/security/smallkey.properties | 4 +++
.../systest/hc5/http/auth/jetty-realm.properties | 20 ++++++++++++
.../src/test/resources/logging.properties | 4 +--
.../src/test/resources/alice.properties | 4 +++
.../src/test/resources/bob.properties | 4 +++
.../src/test/resources/logging.properties | 4 +--
.../cxf/systest/http/auth/jetty-realm.properties | 21 +++++++++++++
.../src/test/resources/logging.properties | 4 +--
.../cxf/systest/http_jetty/jetty-realm.properties | 36 ++++++++++++----------
.../src/test/resources/logging.properties | 4 +--
systests/ws-rm/src/test/resources/alice.properties | 4 +++
systests/ws-rm/src/test/resources/bob.properties | 4 +++
.../src/test/resources/alice.properties | 4 +++
.../src/test/resources/bob.properties | 4 +++
.../src/test/resources/cxfca.properties | 4 +++
.../src/test/resources/logging.properties | 4 +--
.../src/test/resources/sts.properties | 4 +++
.../src/test/resources/alice-enc.properties | 4 +++
.../src/test/resources/alice.properties | 4 +++
.../src/test/resources/bethal.properties | 30 +++++++++---------
.../src/test/resources/bob-enc.properties | 4 +++
.../ws-security/src/test/resources/bob.properties | 4 +++
.../src/test/resources/cxfca.properties | 4 +++
.../src/test/resources/logging.properties | 4 +--
.../src/test/resources/morpit.properties | 4 +++
.../cxf/systest/ws/action/bob-modified.properties | 4 +++
.../cxf/systest/ws/security/revocation.properties | 2 ++
.../src/test/resources/restricted/alice.properties | 4 +++
.../src/test/resources/restricted/bob.properties | 4 +++
.../src/test/resources/truststore.properties | 30 +++++++++---------
.../ws-specs/src/test/resources/logging.properties | 4 +--
111 files changed, 977 insertions(+), 450 deletions(-)
(cxf) 03/06: Bump net.sourceforge.pmd:pmd-java from 7.20.0 to 7.21.0 (#2878)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 3baa1f114007b093e091cd8f0a5395387477cd70
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Feb 12 13:33:00 2026 -0500
Bump net.sourceforge.pmd:pmd-java from 7.20.0 to 7.21.0 (#2878)
* Bump net.sourceforge.pmd:pmd-java from 7.20.0 to 7.21.0
Bumps [net.sourceforge.pmd:pmd-java](https://github.com/pmd/pmd) from 7.20.0 to 7.21.0.
- [Release notes](https://github.com/pmd/pmd/releases)
- [Commits](https://github.com/pmd/pmd/compare/pmd_releases/7.20.0...pmd_releases/7.21.0)
---
updated-dependencies:
- dependency-name: net.sourceforge.pmd:pmd-java
dependency-version: 7.21.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
* Update cxf-build-utils to 4.1.4-SNAPSHOT
Signed-off-by: Andriy Redko <dr...@gmail.com>
---------
Signed-off-by: dependabot[bot] <su...@github.com>
Signed-off-by: Andriy Redko <dr...@gmail.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
Co-authored-by: Andriy Redko <dr...@gmail.com>
(cherry picked from commit 79ed28f123be4b02e66a0437bc11e299ff767d2b)
(cherry picked from commit fb4ead284050c98479a8769dd5cc7db185758307)
# Conflicts:
# pom.xml
(cherry picked from commit 3ba66ff36da5ba64d334b0fe6c07abb94628f067)
# Conflicts:
# pom.xml
---
parent/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index f621abc48d..037ff8a3ac 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -440,7 +440,7 @@
<dependency>
<groupId>net.sourceforge.pmd</groupId>
<artifactId>pmd-java</artifactId>
- <version>7.20.0</version>
+ <version>7.21.0</version>
</dependency>
</dependencies>
<configuration>
diff --git a/pom.xml b/pom.xml
index c8927273a8..47708f8da1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
</issueManagement>
<properties>
<cxf.compiler.fork>false</cxf.compiler.fork>
- <cxf.build-utils.version>4.1.3</cxf.build-utils.version>
+ <cxf.build-utils.version>4.1.4-SNAPSHOT</cxf.build-utils.version>
<cxf.xjc-utils.version>3.3.4</cxf.xjc-utils.version>
<cxf.jdk.version>11</cxf.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
(cxf) 04/06: Bump org.apache.maven.plugins:maven-checkstyle-plugin from 3.2.2 to 3.6.0 (#2863)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c8388b5932282c6fe93a5bc90a8adb2f6dc7b50e
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Fri Feb 13 15:09:56 2026 -0500
Bump org.apache.maven.plugins:maven-checkstyle-plugin from 3.2.2 to 3.6.0 (#2863)
* Bump org.apache.maven.plugins:maven-checkstyle-plugin
Bumps [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.2.2 to 3.6.0.
- [Release notes](https://github.com/apache/maven-checkstyle-plugin/releases)
- [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.2.2...maven-checkstyle-plugin-3.6.0)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin
dependency-version: 3.6.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
* Bump org.apache.maven.plugins:maven-checkstyle-plugin
Bumps [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.2.2 to 3.6.0.
- [Release notes](https://github.com/apache/maven-checkstyle-plugin/releases)
- [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.2.2...maven-checkstyle-plugin-3.6.0)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin
dependency-version: 3.6.0
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <su...@github.com>
* Fix checkstyle violations
---------
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
Co-authored-by: Andriy Redko <dr...@gmail.com>
(cherry picked from commit 68cc6ecdd98c51afcd84b86264a5be40a35cf367)
(cherry picked from commit b91481d05eef26b4ddb26408cd0808aace876787)
(cherry picked from commit f7a04748ae3fdbeddc44a42b3099adeb2c95892f)
# Conflicts:
# core/src/main/java/org/apache/cxf/bus/blueprint/Messages.properties
# rt/features/clustering/src/main/resources/META-INF/blueprint.handlers
# rt/ws/security/src/test/resources/wss-ecdh.properties
---
.../cxf/configuration/spring/bean.properties | 36 ++++++++++++----------
.../jca/src/test/resources/logging.properties | 4 +--
.../resources/projects/basic/archetype.properties | 20 ++++++++++++
parent/pom.xml | 2 +-
.../aegis/src/test/java/log4j.properties | 30 +++++++++---------
.../logging/src/test/resources/log4j.properties | 20 ++++++++++++
.../src/test/resources/jws/signature.properties | 20 ++++++++++++
.../sso/saml/src/test/resources/alice.properties | 4 +++
.../xml/src/test/resources/alice.properties | 4 +++
.../transport/http_jetty/spring/bean.properties | 32 ++++++++++---------
.../http/netty/server/spring/bean.properties | 32 ++++++++++---------
.../transport/http_undertow/spring/bean.properties | 32 ++++++++++---------
rt/ws/security/src/test/resources/alice.properties | 4 +++
rt/ws/security/src/test/resources/cxfca.properties | 4 +++
.../security/src/test/resources/logging.properties | 4 +--
.../src/test/resources/saml_hok.properties | 20 ++++++++++++
.../security/src/test/resources/saml_sv.properties | 20 ++++++++++++
rt/wsdl/src/test/resources/logging.properties | 4 +--
.../sts-core/src/test/resources/logging.properties | 33 ++++++++++----------
.../src/test/resources/clientKeystore.properties | 29 ++++++++---------
.../src/test/resources/eveKeystore.properties | 29 ++++++++---------
.../advanced/src/test/resources/logging.properties | 33 ++++++++++----------
.../cxf/systest/sts/deployment/sts.properties | 29 ++++++++---------
.../sts/realms/stsKeystoreRealms.properties | 29 ++++++++---------
.../src/test/resources/serviceKeystore.properties | 29 ++++++++---------
.../src/test/resources/stsKeystore.properties | 29 ++++++++---------
.../src/test/resources/clientKeystore.properties | 29 ++++++++---------
.../src/test/resources/eveKeystore.properties | 29 ++++++++---------
.../basic/src/test/resources/logging.properties | 33 ++++++++++----------
.../cxf/systest/sts/deployment/sts/sts.properties | 29 ++++++++---------
.../src/test/resources/serviceKeystore.properties | 29 ++++++++---------
.../src/test/resources/serviceKeystore2.properties | 29 ++++++++---------
.../src/test/resources/stsKeystore.properties | 29 ++++++++---------
.../wsn-core/src/test/resources/logging.properties | 20 ++++++++++++
.../jaxrs/resources/logging_atompush.properties | 20 ++++++++++++
.../resources/logging_atompush_atompub.properties | 20 ++++++++++++
.../resources/logging_atompush_batch.properties | 21 ++++++++++++-
.../resources/logging_atompush_disabled.properties | 20 ++++++++++++
.../systest/jaxrs/security/jetty-realm.properties | 20 ++++++++++++
.../src/test/resources/files/swagger.properties | 20 ++++++++++++
.../jaxrs/src/test/resources/logging.properties | 4 +--
.../kerberos/src/test/resources/alice.properties | 4 +++
.../kerberos/src/test/resources/bob.properties | 4 +++
.../src/test/resources/clientKeystore.properties | 30 +++++++++---------
.../kerberos/src/test/resources/logging.properties | 4 +--
.../src/test/resources/serviceKeystore.properties | 30 +++++++++---------
.../src/test/resources/stsKeystore.properties | 30 +++++++++---------
systests/ldap/src/test/resources/ldap.properties | 30 +++++++++---------
.../ldap/src/test/resources/logging.properties | 4 +--
.../src/test/resources/logging.properties | 4 +--
.../jaxrs/security/alice-jwejws.rs.properties | 4 +++
.../systest/jaxrs/security/alice.jwk.properties | 4 +++
.../cxf/systest/jaxrs/security/alice.properties | 4 +++
.../cxf/systest/jaxrs/security/alice.rs.properties | 4 +++
.../jaxrs/security/alice.rs.storeonly.properties | 4 +++
.../cxf/systest/jaxrs/security/bethal.properties | 30 +++++++++---------
.../jaxrs/security/bob-jwejws.rs.properties | 2 ++
.../cxf/systest/jaxrs/security/bob.jwk.properties | 2 ++
.../cxf/systest/jaxrs/security/bob.properties | 2 ++
.../cxf/systest/jaxrs/security/bob.rs.properties | 2 ++
.../jaxrs/security/bob.rs.storeonly.properties | 2 ++
.../httpsignature/alice.httpsig.properties | 4 +++
.../security/httpsignature/bob.httpsig.properties | 4 +++
.../systest/jaxrs/security/jwe.direct.properties | 4 +++
.../cxf/systest/jaxrs/security/jwejson1.properties | 4 +++
.../cxf/systest/jaxrs/security/jwejson2.properties | 4 +++
.../jaxrs/security/jws.ec.private.properties | 4 +++
.../jaxrs/security/jws.ec.public.properties | 4 +++
.../cxf/systest/jaxrs/security/morpit.properties | 4 +++
.../systest/jaxrs/security/morpittrust.properties | 4 +++
.../secret.aescbchmac.inlinejwk.properties | 4 +++
.../secret.aescbchmac.inlineset.properties | 4 +++
.../jaxrs/security/secret.aescbchmac.properties | 4 +++
.../jaxrs/security/secret.jwk.bad.properties | 4 +++
.../jaxrs/security/secret.jwk.hmac.properties | 4 +++
.../systest/jaxrs/security/secret.jwk.properties | 4 +++
.../cxf/systest/jaxrs/security/smallkey.properties | 4 +++
.../systest/hc5/http/auth/jetty-realm.properties | 20 ++++++++++++
.../src/test/resources/logging.properties | 4 +--
.../src/test/resources/alice.properties | 4 +++
.../src/test/resources/bob.properties | 4 +++
.../src/test/resources/logging.properties | 4 +--
.../cxf/systest/http/auth/jetty-realm.properties | 21 +++++++++++++
.../src/test/resources/logging.properties | 4 +--
.../cxf/systest/http_jetty/jetty-realm.properties | 36 ++++++++++++----------
.../src/test/resources/logging.properties | 4 +--
systests/ws-rm/src/test/resources/alice.properties | 4 +++
systests/ws-rm/src/test/resources/bob.properties | 4 +++
.../src/test/resources/alice.properties | 4 +++
.../src/test/resources/bob.properties | 4 +++
.../src/test/resources/cxfca.properties | 4 +++
.../src/test/resources/logging.properties | 4 +--
.../src/test/resources/sts.properties | 4 +++
.../src/test/resources/alice-enc.properties | 4 +++
.../src/test/resources/alice.properties | 4 +++
.../src/test/resources/bethal.properties | 30 +++++++++---------
.../src/test/resources/bob-enc.properties | 4 +++
.../ws-security/src/test/resources/bob.properties | 4 +++
.../src/test/resources/cxfca.properties | 4 +++
.../src/test/resources/logging.properties | 4 +--
.../src/test/resources/morpit.properties | 4 +++
.../cxf/systest/ws/action/bob-modified.properties | 4 +++
.../cxf/systest/ws/security/revocation.properties | 2 ++
.../src/test/resources/restricted/alice.properties | 4 +++
.../src/test/resources/restricted/bob.properties | 4 +++
.../src/test/resources/truststore.properties | 30 +++++++++---------
.../ws-specs/src/test/resources/logging.properties | 4 +--
107 files changed, 951 insertions(+), 432 deletions(-)
diff --git a/core/src/test/java/org/apache/cxf/configuration/spring/bean.properties b/core/src/test/java/org/apache/cxf/configuration/spring/bean.properties
index 91999051b4..6a134a599c 100644
--- a/core/src/test/java/org/apache/cxf/configuration/spring/bean.properties
+++ b/core/src/test/java/org/apache/cxf/configuration/spring/bean.properties
@@ -1,17 +1,21 @@
-# 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.
+#
+#
+# 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.
+#
+#
simple.name=simpleValueBean
diff --git a/integration/jca/src/test/resources/logging.properties b/integration/jca/src/test/resources/logging.properties
index 2c55af86a1..29daaab485 100644
--- a/integration/jca/src/test/resources/logging.properties
+++ b/integration/jca/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties b/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties
index b2befc905f..c97ac734cb 100644
--- a/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties
+++ b/maven-plugins/archetypes/cxf-jaxrs-service/src/test/resources/projects/basic/archetype.properties
@@ -1,3 +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.
+#
+#
#Mon Nov 14 13:42:57 EST 2011
package=it.pkg
version=0.1-SNAPSHOT
diff --git a/parent/pom.xml b/parent/pom.xml
index 037ff8a3ac..4260f77689 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -387,7 +387,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.2.2</version>
+ <version>3.6.0</version>
<dependencies>
<dependency>
<groupId>org.apache.cxf.build-utils</groupId>
diff --git a/rt/databinding/aegis/src/test/java/log4j.properties b/rt/databinding/aegis/src/test/java/log4j.properties
index ac5078f9ed..ccc2b25ce8 100644
--- a/rt/databinding/aegis/src/test/java/log4j.properties
+++ b/rt/databinding/aegis/src/test/java/log4j.properties
@@ -1,19 +1,21 @@
-# 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.
+# 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.
# Set root logger level to DEBUG and its only appender to A1.
log4j.rootLogger=INFO, A1
diff --git a/rt/features/logging/src/test/resources/log4j.properties b/rt/features/logging/src/test/resources/log4j.properties
index 5b083bab17..730d72281c 100644
--- a/rt/features/logging/src/test/resources/log4j.properties
+++ b/rt/features/logging/src/test/resources/log4j.properties
@@ -1,3 +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.
+#
+#
log4j.rootLogger=INFO,stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/rt/rs/security/jose-parent/jose/src/test/resources/jws/signature.properties b/rt/rs/security/jose-parent/jose/src/test/resources/jws/signature.properties
index e27a3296e9..bac7454b5b 100644
--- a/rt/rs/security/jose-parent/jose/src/test/resources/jws/signature.properties
+++ b/rt/rs/security/jose-parent/jose/src/test/resources/jws/signature.properties
@@ -1 +1,21 @@
+#
+#
+# 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.signature.algorithm=none
diff --git a/rt/rs/security/sso/saml/src/test/resources/alice.properties b/rt/rs/security/sso/saml/src/test/resources/alice.properties
index 7a1f467648..2bf4697675 100644
--- a/rt/rs/security/sso/saml/src/test/resources/alice.properties
+++ b/rt/rs/security/sso/saml/src/test/resources/alice.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/rt/rs/security/xml/src/test/resources/alice.properties b/rt/rs/security/xml/src/test/resources/alice.properties
index 7a1f467648..2bf4697675 100644
--- a/rt/rs/security/xml/src/test/resources/alice.properties
+++ b/rt/rs/security/xml/src/test/resources/alice.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/bean.properties b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/bean.properties
index 54f20007e7..9c5118a32e 100644
--- a/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/bean.properties
+++ b/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/bean.properties
@@ -1,19 +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
+#
+#
+# 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
+# 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.
+# 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.
+#
+#
bar.connection.timeout=79
foo.connection.timeout=97
engine.port.zero=0
diff --git a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/bean.properties b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/bean.properties
index a08cfdda82..85aa560042 100644
--- a/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/bean.properties
+++ b/rt/transports/http-netty/netty-server/src/test/resources/org/apache/cxf/transport/http/netty/server/spring/bean.properties
@@ -1,19 +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
+#
+#
+# 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
+# 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.
+# 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.
+#
+#
bar.connection.timeout=79
foo.connection.timeout=97
engine.port.zero=0
diff --git a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/bean.properties b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/bean.properties
index f92e1fcf8a..0c146cebc1 100644
--- a/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/bean.properties
+++ b/rt/transports/http-undertow/src/test/java/org/apache/cxf/transport/http_undertow/spring/bean.properties
@@ -1,19 +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
+#
+#
+# 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
+# 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.
+# 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.
+#
+#
bar.connection.timeout=79
foo.connection.timeout=97
engine.port.zero=0
diff --git a/rt/ws/security/src/test/resources/alice.properties b/rt/ws/security/src/test/resources/alice.properties
index 7a1f467648..2bf4697675 100644
--- a/rt/ws/security/src/test/resources/alice.properties
+++ b/rt/ws/security/src/test/resources/alice.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/rt/ws/security/src/test/resources/cxfca.properties b/rt/ws/security/src/test/resources/cxfca.properties
index 18cc0bafae..2a645157dd 100644
--- a/rt/ws/security/src/test/resources/cxfca.properties
+++ b/rt/ws/security/src/test/resources/cxfca.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.truststore.type=jks
org.apache.ws.security.crypto.merlin.truststore.password=password
diff --git a/rt/ws/security/src/test/resources/logging.properties b/rt/ws/security/src/test/resources/logging.properties
index b2e5a799c8..4889366a3a 100644
--- a/rt/ws/security/src/test/resources/logging.properties
+++ b/rt/ws/security/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/rt/ws/security/src/test/resources/saml_hok.properties b/rt/ws/security/src/test/resources/saml_hok.properties
index 059339596e..8a42715c4f 100644
--- a/rt/ws/security/src/test/resources/saml_hok.properties
+++ b/rt/ws/security/src/test/resources/saml_hok.properties
@@ -1,3 +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.
+#
+#
org.apache.ws.security.saml.issuerClass=org.apache.ws.security.saml.SAMLIssuerImpl
org.apache.ws.security.saml.issuer.cryptoProp.file=outsecurity.properties
org.apache.ws.security.saml.issuer.key.name=myalias
diff --git a/rt/ws/security/src/test/resources/saml_sv.properties b/rt/ws/security/src/test/resources/saml_sv.properties
index 4027e904e3..406fec97cb 100644
--- a/rt/ws/security/src/test/resources/saml_sv.properties
+++ b/rt/ws/security/src/test/resources/saml_sv.properties
@@ -1,3 +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.
+#
+#
org.apache.ws.security.saml.issuerClass=org.apache.ws.security.saml.SAMLIssuerImpl
org.apache.ws.security.saml.issuer=www.example.com
org.apache.ws.security.saml.issuer.cryptoProp.file=outsecurity.properties
diff --git a/rt/wsdl/src/test/resources/logging.properties b/rt/wsdl/src/test/resources/logging.properties
index 22c30bd885..35c34dab40 100644
--- a/rt/wsdl/src/test/resources/logging.properties
+++ b/rt/wsdl/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/services/sts/sts-core/src/test/resources/logging.properties b/services/sts/sts-core/src/test/resources/logging.properties
index f70123b312..a6f1cf6f5c 100644
--- a/services/sts/sts-core/src/test/resources/logging.properties
+++ b/services/sts/sts-core/src/test/resources/logging.properties
@@ -1,24 +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
+# 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
#
-# 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.
+# 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.
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -26,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/services/sts/systests/advanced/src/test/resources/clientKeystore.properties b/services/sts/systests/advanced/src/test/resources/clientKeystore.properties
index b76fb47bbc..9cc7608bb2 100644
--- a/services/sts/systests/advanced/src/test/resources/clientKeystore.properties
+++ b/services/sts/systests/advanced/src/test/resources/clientKeystore.properties
@@ -1,20 +1,21 @@
#
-# 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
+# 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
#
-# 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.
+# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
diff --git a/services/sts/systests/advanced/src/test/resources/eveKeystore.properties b/services/sts/systests/advanced/src/test/resources/eveKeystore.properties
index dd492b2999..4a854732fd 100644
--- a/services/sts/systests/advanced/src/test/resources/eveKeystore.properties
+++ b/services/sts/systests/advanced/src/test/resources/eveKeystore.properties
@@ -1,20 +1,21 @@
#
-# 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
+# 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
#
-# 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.
+# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
diff --git a/services/sts/systests/advanced/src/test/resources/logging.properties b/services/sts/systests/advanced/src/test/resources/logging.properties
index 4d286d18e6..78fbfe497b 100644
--- a/services/sts/systests/advanced/src/test/resources/logging.properties
+++ b/services/sts/systests/advanced/src/test/resources/logging.properties
@@ -1,23 +1,24 @@
#
-# 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
+# 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
#
-# 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.
+# 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.
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -25,7 +26,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/sts.properties b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/sts.properties
index e89bf34f4f..d0a7d021f6 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/sts.properties
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/deployment/sts.properties
@@ -1,20 +1,21 @@
#
-# 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
+# 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
#
-# 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.
+# 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.
#
signature.properties=stsKeystore.properties
signature.username=mystskey
diff --git a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsKeystoreRealms.properties b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsKeystoreRealms.properties
index 2ea8d17de6..7bc35b0900 100644
--- a/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsKeystoreRealms.properties
+++ b/services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/realms/stsKeystoreRealms.properties
@@ -1,20 +1,21 @@
#
-# 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
+# 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
#
-# 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.
+# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
diff --git a/services/sts/systests/advanced/src/test/resources/serviceKeystore.properties b/services/sts/systests/advanced/src/test/resources/serviceKeystore.properties
index f837778e7a..f31e6b0bb6 100644
--- a/services/sts/systests/advanced/src/test/resources/serviceKeystore.properties
+++ b/services/sts/systests/advanced/src/test/resources/serviceKeystore.properties
@@ -1,20 +1,21 @@
#
-# 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
+# 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
#
-# 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.
+# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
diff --git a/services/sts/systests/advanced/src/test/resources/stsKeystore.properties b/services/sts/systests/advanced/src/test/resources/stsKeystore.properties
index a11eefa9d9..708d85421c 100644
--- a/services/sts/systests/advanced/src/test/resources/stsKeystore.properties
+++ b/services/sts/systests/advanced/src/test/resources/stsKeystore.properties
@@ -1,20 +1,21 @@
#
-# 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
+# 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
#
-# 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.
+# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
diff --git a/services/sts/systests/basic/src/test/resources/clientKeystore.properties b/services/sts/systests/basic/src/test/resources/clientKeystore.properties
index b76fb47bbc..9cc7608bb2 100644
--- a/services/sts/systests/basic/src/test/resources/clientKeystore.properties
+++ b/services/sts/systests/basic/src/test/resources/clientKeystore.properties
@@ -1,20 +1,21 @@
#
-# 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
+# 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
#
-# 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.
+# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
diff --git a/services/sts/systests/basic/src/test/resources/eveKeystore.properties b/services/sts/systests/basic/src/test/resources/eveKeystore.properties
index dd492b2999..4a854732fd 100644
--- a/services/sts/systests/basic/src/test/resources/eveKeystore.properties
+++ b/services/sts/systests/basic/src/test/resources/eveKeystore.properties
@@ -1,20 +1,21 @@
#
-# 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
+# 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
#
-# 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.
+# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
diff --git a/services/sts/systests/basic/src/test/resources/logging.properties b/services/sts/systests/basic/src/test/resources/logging.properties
index f70123b312..a6f1cf6f5c 100644
--- a/services/sts/systests/basic/src/test/resources/logging.properties
+++ b/services/sts/systests/basic/src/test/resources/logging.properties
@@ -1,24 +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
+# 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
#
-# 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.
+# 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.
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -26,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/sts.properties b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/sts.properties
index e89bf34f4f..d0a7d021f6 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/sts.properties
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/sts/sts.properties
@@ -1,20 +1,21 @@
#
-# 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
+# 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
#
-# 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.
+# 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.
#
signature.properties=stsKeystore.properties
signature.username=mystskey
diff --git a/services/sts/systests/basic/src/test/resources/serviceKeystore.properties b/services/sts/systests/basic/src/test/resources/serviceKeystore.properties
index f837778e7a..f31e6b0bb6 100644
--- a/services/sts/systests/basic/src/test/resources/serviceKeystore.properties
+++ b/services/sts/systests/basic/src/test/resources/serviceKeystore.properties
@@ -1,20 +1,21 @@
#
-# 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
+# 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
#
-# 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.
+# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
diff --git a/services/sts/systests/basic/src/test/resources/serviceKeystore2.properties b/services/sts/systests/basic/src/test/resources/serviceKeystore2.properties
index f85af2d8ca..34e39fcf27 100644
--- a/services/sts/systests/basic/src/test/resources/serviceKeystore2.properties
+++ b/services/sts/systests/basic/src/test/resources/serviceKeystore2.properties
@@ -1,20 +1,21 @@
#
-# 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
+# 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
#
-# 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.
+# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
diff --git a/services/sts/systests/basic/src/test/resources/stsKeystore.properties b/services/sts/systests/basic/src/test/resources/stsKeystore.properties
index a11eefa9d9..708d85421c 100644
--- a/services/sts/systests/basic/src/test/resources/stsKeystore.properties
+++ b/services/sts/systests/basic/src/test/resources/stsKeystore.properties
@@ -1,20 +1,21 @@
#
-# 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
+# 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
#
-# 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.
+# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
diff --git a/services/wsn/wsn-core/src/test/resources/logging.properties b/services/wsn/wsn-core/src/test/resources/logging.properties
index 779a872c08..2d345d4113 100644
--- a/services/wsn/wsn-core/src/test/resources/logging.properties
+++ b/services/wsn/wsn-core/src/test/resources/logging.properties
@@ -1,3 +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.
+#
+
# Specify the handlers to create in the root logger
# (all loggers are children of the root logger)
# The following creates two handlers
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties
index 3ccbe0fe8d..c0c11e8c72 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties
@@ -1,3 +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.
+#
+#
# Set logging levels for the package-named loggers
org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushTest.level = ALL
org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushTest.handlers = org.apache.cxf.management.web.logging.atom.AtomPushHandler
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties
index b09132b996..956f679e6d 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties
@@ -1,3 +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.
+#
+#
# Set logging levels for the package-named loggers
org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushTest.level = ALL
org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushTest.handlers = org.apache.cxf.management.web.logging.atom.AtomPushHandler
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_batch.properties b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_batch.properties
index c01c0bfa6a..b875e2f3c3 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_batch.properties
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_batch.properties
@@ -1,4 +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.
+#
+#
# Set logging levels for the package-named loggers
org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushTest.level = ALL
org.apache.cxf.systest.jaxrs.JAXRSLoggingAtomPushTest.handlers = org.apache.cxf.management.web.logging.atom.AtomPushHandler
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties
index ea03c16947..8ca8ff4816 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties
@@ -1,3 +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.
+#
+#
handlers = java.util.logging.ConsoleHandler
.level = OFF
org.apache.cxf.jaxrs.level = OFF
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jetty-realm.properties b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jetty-realm.properties
index 4013e65931..314f2c6874 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jetty-realm.properties
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jetty-realm.properties
@@ -1,3 +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.
+#
+#
foo: bar,ROLE_USER
bob: bobspassword,ROLE_BOOK_OWNER
diff --git a/systests/jaxrs/src/test/resources/files/swagger.properties b/systests/jaxrs/src/test/resources/files/swagger.properties
index 417045b753..b0021407dc 100644
--- a/systests/jaxrs/src/test/resources/files/swagger.properties
+++ b/systests/jaxrs/src/test/resources/files/swagger.properties
@@ -1,3 +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.
+#
+#
contact=cxf@apache.org
title=CXF unittest
description=API Description
diff --git a/systests/jaxrs/src/test/resources/logging.properties b/systests/jaxrs/src/test/resources/logging.properties
index cdda57b0d5..f5f2c9a981 100644
--- a/systests/jaxrs/src/test/resources/logging.properties
+++ b/systests/jaxrs/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/systests/kerberos/src/test/resources/alice.properties b/systests/kerberos/src/test/resources/alice.properties
index fb18b116e1..8c1e461cd4 100644
--- a/systests/kerberos/src/test/resources/alice.properties
+++ b/systests/kerberos/src/test/resources/alice.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/systests/kerberos/src/test/resources/bob.properties b/systests/kerberos/src/test/resources/bob.properties
index 61bb2ecae5..4547d47ee1 100644
--- a/systests/kerberos/src/test/resources/bob.properties
+++ b/systests/kerberos/src/test/resources/bob.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/systests/kerberos/src/test/resources/clientKeystore.properties b/systests/kerberos/src/test/resources/clientKeystore.properties
index b76fb47bbc..1a4dc9cd27 100644
--- a/systests/kerberos/src/test/resources/clientKeystore.properties
+++ b/systests/kerberos/src/test/resources/clientKeystore.properties
@@ -1,20 +1,22 @@
#
-# 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
+# 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.
#
-# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
diff --git a/systests/kerberos/src/test/resources/logging.properties b/systests/kerberos/src/test/resources/logging.properties
index 0cf4a85896..a61c88a38c 100644
--- a/systests/kerberos/src/test/resources/logging.properties
+++ b/systests/kerberos/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/systests/kerberos/src/test/resources/serviceKeystore.properties b/systests/kerberos/src/test/resources/serviceKeystore.properties
index f837778e7a..fe90bd1e7a 100644
--- a/systests/kerberos/src/test/resources/serviceKeystore.properties
+++ b/systests/kerberos/src/test/resources/serviceKeystore.properties
@@ -1,20 +1,22 @@
#
-# 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
+# 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.
#
-# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
diff --git a/systests/kerberos/src/test/resources/stsKeystore.properties b/systests/kerberos/src/test/resources/stsKeystore.properties
index a11eefa9d9..453c88b9d6 100644
--- a/systests/kerberos/src/test/resources/stsKeystore.properties
+++ b/systests/kerberos/src/test/resources/stsKeystore.properties
@@ -1,20 +1,22 @@
#
-# 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
+# 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.
#
-# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
diff --git a/systests/ldap/src/test/resources/ldap.properties b/systests/ldap/src/test/resources/ldap.properties
index 36b29a4e83..a344844a53 100644
--- a/systests/ldap/src/test/resources/ldap.properties
+++ b/systests/ldap/src/test/resources/ldap.properties
@@ -1,20 +1,22 @@
#
-# 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
+# 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.
#
-# 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.
#
claimUser=alice
diff --git a/systests/ldap/src/test/resources/logging.properties b/systests/ldap/src/test/resources/logging.properties
index b2e5a799c8..4889366a3a 100644
--- a/systests/ldap/src/test/resources/logging.properties
+++ b/systests/ldap/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/systests/rs-security/src/test/resources/logging.properties b/systests/rs-security/src/test/resources/logging.properties
index b2e5a799c8..4889366a3a 100644
--- a/systests/rs-security/src/test/resources/logging.properties
+++ b/systests/rs-security/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
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
index 58bbf085f2..036a5354aa 100644
--- 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
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# 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
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.jwk.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.jwk.properties
index d8a002f813..9090e2bfcd 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.jwk.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.jwk.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
rs.security.keystore.type=jwk
rs.security.keystore.alias=2011-04-29
rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPrivateSet.txt
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.properties
index fb18b116e1..8c1e461cd4 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.properties
index 800578257b..4f89c33027 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# 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
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.storeonly.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.storeonly.properties
index 6aee063dfd..4ccaa3405d 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.storeonly.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.rs.storeonly.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# 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.file=keys/alice.jks
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bethal.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bethal.properties
index 7356fc5694..bd3b781d63 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bethal.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bethal.properties
@@ -1,20 +1,22 @@
#
-# 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
+# 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.
#
-# 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.
#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
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
index c1ffc53310..ba44614bab 100644
--- 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
@@ -1,4 +1,5 @@
#
+#
# 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
@@ -16,6 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
+#
rs.security.keystore.type=jks
rs.security.keystore.password=password
rs.security.keystore.alias=bob
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.jwk.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.jwk.properties
index 808772a52d..3f301024ab 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.jwk.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.jwk.properties
@@ -1,4 +1,5 @@
#
+#
# 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
@@ -16,6 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
+#
rs.security.keystore.type=jwk
rs.security.keystore.alias=2011-04-29
rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.properties
index 8dbdb7e9fb..4547d47ee1 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.properties
@@ -1,4 +1,5 @@
#
+#
# 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
@@ -16,6 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.properties
index dea95cd1ba..a80b6c0b3c 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.properties
@@ -1,4 +1,5 @@
#
+#
# 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
@@ -16,6 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
+#
rs.security.keystore.type=jks
rs.security.keystore.password=password
rs.security.keystore.alias=bob
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.storeonly.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.storeonly.properties
index 88f46257b3..da5ae509a1 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.storeonly.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/bob.rs.storeonly.properties
@@ -1,4 +1,5 @@
#
+#
# 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
@@ -16,6 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
+#
rs.security.keystore.type=jks
rs.security.keystore.password=password
rs.security.keystore.file=keys/bob.jks
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/alice.httpsig.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/alice.httpsig.properties
index eba8397b76..2cdfa5339c 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/alice.httpsig.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/alice.httpsig.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# 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
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/bob.httpsig.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/bob.httpsig.properties
index 435fd30af0..7b21f95811 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/bob.httpsig.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/httpsignature/bob.httpsig.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# 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
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwe.direct.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwe.direct.properties
index 6fa30bea6c..949dcbff99 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwe.direct.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwe.direct.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
rs.security.keystore.type=jwk
rs.security.keystore.alias.jwe=AesGcmKey
rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPrivateSet.txt
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson1.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson1.properties
index 7fd433d96a..614ddb4d69 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson1.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson1.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
rs.security.keystore.type=jwk
rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPrivateSet.txt
rs.security.encryption.include.key.id=true
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson2.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson2.properties
index 3cc027a097..310b4050ca 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson2.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jwejson2.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
rs.security.keystore.type=jwk
rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPrivateSet.txt
rs.security.encryption.include.key.id=true
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.private.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.private.properties
index b5b7dd2a97..703d89074a 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.private.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.private.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
rs.security.keystore.type=jwk
rs.security.keystore.alias=ECKey
rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPrivateSet.txt
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.public.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.public.properties
index 32f0a5acca..f164c198d5 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.public.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jws.ec.public.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
rs.security.keystore.type=jwk
rs.security.keystore.alias=ECKey
rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPublicSet.txt
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpit.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpit.properties
index 7cf81d6a3b..955fd5eb9c 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpit.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpit.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
org.apache.wss4j.crypto.merlin.keystore.password=password
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpittrust.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpittrust.properties
index 0056c7da88..1116886481 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpittrust.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/morpittrust.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
org.apache.wss4j.crypto.merlin.keystore.password=password
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlinejwk.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlinejwk.properties
index 06d481d942..e2dacd6bf6 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlinejwk.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlinejwk.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
rs.security.keystore.type=jwk
rs.security.keystore.jwkkey=eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwicDJzIjoiaXVHOExqSkNrN3FtcnVGRUdyMHVuUSIsInAyYyI6NDA5Nn0.TuUE2NnCsl3ZWJY7sl0uqEWxFV2ZHw5tw-0ri8Qyst5Gn6YzuPGKJw.aaesJ4e-rLFYIdxA6gMdMw.lnncuqaZ2o3lPRX9bfFh4huW5llDWXC0Gg5987pNSte0SyY7gJcg4EFPHrPdO1YSAZJmPC3hEEmcwqh42w8g2rWiyUqcJ8Z4PqEj7HkNUdE.NccysFtj5AoMMSEk2Sa6oQ
rs.security.keystore.alias.jwe=AesWrapKey
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlineset.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlineset.properties
index dcbd14b6c5..b75b656f93 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlineset.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.inlineset.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
rs.security.keystore.type=jwk
rs.security.keystore.jwkset=eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwicDJzIjoiTWJlR0VTekk2MURJaHFncnc4ZG9TZyIsInAyYyI6NDA5Nn0.MVJlK1vV0lWLt2ySU2WB_nphsWZqf6jhVfb2mGuf05mXnxqistGBng.x6itAzrmrAn9KetfUl1ZPg.2if8qkLqADwsF0li0BzhPX8Q9LLYrUE_uHfv-qo23BwOryGm_cOSj01_TVZnO58N30wYBMJZ_mgYIQTYGL_6VUJJv8_qzP_wmBUkV99VPWOrEYLf75VWvJSMwyFjGljzpYoWONvrp6QwfrKjdum8_xEOs1dgurq8Spct-y1Ueqk9YCO_6fvklAzLPxgyyPXw5HwSIw1f4wtDN9XVHfmphvuNLNXrzxI-b1Xi4t1FIZBgX6LephgwL3LpJeP0MrKQlPpe4R [...]
rs.security.keystore.alias.jwe=AesWrapKey
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.properties
index efa2db24e0..e8001561e8 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.aescbchmac.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
rs.security.keystore.type=jwk
rs.security.keystore.alias.jwe=AesWrapKey
rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/encryptedJwkPrivateSet.txt
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.bad.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.bad.properties
index 0569c450fa..e44ff09f6f 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.bad.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.bad.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
rs.security.keystore.type=jwk
rs.security.keystore.alias.jwe=AesWrapKey
rs.security.keystore.alias.jws=HMACKey
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac.properties
index 6a3e428a79..c2f733d6bf 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.hmac.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
rs.security.keystore.type=jwk
rs.security.keystore.alias.jws=HMAC512Key
rs.security.keystore.file=org/apache/cxf/systest/jaxrs/security/certs/jwkPrivateSet.txt
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.properties
index 7787faf497..d8d7b15ac2 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/secret.jwk.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
rs.security.keystore.type=jwk
rs.security.keystore.alias.jwe=AesWrapKey
rs.security.keystore.alias.jws=HMACKey
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/smallkey.properties b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/smallkey.properties
index f34925ea15..610aa176d9 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/smallkey.properties
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/smallkey.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=security
diff --git a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http/auth/jetty-realm.properties b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http/auth/jetty-realm.properties
index 0d950fbd8f..f2e09accb6 100644
--- a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http/auth/jetty-realm.properties
+++ b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http/auth/jetty-realm.properties
@@ -1,2 +1,22 @@
+#
+#
+# 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.
+#
+#
foo: bar,ROLE_USER
diff --git a/systests/transport-hc5/src/test/resources/logging.properties b/systests/transport-hc5/src/test/resources/logging.properties
index c89316aba9..cb7eb86491 100644
--- a/systests/transport-hc5/src/test/resources/logging.properties
+++ b/systests/transport-hc5/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/systests/transport-jms/src/test/resources/alice.properties b/systests/transport-jms/src/test/resources/alice.properties
index f2dbb4b60b..b51b75bc6b 100644
--- a/systests/transport-jms/src/test/resources/alice.properties
+++ b/systests/transport-jms/src/test/resources/alice.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
org.apache.wss4j.crypto.merlin.keystore.password=password
diff --git a/systests/transport-jms/src/test/resources/bob.properties b/systests/transport-jms/src/test/resources/bob.properties
index 48e3be76cd..bb34a4e10c 100644
--- a/systests/transport-jms/src/test/resources/bob.properties
+++ b/systests/transport-jms/src/test/resources/bob.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
org.apache.wss4j.crypto.merlin.keystore.password=password
diff --git a/systests/transport-jms/src/test/resources/logging.properties b/systests/transport-jms/src/test/resources/logging.properties
index bab36b896a..b768459e32 100644
--- a/systests/transport-jms/src/test/resources/logging.properties
+++ b/systests/transport-jms/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/jetty-realm.properties b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/jetty-realm.properties
index 0d950fbd8f..778ae47ec0 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/jetty-realm.properties
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/jetty-realm.properties
@@ -1,2 +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.
+#
+#
+
foo: bar,ROLE_USER
diff --git a/systests/transports/src/test/resources/logging.properties b/systests/transports/src/test/resources/logging.properties
index b2e5a799c8..4889366a3a 100644
--- a/systests/transports/src/test/resources/logging.properties
+++ b/systests/transports/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jetty-realm.properties b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jetty-realm.properties
index 974aae2597..b008eb3757 100644
--- a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jetty-realm.properties
+++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/jetty-realm.properties
@@ -1,19 +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.
-## ---------------------------------------------------------------------------
+#
+#
+# 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.
+#
+#
# Defines users that can access the web (console, demo, etc.)
# username: password [,rolename ...]
diff --git a/systests/uncategorized/src/test/resources/logging.properties b/systests/uncategorized/src/test/resources/logging.properties
index 2c55af86a1..29daaab485 100644
--- a/systests/uncategorized/src/test/resources/logging.properties
+++ b/systests/uncategorized/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/systests/ws-rm/src/test/resources/alice.properties b/systests/ws-rm/src/test/resources/alice.properties
index fb18b116e1..8c1e461cd4 100644
--- a/systests/ws-rm/src/test/resources/alice.properties
+++ b/systests/ws-rm/src/test/resources/alice.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/systests/ws-rm/src/test/resources/bob.properties b/systests/ws-rm/src/test/resources/bob.properties
index 61bb2ecae5..4547d47ee1 100644
--- a/systests/ws-rm/src/test/resources/bob.properties
+++ b/systests/ws-rm/src/test/resources/bob.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/systests/ws-security-examples/src/test/resources/alice.properties b/systests/ws-security-examples/src/test/resources/alice.properties
index fb18b116e1..8c1e461cd4 100644
--- a/systests/ws-security-examples/src/test/resources/alice.properties
+++ b/systests/ws-security-examples/src/test/resources/alice.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/systests/ws-security-examples/src/test/resources/bob.properties b/systests/ws-security-examples/src/test/resources/bob.properties
index 5b9fb6e3ae..5196627caf 100644
--- a/systests/ws-security-examples/src/test/resources/bob.properties
+++ b/systests/ws-security-examples/src/test/resources/bob.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/systests/ws-security-examples/src/test/resources/cxfca.properties b/systests/ws-security-examples/src/test/resources/cxfca.properties
index f7d9e80f5c..25782e60eb 100644
--- a/systests/ws-security-examples/src/test/resources/cxfca.properties
+++ b/systests/ws-security-examples/src/test/resources/cxfca.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/systests/ws-security-examples/src/test/resources/logging.properties b/systests/ws-security-examples/src/test/resources/logging.properties
index 0cc4821c74..451dc3191f 100644
--- a/systests/ws-security-examples/src/test/resources/logging.properties
+++ b/systests/ws-security-examples/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/systests/ws-security-examples/src/test/resources/sts.properties b/systests/ws-security-examples/src/test/resources/sts.properties
index d2420df192..c07f73f8bb 100644
--- a/systests/ws-security-examples/src/test/resources/sts.properties
+++ b/systests/ws-security-examples/src/test/resources/sts.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/systests/ws-security/src/test/resources/alice-enc.properties b/systests/ws-security/src/test/resources/alice-enc.properties
index ac71f2b53b..bd502e275b 100644
--- a/systests/ws-security/src/test/resources/alice-enc.properties
+++ b/systests/ws-security/src/test/resources/alice-enc.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
org.apache.wss4j.crypto.merlin.keystore.password=ENC(mC9pTqoZ9n1dW2wETrJEpHHDmgXn1e7T)
diff --git a/systests/ws-security/src/test/resources/alice.properties b/systests/ws-security/src/test/resources/alice.properties
index f2dbb4b60b..b51b75bc6b 100644
--- a/systests/ws-security/src/test/resources/alice.properties
+++ b/systests/ws-security/src/test/resources/alice.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
org.apache.wss4j.crypto.merlin.keystore.password=password
diff --git a/systests/ws-security/src/test/resources/bethal.properties b/systests/ws-security/src/test/resources/bethal.properties
index 7356fc5694..bd3b781d63 100644
--- a/systests/ws-security/src/test/resources/bethal.properties
+++ b/systests/ws-security/src/test/resources/bethal.properties
@@ -1,20 +1,22 @@
#
-# 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
+# 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.
#
-# 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.
#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
diff --git a/systests/ws-security/src/test/resources/bob-enc.properties b/systests/ws-security/src/test/resources/bob-enc.properties
index 1752ac96bb..89a0a32103 100644
--- a/systests/ws-security/src/test/resources/bob-enc.properties
+++ b/systests/ws-security/src/test/resources/bob-enc.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
org.apache.wss4j.crypto.merlin.keystore.password=ENC(eAsmYazOvgvygJmuMzWG5uvRBmkvXf5G)
diff --git a/systests/ws-security/src/test/resources/bob.properties b/systests/ws-security/src/test/resources/bob.properties
index 48e3be76cd..bb34a4e10c 100644
--- a/systests/ws-security/src/test/resources/bob.properties
+++ b/systests/ws-security/src/test/resources/bob.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
org.apache.wss4j.crypto.merlin.keystore.password=password
diff --git a/systests/ws-security/src/test/resources/cxfca.properties b/systests/ws-security/src/test/resources/cxfca.properties
index a5ab1c9872..5592a1b749 100644
--- a/systests/ws-security/src/test/resources/cxfca.properties
+++ b/systests/ws-security/src/test/resources/cxfca.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
org.apache.wss4j.crypto.merlin.keystore.password=password
diff --git a/systests/ws-security/src/test/resources/logging.properties b/systests/ws-security/src/test/resources/logging.properties
index b2e5a799c8..4889366a3a 100644
--- a/systests/ws-security/src/test/resources/logging.properties
+++ b/systests/ws-security/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
diff --git a/systests/ws-security/src/test/resources/morpit.properties b/systests/ws-security/src/test/resources/morpit.properties
index 7cf81d6a3b..955fd5eb9c 100644
--- a/systests/ws-security/src/test/resources/morpit.properties
+++ b/systests/ws-security/src/test/resources/morpit.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
org.apache.wss4j.crypto.merlin.keystore.password=password
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.properties b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.properties
index 3592376006..0e3663b4dd 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.properties
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
org.apache.wss4j.crypto.merlin.keystore.password=password
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties
index dd76fe4c72..06085bf4fa 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/revocation.properties
@@ -1,4 +1,5 @@
#
+#
# 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
@@ -16,6 +17,7 @@
# specific language governing permissions and limitations
# under the License.
#
+#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
org.apache.wss4j.crypto.merlin.keystore.password=security
diff --git a/systests/ws-security/src/test/resources/restricted/alice.properties b/systests/ws-security/src/test/resources/restricted/alice.properties
index 66784fe4b9..0c27a461f4 100644
--- a/systests/ws-security/src/test/resources/restricted/alice.properties
+++ b/systests/ws-security/src/test/resources/restricted/alice.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/systests/ws-security/src/test/resources/restricted/bob.properties b/systests/ws-security/src/test/resources/restricted/bob.properties
index 095719527f..df746a84ea 100644
--- a/systests/ws-security/src/test/resources/restricted/bob.properties
+++ b/systests/ws-security/src/test/resources/restricted/bob.properties
@@ -1,3 +1,5 @@
+#
+#
# 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
@@ -14,6 +16,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+#
+#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
org.apache.ws.security.crypto.merlin.keystore.password=password
diff --git a/systests/ws-security/src/test/resources/truststore.properties b/systests/ws-security/src/test/resources/truststore.properties
index 170389a6b1..7210f9350d 100644
--- a/systests/ws-security/src/test/resources/truststore.properties
+++ b/systests/ws-security/src/test/resources/truststore.properties
@@ -1,20 +1,22 @@
#
-# 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
+# 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.
#
-# 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.
#
org.apache.wss4j.crypto.provider=org.apache.wss4j.common.crypto.Merlin
org.apache.wss4j.crypto.merlin.keystore.type=jks
diff --git a/systests/ws-specs/src/test/resources/logging.properties b/systests/ws-specs/src/test/resources/logging.properties
index 2c55af86a1..29daaab485 100644
--- a/systests/ws-specs/src/test/resources/logging.properties
+++ b/systests/ws-specs/src/test/resources/logging.properties
@@ -19,7 +19,7 @@
#
#
############################################################
-# Default Logging Configuration File
+# Default Logging Configuration File
#
# You can use a different file by specifying a filename
# with the java.util.logging.config.file system property.
@@ -27,7 +27,7 @@
############################################################
############################################################
-# Global properties
+# Global properties
############################################################
# "handlers" specifies a comma separated list of log Handler
(cxf) 06/06: Fix checkstyle violations (post-merge)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 67235fc386e448a791e0a9d4db0c5c72cf029095
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Feb 14 10:06:12 2026 -0500
Fix checkstyle violations (post-merge)
---
.../src/test/resources/clientKeystore.properties | 30 ++++++++++++----------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/services/sts/systests/sts-itests/src/test/resources/clientKeystore.properties b/services/sts/systests/sts-itests/src/test/resources/clientKeystore.properties
index 8ab391e11e..daba35d13f 100644
--- a/services/sts/systests/sts-itests/src/test/resources/clientKeystore.properties
+++ b/services/sts/systests/sts-itests/src/test/resources/clientKeystore.properties
@@ -1,20 +1,22 @@
#
-# 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
+# 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.
#
-# 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.
#
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
org.apache.ws.security.crypto.merlin.keystore.type=jks
(cxf) 01/06: Bump org.apache.maven.plugins:maven-dependency-plugin (#2881)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 9fdaa017a205e5286faf70595b05cf9e249c9062
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Wed Feb 11 16:16:45 2026 -0500
Bump org.apache.maven.plugins:maven-dependency-plugin (#2881)
Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.9.0 to 3.10.0.
- [Release notes](https://github.com/apache/maven-dependency-plugin/releases)
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.9.0...maven-dependency-plugin-3.10.0)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
dependency-version: 3.10.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 7e7c6f009f5c55edac6e27f547720fd4493adb0c)
(cherry picked from commit 12107e7b9770ed8c2aa911d139148075a268fbc7)
(cherry picked from commit d4e93550dd015656cc884d3e3fa9bb29831739ce)
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0652891e3a..c8927273a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -555,7 +555,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>3.9.0</version>
+ <version>3.10.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
(cxf) 02/06: Bump cxf.openfeign.version from 13.6 to 13.7 (#2882)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 32ab34b54e560d942bc61a65578cdad0e70ff03e
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Thu Feb 12 09:36:20 2026 -0500
Bump cxf.openfeign.version from 13.6 to 13.7 (#2882)
Bumps `cxf.openfeign.version` from 13.6 to 13.7.
Updates `io.github.openfeign:feign-core` from 13.6 to 13.7
- [Release notes](https://github.com/openfeign/feign/releases)
- [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openfeign/feign/compare/13.6...13.7)
Updates `io.github.openfeign:feign-httpclient` from 13.6 to 13.7
- [Release notes](https://github.com/openfeign/feign/releases)
- [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openfeign/feign/compare/13.6...13.7)
Updates `io.github.openfeign:feign-micrometer` from 13.6 to 13.7
- [Release notes](https://github.com/openfeign/feign/releases)
- [Changelog](https://github.com/OpenFeign/feign/blob/master/CHANGELOG.md)
- [Commits](https://github.com/openfeign/feign/compare/13.6...13.7)
---
updated-dependencies:
- dependency-name: io.github.openfeign:feign-core
dependency-version: '13.7'
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.github.openfeign:feign-httpclient
dependency-version: '13.7'
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: io.github.openfeign:feign-micrometer
dependency-version: '13.7'
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 a588cea88313aeba6442bee4cba85e895e069eba)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
(cherry picked from commit 1d685ddc87f6a61af52371095a426bf63acfb11b)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
(cherry picked from commit ce3790de6794c17d4d1230c936da58672a91abc2)
# Conflicts:
# distribution/src/main/release/samples/pom.xml
---
distribution/src/main/release/samples/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 0dd25f5862..1e4858da83 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -43,7 +43,7 @@
<cxf.brave.version>5.17.0</cxf.brave.version>
<cxf.camel.version>3.21.1</cxf.camel.version>
<cxf.olingo.version>4.10.0</cxf.olingo.version>
- <cxf.openfeign.version>13.6</cxf.openfeign.version>
+ <cxf.openfeign.version>13.7</cxf.openfeign.version>
</properties>
<dependencies>
<dependency>
(cxf) 05/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 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e93745b55a7cd46e0a64ecbe46a492326f8cdf61
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Sat Feb 14 09:31:02 2026 -0500
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 4faa1a02eb..1cace91467 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -193,6 +193,7 @@ B 74a498b03a883c73c9fed91e2ab6ebcf539a3d51
B 74ad79e5d5b8afe679ca046d735e8889aedea76c
B 74f2150627dcf63611974c1403ab699b4f97513d
B 7686878e906b9817279a98c80ffcb4949cdbdd26
+B 790569ebd2382a2d0ef3abfe6ed55faa7fa03b3d
B 7956c5a25351d0dbab7aa7e42466d8d035cbfe68
B 79ee9824ee30b1b710d7385efc3cec736b4a5c54
B 7a3ea8f4eddc07adad81bfacc24e74609d038196
@@ -240,6 +241,7 @@ B 97fcd08e4f1f41736240d7dacac1f08ed250e83d
B 98fee994fc05cf2d6a563f995aeaae4f25e54d35
B 990d3332d34fbfff4291256d0cd5eadedb510bc2
B 9967b754b2489f1812d2dd7792e8082a09f39ecf
+B 996eb74508775fc73886e7a2ed3862326a2facc4
B 9a1030bedece67963d9d4eb2eb1027bf96efbef0
B 9ad83fbc8628c94cd50dbe74e7cc613e6980eab2
B 9b97793fa0ba0fccefdd82bcbe7322d354d43c8c
@@ -414,6 +416,7 @@ B f35d8ae18b51088f7238a0af6b9caaca4da8ef95
B f3e15e52c7d27d5734d3716dc3beb9a19f879387
B f51d661070bef444f4bf85010b4d0cb5ab906e69
B f562f066bec44c467241fbced55b78ad6ab77420
+B f5ca0bb8342bc7d81fd29fe699dc968653756166
B f5d736649b1b2da83d0dfce947d9ef460031d7d8
B f627b954d6fa2c7728fef81b75044d0dc7924623
B f6593b3dbcf9810febc79213195546e43bf04e06
@@ -789,6 +792,7 @@ M 3b5bd6d81dcd3171faa1546e86e18864f587c2ac
M 3b700961ead8a1c23ef945275bfe4defe22ea81d
M 3b9d2c483dc9b309e4d93784ae4df928e8f42cae
M 3ba08991d5e7b6b411b6809700f74a1ae7c2cf91
+M 3ba66ff36da5ba64d334b0fe6c07abb94628f067
M 3bb96d88dbdf6a82ae8281de51662599785ebba4
M 3c2300b5bf3bf5e1710dbdf489bc3e508a026082
M 3c282bdd2b95049c8a112eb656da385d980460b0
@@ -1623,6 +1627,7 @@ M cddb748c23c4f7a1854dfffc525a4a63edc06ee2
M cde59dafde1d0aa03553cc765a17ccbdeeeb2cb1
M ce035b5bb81fe65f18b352d4164b18e75b03fe0e
M ce3004fb845088d06f3f207f868c80a45150b1c6
+M ce3790de6794c17d4d1230c936da58672a91abc2
M ce3c1420e09fb348753c021c8d61946fba2c4fe7
M ce53e5ffd5d9a1a419b8f051038706fb8ebb1e0d
M ce5520cdd419b1063f001a3e74023d53acf5bab1
@@ -1862,6 +1867,7 @@ M f756c887ffd822f416d530a780d7c03f612b44b8
M f7687d6626912bdde45c32a838d79d4dcdfff049
M f777e929a674e8f02bb8320a77174396ec4233b8
M f78cc69360de919ab4a6bf709a76d6fbb51bde50
+M f7a04748ae3fdbeddc44a42b3099adeb2c95892f
M f7a0874f0870fb2bae31393a72370b2d87daa0e2
M f7d157d8090576a5874b9afb098ba65f5328c1b1
M f7ee79ad15aba200088863f1cc262f14c73106f8