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 9166c747d61b7b84ed7ba642f9e7372d1a6af4d6
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Jun 5 12:26:54 2025 -0400

    Bump org.apache.maven.plugins:maven-pmd-plugin from 3.23.0 to 3.26.0 (#2432)
    
    * Bump org.apache.maven.plugins:maven-pmd-plugin from 3.23.0 to 3.26.0
    
    Bumps 
[org.apache.maven.plugins:maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin)
 from 3.23.0 to 3.26.0.
    - [Release notes](https://github.com/apache/maven-pmd-plugin/releases)
    - 
[Commits](https://github.com/apache/maven-pmd-plugin/compare/maven-pmd-plugin-3.23.0...maven-pmd-plugin-3.26.0)
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.maven.plugins:maven-pmd-plugin
      dependency-version: 3.26.0
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    
    * Bump net.sourceforge.pmd:pmd-java from 7.13.0 to 7.14.0
    
    Bumps [net.sourceforge.pmd:pmd-java](https://github.com/pmd/pmd) from 
7.13.0 to 7.14.0.
    - [Release notes](https://github.com/pmd/pmd/releases)
    - 
[Changelog](https://github.com/pmd/pmd/blob/main/docs/render_release_notes.rb)
    - 
[Commits](https://github.com/pmd/pmd/compare/pmd_releases/7.13.0...pmd_releases/7.14.0)
    
    ---
    updated-dependencies:
    - dependency-name: net.sourceforge.pmd:pmd-java
      dependency-version: 7.14.0
      dependency-type: direct:production
      update-type: version-update:semver-minor
    ...
    
    Signed-off-by: dependabot[bot] <[email protected]>
    
    * Update maven-fluido-skin plugin
    
    * Fix PMD violations
    
    ---------
    
    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: Andriy Redko <[email protected]>
    (cherry picked from commit 63c18b6f865a40ac31c1bd996cb28398c4c75960)
    (cherry picked from commit 0f4320b4c4c388dec87125b45bc6eb4dc554d4c6)
    
    # Conflicts:
    #       
integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationTracerContext.java
---
 .../cxf/common/injection/ResourceInjector.java     |  2 +-
 .../org/apache/cxf/common/logging/LogUtils.java    |  4 +-
 .../databinding/source/XMLStreamDataWriter.java    |  1 -
 .../AbstractAttributedInterceptorProvider.java     |  2 +-
 .../cxf/interceptor/AnnotationInterceptors.java    |  2 +-
 .../cxf/interceptor/LoggingOutInterceptor.java     |  4 +-
 .../service/invoker/spring/SpringBeanFactory.java  |  2 +-
 .../apache/cxf/jca/core/logging/LoggerHelper.java  | 10 ++---
 .../cxf/tracing/brave/BraveTracerContext.java      |  2 +-
 .../opentelemetry/OpenTelemetryContext.java        |  2 +-
 .../tracing/opentracing/OpenTracingContext.java    |  2 +-
 .../cxf/maven_plugin/ClassLoaderSwitcher.java      |  4 +-
 .../cxf/maven_plugin/ClassLoaderSwitcher.java      |  4 +-
 .../maven_plugin/common/ClassLoaderSwitcher.java   |  2 +-
 parent/pom.xml                                     |  6 +--
 .../binding/corba/types/CorbaPrimitiveHandler.java |  2 +-
 .../org/apache/cxf/aegis/type/basic/TimeType.java  |  2 +-
 .../apache/cxf/aegis/type/basic/TimestampType.java |  2 +-
 .../apache/cxf/aegis/type/collection/MapType.java  |  2 +-
 .../cxf/aegis/type/java5/AnnotationReader.java     |  6 +--
 .../cxf/aegis/util/date/XsDateTimeFormat.java      |  2 +-
 .../cxf/aegis/type/java5/CollectionService.java    |  4 +-
 .../type/java5/CollectionServiceInterface.java     |  4 +-
 .../type/java5/map/StudentServiceDocLiteral.java   |  2 +-
 .../java5/map/StudentServiceDocLiteralImpl.java    |  2 +-
 .../apache/cxf/jaxb/JAXBContextInitializer.java    |  2 +-
 .../java/org/apache/cxf/jaxb/JAXBDataBinding.java  |  2 +-
 .../org/apache/cxf/jaxrs/impl/UriBuilderImpl.java  |  2 +-
 .../cxf/jaxrs/interceptor/JAXRSOutInterceptor.java |  2 +-
 .../org/apache/cxf/jaxrs/utils/InjectionUtils.java |  6 +--
 .../test/java/org/apache/cxf/jaxrs/Customer.java   |  2 +-
 .../jaxrs/provider/JAXBElementProviderTest.java    |  2 +-
 .../apache/cxf/jaxrs/utils/InjectionUtilsTest.java | 10 ++---
 .../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java |  2 +-
 .../apache/cxf/jaxrs/utils/ResourceUtilsTest.java  |  4 +-
 .../cxf/jaxws/context/WrappedAttachmentsTest.java  |  6 +--
 .../org/apache/cxf/jaxrs/client/WebClient.java     |  4 +-
 .../apache/cxf/jaxrs/model/wadl/WadlGenerator.java |  2 +-
 .../cxf/jaxrs/provider/json/JSONProviderTest.java  |  2 +-
 .../client/proxy/MicroProfileClientProxyImpl.java  |  2 -
 .../microprofile/client/sse/SseSubscription.java   |  2 +-
 .../oauth2/client/JoseClientCodeStateManager.java  |  2 +-
 .../rs/security/oauth2/common/OAuthPermission.java |  4 +-
 .../oauth2/provider/AbstractOAuthDataProvider.java |  2 +-
 .../apache/cxf/transport/jms/JMSDestination.java   |  2 +-
 .../apache/cxf/transport/jms/util/JMSSender.java   |  2 +-
 .../apache/cxf/transport/jms/util/JndiHelper.java  |  2 +-
 .../cxf/transport/jms/JMSDestinationTest.java      |  2 +-
 .../jetty10/Jetty10WebSocketDestination.java       |  2 +-
 .../org/apache/cxf/ws/policy/PolicyEngineImpl.java |  2 +-
 .../cxf/ws/rm/persistence/PersistenceUtils.java    |  2 +-
 .../cxf/ws/rm/persistence/jdbc/RMTxStore.java      |  2 +-
 .../cxf/ws/rm/soap/RetransmissionQueueImpl.java    |  2 +-
 .../security/wss4j/AttachmentCallbackHandler.java  |  2 +-
 .../org/apache/cxf/sts/request/RequestParser.java  |  2 +-
 .../org/apache/cxf/common/logging/LogUtils.java    |  2 +-
 .../apache/cxf/xkms/x509/repo/ldap/LdapSearch.java |  2 +-
 src/site/site.xml                                  |  2 +-
 .../apache/cxf/systests/cdi/base/Injections.java   | 50 +++++++++++-----------
 .../rest/client/JaxrsHeaderPropagationTest.java    |  2 +-
 .../corba/processors/wsdl/WSDLToIDLAction.java     |  2 +-
 .../cxf/tools/wadlto/jaxrs/SourceGenerator.java    |  2 +-
 .../wsdlto/databinding/jaxb/JAXBDataBinding.java   |  2 +-
 .../jaxws/customization/CustomizationParser.java   |  2 +-
 64 files changed, 111 insertions(+), 114 deletions(-)

diff --git 
a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java 
b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
index 583ac0a27a..8e9950ec8f 100644
--- a/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
+++ b/core/src/main/java/org/apache/cxf/common/injection/ResourceInjector.java
@@ -149,7 +149,7 @@ public class ResourceInjector extends 
AbstractAnnotationVisitor {
     // Implementation of org.apache.cxf.common.annotation.AnnotationVisitor
 
     @Override
-    public final void visitClass(final Class<?> clz, final Annotation 
annotation) { //NOPMD
+    public final void visitClass(final Class<?> clz, final Annotation 
annotation) {
 
         assert annotation instanceof Resource || annotation instanceof 
Resources : annotation;
 
diff --git a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java 
b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
index 09727e68a3..d34016a316 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/LogUtils.java
@@ -279,10 +279,10 @@ public final class LogUtils {
 
             Logger logger;
             try {
-                logger = Logger.getLogger(loggerName, bundleName); //NOPMD
+                logger = Logger.getLogger(loggerName, bundleName);
             } catch (IllegalArgumentException | MissingResourceException ex) {
                 //likely a mismatch on the bundle name, just return the default
-                logger = Logger.getLogger(loggerName); //NOPMD
+                logger = Logger.getLogger(loggerName);
             }
             
             return logger;
diff --git 
a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java 
b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
index fa019753e0..7cfbb20b42 100644
--- 
a/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
+++ 
b/core/src/main/java/org/apache/cxf/databinding/source/XMLStreamDataWriter.java
@@ -68,7 +68,6 @@ public class XMLStreamDataWriter implements 
DataWriter<XMLStreamWriter> {
         write(obj, output);
     }
 
-    @SuppressWarnings("PMD.UseTryWithResources")
     public void write(Object obj, XMLStreamWriter writer) {
         Closeable toClose = null;
         try {            
diff --git 
a/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java
 
b/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java
index c1bcac80e6..7cfb94a6b8 100644
--- 
a/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java
+++ 
b/core/src/main/java/org/apache/cxf/interceptor/AbstractAttributedInterceptorProvider.java
@@ -84,7 +84,7 @@ public abstract class AbstractAttributedInterceptorProvider 
extends ConcurrentHa
     }
 
     @Override
-    public int hashCode() {     //NOPMD
+    public int hashCode() {
         return super.hashCode();
     }
 
diff --git 
a/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java 
b/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
index 14acee922c..e8c20adf77 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
@@ -64,7 +64,7 @@ public class AnnotationInterceptors {
     }
 
     @SuppressWarnings("unchecked")
-    private <T> Class<? extends T>[] getAnnotationObjectClasses(Annotation 
ann, Class<T> type) { //NOPMD
+    private <T> Class<? extends T>[] getAnnotationObjectClasses(Annotation 
ann, Class<T> type) {
         if (ann instanceof InFaultInterceptors) {
             return (Class<? extends T>[])((InFaultInterceptors)ann).classes();
         } else if (ann instanceof InInterceptors) {
diff --git 
a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java 
b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
index f07a8fe24c..c6d2d662ff 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/LoggingOutInterceptor.java
@@ -140,7 +140,7 @@ public class LoggingOutInterceptor extends 
AbstractLoggingInterceptor {
     private class LogWriter extends FilterWriter {
         StringWriter out2;
         int count;
-        Logger logger; //NOPMD
+        Logger logger;
         Message message;
         final int lim;
 
@@ -203,7 +203,7 @@ public class LoggingOutInterceptor extends 
AbstractLoggingInterceptor {
 
         private final Message message;
         private final OutputStream origStream;
-        private final Logger logger; //NOPMD
+        private final Logger logger;
         private final int lim;
 
         LoggingCallback(final Logger logger, final Message msg, final 
OutputStream os) {
diff --git 
a/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java
 
b/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java
index 8df1c68499..f98483df38 100644
--- 
a/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java
+++ 
b/core/src/main/java/org/apache/cxf/service/invoker/spring/SpringBeanFactory.java
@@ -40,7 +40,7 @@ public class SpringBeanFactory implements Factory, 
ApplicationContextAware {
     public SpringBeanFactory(String name) {
         beanName = name;
     }
-    public SpringBeanFactory(Class<?> c, String[] args) {       //NOPMD
+    public SpringBeanFactory(Class<?> c, String[] args) {
         beanName = args[0];
     }
 
diff --git 
a/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java
 
b/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java
index 6991270f8c..cfe4f98276 100644
--- 
a/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java
+++ 
b/integration/jca/src/main/java/org/apache/cxf/jca/core/logging/LoggerHelper.java
@@ -65,7 +65,7 @@ public final class LoggerHelper {
 
     // true if log output is already going somewhere
     public static boolean loggerInitialisedOutsideConnector() {
-        final Handler[] handlers = getConsoleLogger().getHandlers(); //NOPMD
+        final Handler[] handlers = getConsoleLogger().getHandlers();
         return handlers != null && handlers.length > 0;
     }
 
@@ -81,14 +81,14 @@ public final class LoggerHelper {
     }
 
     public static void disableConsoleLogging() {
-        final Handler handler = getHandler(getConsoleLogger(), 
CONSOLE_HANDLER);  //NOPMD
-        getConsoleLogger().removeHandler(handler);  //NOPMD
+        final Handler handler = getHandler(getConsoleLogger(), 
CONSOLE_HANDLER);
+        getConsoleLogger().removeHandler(handler);
     }
 
     public static void enableConsoleLogging() {
-        if (getHandler(getConsoleLogger(), CONSOLE_HANDLER) == null) {  //NOPMD
+        if (getHandler(getConsoleLogger(), CONSOLE_HANDLER) == null) {
             final Handler console = new ConsoleHandler();
-            getConsoleLogger().addHandler(console);  //NOPMD
+            getConsoleLogger().addHandler(console);
         }
     }
 
diff --git 
a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
 
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
index f23f78c71e..cf66888474 100644
--- 
a/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
+++ 
b/integration/tracing/tracing-brave/src/main/java/org/apache/cxf/tracing/brave/BraveTracerContext.java
@@ -58,7 +58,7 @@ public class BraveTracerContext implements TracerContext {
             scope = tracer.withSpanInScope(continuationSpan);
         }
 
-        try { //NOPMD
+        try {
             return traceable.call(new BraveTracerContext(brave));
         } finally {
             if (continuationSpan != null && scope != null) {
diff --git 
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryContext.java
 
b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryContext.java
index 5acd465592..8c7430f6a4 100644
--- 
a/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryContext.java
+++ 
b/integration/tracing/tracing-opentelemetry/src/main/java/org/apache/cxf/tracing/opentelemetry/OpenTelemetryContext.java
@@ -57,7 +57,7 @@ public class OpenTelemetryContext implements TracerContext {
             scope = continuation.makeCurrent();
         }
 
-        try { // NOPMD
+        try {
             return traceable.call(new OpenTelemetryContext(tracer));
         } finally {
             if (continuation != null && scope != null) {
diff --git 
a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingContext.java
 
b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingContext.java
index 4755aa738b..aac91c7468 100644
--- 
a/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingContext.java
+++ 
b/integration/tracing/tracing-opentracing/src/main/java/org/apache/cxf/tracing/opentracing/OpenTracingContext.java
@@ -54,7 +54,7 @@ public class OpenTracingContext implements TracerContext {
             scope = tracer.scopeManager().activate(continuation);
         }
 
-        try { //NOPMD
+        try {
             return traceable.call(new OpenTracingContext(tracer));
         } finally {
             if (continuation != null && scope != null) {
diff --git 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index aa9bc5d2ca..daf7ed052e 100644
--- 
a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ 
b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -41,12 +41,12 @@ import org.apache.maven.project.MavenProject;
  */
 public class ClassLoaderSwitcher {
 
-    private Log log; //NOPMD
+    private Log log;
     private String origClassPath;
     private Properties origProps;
     private ClassLoader origContextClassloader;
 
-    public ClassLoaderSwitcher(Log log) { //NOPMD
+    public ClassLoaderSwitcher(Log log) {
         this.log = log;
     }
 
diff --git 
a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
 
b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
index c96a6add99..2c130b476b 100644
--- 
a/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
+++ 
b/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
@@ -38,12 +38,12 @@ import org.apache.maven.project.MavenProject;
  */
 public class ClassLoaderSwitcher {
 
-    private Log log; //NOPMD
+    private Log log;
     private String origClassPath;
     private Properties origProps;
     private ClassLoader origContextClassloader;
 
-    public ClassLoaderSwitcher(Log log) { //NOPMD
+    public ClassLoaderSwitcher(Log log) {
         this.log = log;
     }
 
diff --git 
a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
 
b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
index 59ff0b3e0e..6078ee0e71 100644
--- 
a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
+++ 
b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ClassLoaderSwitcher.java
@@ -43,7 +43,7 @@ import org.apache.maven.project.MavenProject;
 // TODO: Move to the common plugin module
 public class ClassLoaderSwitcher {
 
-    private Log log;    //NOPMD
+    private Log log;
     private String origClassPath;
     private Properties origProps;
     private ClassLoader origContextClassloader;
diff --git a/parent/pom.xml b/parent/pom.xml
index 72f67abf2b..03b22ebe66 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -424,7 +424,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.23.0</version>
+                    <version>3.26.0</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.cxf.build-utils</groupId>
@@ -434,12 +434,12 @@
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-core</artifactId>
-                            <version>7.13.0</version>
+                            <version>7.14.0</version>
                         </dependency>
                         <dependency>
                             <groupId>net.sourceforge.pmd</groupId>
                             <artifactId>pmd-java</artifactId>
-                            <version>7.13.0</version>
+                            <version>7.14.0</version>
                         </dependency>
                     </dependencies>
                     <configuration>
diff --git 
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
 
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
index da15deea02..37dad3699d 100644
--- 
a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
+++ 
b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/types/CorbaPrimitiveHandler.java
@@ -205,7 +205,7 @@ public class CorbaPrimitiveHandler extends 
CorbaObjectHandler {
             obj = Character.valueOf(data.charAt(0));
             break;
         case TCKind._tk_octet:
-            obj = Short.valueOf(data).byteValue(); //NOPMD
+            obj = Short.valueOf(data).byteValue();
             break;
         case TCKind._tk_short:
             obj = Short.valueOf(data);
diff --git 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java
 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java
index 65c47f4d96..424fa60c72 100644
--- 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java
+++ 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java
@@ -46,7 +46,7 @@ public class TimeType extends AegisType {
         try {
             synchronized (format) {
                 Calendar c = (Calendar)format.parseObject(value.trim());
-                return new Time(c.getTimeInMillis()); //NOPMD
+                return new Time(c.getTimeInMillis());
             }
         } catch (ParseException e) {
             throw new DatabindingException("Could not parse xs:dateTime: " + 
e.getMessage(), e);
diff --git 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java
 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java
index c70d78e04f..ff75860701 100644
--- 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java
+++ 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java
@@ -46,7 +46,7 @@ public class TimestampType extends AegisType {
         try {
             synchronized (format) {
                 Calendar c = (Calendar)format.parseObject(value.trim());
-                return new Timestamp(c.getTimeInMillis()); //NOPMD
+                return new Timestamp(c.getTimeInMillis());
             }
         } catch (ParseException e) {
             throw new DatabindingException("Could not parse xs:dateTime: " + 
e.getMessage(), e);
diff --git 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
index aa944655cc..ad064f4960 100644
--- 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
+++ 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java
@@ -128,7 +128,7 @@ public class MapType extends AegisType {
         Class<?> cls = getTypeClass();
         if (cls.equals(Map.class)) {
             map = new HashMap<>();
-        } else if (cls.equals(Hashtable.class)) { //NOPMD
+        } else if (cls.equals(Hashtable.class)) {
             map = new Hashtable<>();
         } else if (cls.equals(ConcurrentMap.class)) {
             map = new ConcurrentHashMap<>();
diff --git 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
index bd1e2485a6..b4bb597830 100644
--- 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
+++ 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java
@@ -60,7 +60,7 @@ public class AnnotationReader {
     }
 
     public Boolean isNillable(AnnotatedElement element) {
-        return Boolean.TRUE.equals(getAnnotationValue("nillable", // NOPMD
+        return Boolean.TRUE.equals(getAnnotationValue("nillable",
                 element,
                 Boolean.FALSE,
                 XmlElement.class,
@@ -70,7 +70,7 @@ public class AnnotationReader {
         if (anns == null) {
             return null;
         }
-        return (Boolean)getAnnotationValue("nillable", // NOPMD
+        return (Boolean)getAnnotationValue("nillable",
                 anns,
                 XmlElement.class,
                 XML_ELEMENT);
@@ -257,7 +257,7 @@ public class AnnotationReader {
     }
 
     @SafeVarargs
-    private static boolean isAnnotationPresent(AnnotatedElement element, // 
NOPMD
+    private static boolean isAnnotationPresent(AnnotatedElement element,
             Class<? extends Annotation>... annotations) {
         for (Class<?> annotation : annotations) {
             if (annotation != null && 
element.isAnnotationPresent(annotation.asSubclass(Annotation.class))) {
diff --git 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
index c18d7b6e11..9e4e27e99b 100644
--- 
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
+++ 
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/util/date/XsDateTimeFormat.java
@@ -147,7 +147,7 @@ public class XsDateTimeFormat extends Format {
             TimeZone tz = cal.getTimeZone();
             // JDK 1.4: int offset = tz.getOffset(cal.getTimeInMillis());
             int offset = cal.get(Calendar.ZONE_OFFSET);
-            if (tz.inDaylightTime(cal.getTime())) { //NOPMD
+            if (tz.inDaylightTime(cal.getTime())) {
                 offset += cal.get(Calendar.DST_OFFSET);
             }
             if (offset == 0) {
diff --git 
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
 
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
index a0fd90d42c..2428d84d03 100644
--- 
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
+++ 
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionService.java
@@ -75,11 +75,11 @@ public class CollectionService implements 
CollectionServiceInterface {
     }
 
     //CHECKSTYLE:OFF
-    public String takeUnsortedSet(HashSet<String> strings) { //NOPMD
+    public String takeUnsortedSet(HashSet<String> strings) {
         return Integer.toString(strings.size());
     }
 
-    public String takeArrayList(ArrayList<String> strings) { //NOPMD
+    public String takeArrayList(ArrayList<String> strings) {
         return strings.get(0);
     }
     //CHECKSTYLE:ON
diff --git 
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
 
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
index 0dc7724b9b..f7c469d4f1 100644
--- 
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
+++ 
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/CollectionServiceInterface.java
@@ -44,9 +44,9 @@ public interface CollectionServiceInterface {
     String takeSortedStrings(SortedSet<String> strings);
 
     //CHECKSTYLE:OFF
-    String takeUnsortedSet(HashSet<String> strings); //NOPMD
+    String takeUnsortedSet(HashSet<String> strings);
     String takeStack(Stack<String> strings);
-    String takeArrayList(ArrayList<String> strings); //NOPMD
+    String takeArrayList(ArrayList<String> strings);
     //CHECKSTYLE:ON
 
     void method1(List<String> headers1);
diff --git 
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java
 
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java
index b1b9a1e017..bad35e2ce8 100644
--- 
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java
+++ 
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteral.java
@@ -38,6 +38,6 @@ public interface StudentServiceDocLiteral {
     List<Student> getStudentsByIds(List<String> ids);
 
     //CHECKSTYLE:OFF
-    void takeMapMap(HashMap<String, HashMap<String, Student>> myComplexData); 
//NOPMD
+    void takeMapMap(HashMap<String, HashMap<String, Student>> myComplexData);
 
 }
diff --git 
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
 
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
index b04f695055..8499fc5c9a 100644
--- 
a/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
+++ 
b/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/map/StudentServiceDocLiteralImpl.java
@@ -64,7 +64,7 @@ public class StudentServiceDocLiteralImpl implements 
StudentServiceDocLiteral {
     }
 
     //CHECKSTYLE:OFF
-    public void takeMapMap(HashMap<String, HashMap<String, Student>> 
myComplexData) { //NOPMD
+    public void takeMapMap(HashMap<String, HashMap<String, Student>> 
myComplexData) {
         // original failure was explosion on this, no need to bother to fill 
it in.
     }
 
diff --git 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
index 7d20ebbf88..5f193e7dd5 100644
--- 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
+++ 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
@@ -543,7 +543,7 @@ class JAXBContextInitializer extends ServiceModelVisitor {
         }
         if (refClass != null) {
             try {
-                return refClass.getConstructor(QName.class, Type.class, new 
Annotation[0].getClass()) //NOPMD
+                return refClass.getConstructor(QName.class, Type.class, new 
Annotation[0].getClass())
                     .newInstance(n, cls, new Annotation[0]);
             } catch (Throwable e) {
                 //ignore
diff --git 
a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java 
b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
index 70d8478512..fd291d52d9 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
@@ -225,7 +225,7 @@ public class JAXBDataBinding extends 
AbstractInterceptorProvidingDataBinding
 
     public JAXBDataBinding(Class<?>... classes) throws JAXBException {
         contextClasses = new LinkedHashSet<>(Arrays.asList(classes));
-        setContext(createJAXBContext(contextClasses)); //NOPMD - specifically 
allow this
+        setContext(createJAXBContext(contextClasses));
     }
     public JAXBDataBinding(boolean qualified, Map<String, Object> props) 
throws JAXBException {
         this(qualified);
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
index 9b12c2b967..b13d2d2e61 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/UriBuilderImpl.java
@@ -294,7 +294,7 @@ public class UriBuilderImpl extends UriBuilder implements 
Cloneable {
         }
     }
     //CHECKSTYLE:OFF
-    private String substituteVarargs(URITemplate templ, //NOPMD
+    private String substituteVarargs(URITemplate templ,
                                      Map<String, Object> alreadyResolvedTs,
                                      Map<String, Object> 
alreadyResolvedTsPathEnc,
                                      Map<String, Object> alreadyResolvedTsEnc,
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
index ad75c0fdb6..4124fb3d86 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
@@ -245,7 +245,7 @@ public class JAXRSOutInterceptor extends 
AbstractOutDatabindingInterceptor {
         boolean enabled = checkBufferingMode(message, writers, firstTry);
         try {
 
-            try {       // NOPMD
+            try {
                 JAXRSUtils.writeMessageBody(writers,
                         entity,
                         targetType,
diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
index 2aaf1baf0a..01514b35cf 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java
@@ -941,11 +941,11 @@ public final class InjectionUtils {
     static Class<?> getCollectionType(Class<?> rawType) {
         Class<?> type = null;
         if (SortedSet.class.isAssignableFrom(rawType)) {
-            type = TreeSet.class; //NOPMD
+            type = TreeSet.class;
         } else if (Set.class.isAssignableFrom(rawType)) {
-            type = HashSet.class; //NOPMD
+            type = HashSet.class;
         } else if (Collection.class.isAssignableFrom(rawType)) {
-            type = ArrayList.class; //NOPMD
+            type = ArrayList.class;
         }
         return type;
 
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
index d731c29249..4c31071a8c 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java
@@ -476,7 +476,7 @@ public class Customer extends AbstractCustomer implements 
CustomerInfo {
     }
 
 //  CHECKSTYLE:OFF
-    public void testWrongType(@QueryParam("p1") HashMap<?, ?> map) { //NOPMD
+    public void testWrongType(@QueryParam("p1") HashMap<?, ?> map) {
         // complete
     }
 //  CHECKSTYLE:ON
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
index e761aa4f9f..f96e436b2d 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/JAXBElementProviderTest.java
@@ -950,7 +950,7 @@ public class JAXBElementProviderTest {
         };
 
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        provider.writeTo(list, ArrayList.class, type, //NOPMD
+        provider.writeTo(list, ArrayList.class, type,
             new Annotation[0], MediaType.TEXT_XML_TYPE, new 
MetadataMap<String, Object>(), bos);
 
         String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
index 5b33a40b60..fbe226aabf 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/InjectionUtilsTest.java
@@ -91,10 +91,10 @@ public class InjectionUtilsTest {
 
     @Test
     public void testCollectionType() {
-        assertEquals(ArrayList.class, 
InjectionUtils.getCollectionType(Collection.class)); //NOPMD
-        assertEquals(ArrayList.class, 
InjectionUtils.getCollectionType(List.class)); //NOPMD
-        assertEquals(HashSet.class, 
InjectionUtils.getCollectionType(Set.class)); //NOPMD
-        assertEquals(TreeSet.class, 
InjectionUtils.getCollectionType(SortedSet.class)); //NOPMD
+        assertEquals(ArrayList.class, 
InjectionUtils.getCollectionType(Collection.class));
+        assertEquals(ArrayList.class, 
InjectionUtils.getCollectionType(List.class));
+        assertEquals(HashSet.class, 
InjectionUtils.getCollectionType(Set.class));
+        assertEquals(TreeSet.class, 
InjectionUtils.getCollectionType(SortedSet.class));
     }
 
     @Test
@@ -194,7 +194,7 @@ public class InjectionUtilsTest {
         assertEquals(String.class, str);
         ParameterizedType list = (ParameterizedType) 
InjectionUtils.getGenericResponseType(
             GenericInterface.class.getMethod("list"), TestService.class,
-            new ArrayList<>(), ArrayList.class, new ExchangeImpl()); //NOPMD
+            new ArrayList<>(), ArrayList.class, new ExchangeImpl());
         assertEquals(String.class, list.getActualTypeArguments()[0]);
     }
 
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
index 2eee35bada..e4f37743b3 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java
@@ -1114,7 +1114,7 @@ public class JAXRSUtilsTest {
 
     @Test
     public void testWrongType() throws Exception {
-        Class<?>[] argType = {HashMap.class}; //NOPMD
+        Class<?>[] argType = {HashMap.class};
         Method m = Customer.class.getMethod("testWrongType", argType);
         Message messageImpl = createMessage();
         messageImpl.put(Message.QUERY_STRING, "p1=1");
diff --git 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
index a584bd4414..fdf2011b59 100644
--- 
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
+++ 
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/ResourceUtilsTest.java
@@ -73,7 +73,7 @@ public class ResourceUtilsTest {
     @Test
     public void testClassResourceInfoUserResource() throws Exception {
         UserResource ur = new UserResource();
-        ur.setName(HashMap.class.getName()); //NOPMD
+        ur.setName(HashMap.class.getName());
         ur.setPath("/hashmap");
         UserOperation op = new UserOperation();
         op.setPath("/key/{id}");
@@ -89,7 +89,7 @@ public class ResourceUtilsTest {
         assertNotNull(cri);
         assertEquals("/hashmap", cri.getURITemplate().getValue());
         Method method =
-            HashMap.class.getMethod("get", new Class[]{Object.class}); //NOPMD
+            HashMap.class.getMethod("get", new Class[]{Object.class});
         OperationResourceInfo ori = 
cri.getMethodDispatcher().getOperationResourceInfo(method);
         assertNotNull(ori);
         assertEquals("/key/{id}", ori.getURITemplate().getValue());
diff --git 
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
 
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
index 20e2445f7f..c1a046ca7e 100644
--- 
a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
+++ 
b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/context/WrappedAttachmentsTest.java
@@ -74,15 +74,15 @@ public class WrappedAttachmentsTest {
 
         assertEquals(1, attachments.size());
 
-        Attachment[] atts = attachments.toArray(new Attachment[0]); //NOPMD - 
explicitly test this
+        Attachment[] atts = attachments.toArray(new Attachment[0]);
         assertEquals(1, atts.length);
         assertEquals("att-1".equals(attx.getId()) ? "att-2" : "att-1", 
atts[0].getId());
 
-        atts = attachments.toArray(new Attachment[attachments.size()]); 
//NOPMD - explicitly test this
+        atts = attachments.toArray(new Attachment[attachments.size()]);
         assertEquals(1, atts.length);
         assertEquals("att-1".equals(attx.getId()) ? "att-2" : "att-1", 
atts[0].getId());
 
-        Object[] o = attachments.toArray(); //NOPMD - explicitly test this
+        Object[] o = attachments.toArray();
         assertEquals(1, o.length);
         Attachment a = (Attachment)o[0];
         assertEquals("att-1".equals(attx.getId()) ? "att-2" : "att-1", 
a.getId());
diff --git 
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java 
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
index 77ecb641d7..1612c5ae10 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/WebClient.java
@@ -1065,7 +1065,7 @@ public class WebClient extends AbstractClient {
                                    inAnns, respClass, outType, exchange, 
invContext);
     }
     //CHECKSTYLE:OFF
-    protected Response doChainedInvocation(String httpMethod, //NOPMD
+    protected Response doChainedInvocation(String httpMethod,
                                            MultivaluedMap<String, String> 
headers,
                                            Object body,
                                            Class<?> requestClass,
@@ -1099,7 +1099,7 @@ public class WebClient extends AbstractClient {
     }
 
     //CHECKSTYLE:OFF
-    private Message finalizeMessage(String httpMethod, //NOPMD
+    private Message finalizeMessage(String httpMethod,
                                    MultivaluedMap<String, String> headers,
                                    Object body,
                                    Class<?> requestClass,
diff --git 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 58c478b679..0121cde4ee 100644
--- 
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ 
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -599,7 +599,7 @@ public class WadlGenerator implements 
ContainerRequestFilter {
     }
 
     // CHECKSTYLE:OFF
-    protected boolean handleOperation(StringBuilder sb, Set<Class<?>> 
jaxbTypes, //NOPMD
+    protected boolean handleOperation(StringBuilder sb, Set<Class<?>> 
jaxbTypes,
                                       ElementQNameResolver qnameResolver, 
Map<Class<?>, QName> clsMap,
                                       OperationResourceInfo ori, 
Map<Parameter, Object> classParams,
                                       OperationResourceInfo nextOp, boolean 
resourceTagOpened,
diff --git 
a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
 
b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
index bc4991834d..efbf7c4a86 100644
--- 
a/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
+++ 
b/rt/rs/extensions/providers/src/test/java/org/apache/cxf/jaxrs/provider/json/JSONProviderTest.java
@@ -1421,7 +1421,7 @@ public class JSONProviderTest {
         };
 
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        provider.writeTo(list, ArrayList.class, type, //NOPMD
+        provider.writeTo(list, ArrayList.class, type,
             new Annotation[0], MediaType.TEXT_XML_TYPE, new 
MetadataMap<String, Object>(), bos);
         String expected =
             "{\"tagholders\":["
diff --git 
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
 
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
index b2ed089a04..672efbe2f0 100644
--- 
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
+++ 
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/proxy/MicroProfileClientProxyImpl.java
@@ -110,7 +110,6 @@ public class MicroProfileClientProxyImpl extends 
ClientProxyImpl {
     private final TLSConfiguration tlsConfig;
 
     //CHECKSTYLE:OFF
-    @SuppressWarnings("PMD.ExcessiveParameterList")
     public MicroProfileClientProxyImpl(URI baseURI, ClassLoader loader, 
ClassResourceInfo cri,
                                        boolean isRoot, boolean inheritHeaders, 
ExecutorService executorService,
                                        Configuration configuration, 
CDIInterceptorWrapper interceptorWrapper,
@@ -127,7 +126,6 @@ public class MicroProfileClientProxyImpl extends 
ClientProxyImpl {
         init(executorService, configuration);
     }
 
-    @SuppressWarnings("PMD.ExcessiveParameterList")
     public MicroProfileClientProxyImpl(ClientState initialState, ClassLoader 
loader, ClassResourceInfo cri,
                                        boolean isRoot, boolean inheritHeaders, 
ExecutorService executorService,
                                        Configuration configuration, 
CDIInterceptorWrapper interceptorWrapper,
diff --git 
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/sse/SseSubscription.java
 
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/sse/SseSubscription.java
index 64bbd1cae4..226db34081 100644
--- 
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/sse/SseSubscription.java
+++ 
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/sse/SseSubscription.java
@@ -40,7 +40,7 @@ public class SseSubscription implements Subscription {
     private final AtomicBoolean completed = new AtomicBoolean();
     private final AtomicBoolean canceled = new AtomicBoolean();
     //CHECKSTYLE:OFF
-    private final LinkedList<InboundSseEvent> buffer = new LinkedList<>(); 
//NOPMD
+    private final LinkedList<InboundSseEvent> buffer = new LinkedList<>();
     //CHECKSTYLE:ON
     private final AtomicInteger bufferSize = new 
AtomicInteger(DEFAULT_BUFFER_SIZE);
 
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/JoseClientCodeStateManager.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/JoseClientCodeStateManager.java
index b0fffa49f9..d6cab7ce91 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/JoseClientCodeStateManager.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/client/JoseClientCodeStateManager.java
@@ -109,7 +109,7 @@ public class JoseClientCodeStateManager implements 
ClientCodeStateManager {
         String json = jws.getUnsignedEncodedSequence();
 
         Map<String, List<String>> map = CastUtils.cast((Map<?, 
?>)jsonp.fromJson(json));
-        return (MultivaluedMap<String, String>)map; //NOPMD
+        return (MultivaluedMap<String, String>)map;
     }
 
     public void setSignatureProvider(JwsSignatureProvider signatureProvider) {
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
index a8486ac7d6..52c1345911 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
@@ -193,8 +193,8 @@ public class OAuthPermission implements Serializable {
             || getDescription() != null && 
!getDescription().equals(that.getDescription())) {
             return false;
         }
-        if (isInvisibleToClient() != that.isInvisibleToClient() //NOPMD
-            || isDefaultPermission() != that.isDefaultPermission()) { //NOPMD
+        if (isInvisibleToClient() != that.isInvisibleToClient()
+            || isDefaultPermission() != that.isDefaultPermission()) {
             return false;
         }
 
diff --git 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
index 6844c97cab..695c0aed6e 100644
--- 
a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
+++ 
b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java
@@ -101,7 +101,7 @@ public abstract class AbstractOAuthDataProvider implements 
OAuthDataProvider, Cl
     }
 
     //CHECKSTYLE:OFF
-    protected ServerAccessToken doCreateAccessToken(List<String> audiences, 
//NOPMD
+    protected ServerAccessToken doCreateAccessToken(List<String> audiences,
                                                     Client client,
                                                     String clientCodeVerifier,
                                                     Map<String, String> 
extraProperties,
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
index aeaae4fd37..706bd4c842 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
@@ -121,7 +121,7 @@ public class JMSDestination extends 
AbstractMultiplexDestination implements Mess
 
     private JMSListenerContainer createTargetDestinationListener() {
         Session session = null;
-        try { // NOPMD - UseTryWithResources
+        try {
             ExceptionListener exListener = new ExceptionListener() {
                 private boolean restartTriggered;
 
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JMSSender.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JMSSender.java
index e1ce8ecf49..d8595ea4db 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JMSSender.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JMSSender.java
@@ -48,7 +48,7 @@ public class JMSSender {
     public void sendMessage(Session session, Destination targetDest,
                             javax.jms.Message message) throws JMSException {
         MessageProducer producer = null;
-        try { // NOPMD - UseTryWithResources
+        try {
             producer = session.createProducer(targetDest);
             if (explicitQosEnabled) {
                 producer.send(message, deliveryMode, priority, timeToLive);
diff --git 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JndiHelper.java
 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JndiHelper.java
index 37904909a4..81ff0f6a57 100644
--- 
a/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JndiHelper.java
+++ 
b/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/util/JndiHelper.java
@@ -49,7 +49,7 @@ public class JndiHelper {
     @SuppressWarnings("unchecked")
     public <T> T lookup(final String name, Class<T> requiredType) throws 
NamingException {
         Context ctx = new InitialContext(this.environment);
-        try { // NOPMD - UseTryWithResources
+        try {
             Object located = ctx.lookup(name);
             if (located == null) {
                 throw new NameNotFoundException("JNDI object with [" + name + 
"] not found");
diff --git 
a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
 
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
index 46db4fb099..7dffe59463 100644
--- 
a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
+++ 
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/JMSDestinationTest.java
@@ -201,7 +201,7 @@ public class JMSDestinationTest extends AbstractJMSTester {
     public void testDurableInvalidClientId() throws Throwable {
         Connection con = cf1.createConnection();
         JMSDestination destination = null;
-        try { // NOPMD - UseTryWithResources
+        try {
             con.setClientID("testClient");
             con.start();
             EndpointInfo ei = setupServiceInfo("HelloWorldPubSubService", 
"HelloWorldPubSubPort");
diff --git 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty10/Jetty10WebSocketDestination.java
 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty10/Jetty10WebSocketDestination.java
index 8a444a6b01..cf74906498 100644
--- 
a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty10/Jetty10WebSocketDestination.java
+++ 
b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty10/Jetty10WebSocketDestination.java
@@ -293,7 +293,7 @@ public class Jetty10WebSocketDestination extends 
JettyHTTPDestination implements
             return session.getUpgradeRequest().getRequestURI().getPath();
         }
         public StringBuffer getRequestURL() {
-            return new 
StringBuffer(session.getUpgradeRequest().getRequestURI().toString()); //NOPMD
+            return new 
StringBuffer(session.getUpgradeRequest().getRequestURI().toString());
         }
         public DispatcherType getDispatcherType() {
             return null;
diff --git 
a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java 
b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
index 6944ff3207..75fde427b1 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyEngineImpl.java
@@ -318,7 +318,7 @@ public class PolicyEngineImpl implements PolicyEngine, 
BusExtension {
         return getEndpointPolicy(ei, false, assertor, m);
     }
 
-    private EndpointPolicy getEndpointPolicy(//NOPMD
+    private EndpointPolicy getEndpointPolicy(
         EndpointInfo ei,
         boolean isRequestor,
         Assertor assertor,
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java
index 79740b319d..2f4dd20de5 100644
--- 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java
+++ 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/PersistenceUtils.java
@@ -65,7 +65,7 @@ public final class PersistenceUtils {
     public SequenceAcknowledgement deserialiseAcknowledgment(InputStream is) {
         Object obj = null;
         XMLStreamReader reader = StaxUtils.createXMLStreamReader(is);
-        try {  //NOPMD
+        try {
             obj = getContext().createUnmarshaller().unmarshal(reader);
             if (obj instanceof JAXBElement<?>) {
                 JAXBElement<?> el = (JAXBElement<?>)obj;
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
index 7a90b180de..2f5ac77d82 100644
--- 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
+++ 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/persistence/jdbc/RMTxStore.java
@@ -834,7 +834,7 @@ public class RMTxStore implements RMStore {
             return;
         }
 
-        try {   //NOPMD
+        try {
             con.setAutoCommit(true);
             try (Statement stmt = con.createStatement()) {
                 stmt.executeUpdate(CREATE_SRC_SEQUENCES_TABLE_STMT);
diff --git 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
index 1c4fbccbf1..59ab60d349 100644
--- 
a/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
+++ 
b/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/soap/RetransmissionQueueImpl.java
@@ -741,7 +741,7 @@ public class RetransmissionQueueImpl implements 
RetransmissionQueue {
 
     private void doResend(SoapMessage message) {
         InputStream is = null;
-        try {   //NOPMD
+        try {
 
             // initialize copied interceptor chain for message
             PhaseInterceptorChain retransmitChain = 
manager.getRetransmitChain(message);
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
index 6f99f58e45..9986a52962 100644
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AttachmentCallbackHandler.java
@@ -133,7 +133,7 @@ public class AttachmentCallbackHandler implements 
CallbackHandler {
         boolean removeAttachments
     ) throws IOException {
         // Calling LazyAttachmentCollection.size() here to force it to load 
the attachments
-        if (attachments != null && attachments.size() > 0) { // NOPMD
+        if (attachments != null && attachments.size() > 0) {
             for (Iterator<org.apache.cxf.message.Attachment> iterator = 
attachments.iterator();
                 iterator.hasNext();) {
                 org.apache.cxf.message.Attachment attachment = iterator.next();
diff --git 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
index 38000d2912..6c438b5bd5 100644
--- 
a/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
+++ 
b/services/sts/sts-core/src/main/java/org/apache/cxf/sts/request/RequestParser.java
@@ -226,7 +226,7 @@ public class RequestParser {
         } else if (QNameConstants.ENCRYPT_WITH.equals(jaxbElement.getName())) {
             String encryptWith = (String)jaxbElement.getValue();
             keyRequirements.setEncryptWith(encryptWith);
-        } else if (QNameConstants.REQUEST_TYPE.equals(jaxbElement.getName())) 
{ //NOPMD
+        } else if (QNameConstants.REQUEST_TYPE.equals(jaxbElement.getName())) {
             // Skip the request type.
         } else {
             return false;
diff --git 
a/services/wsn/wsn-osgi/src/main/java/org/apache/cxf/common/logging/LogUtils.java
 
b/services/wsn/wsn-osgi/src/main/java/org/apache/cxf/common/logging/LogUtils.java
index d6b7e4dafa..7991aa16d0 100644
--- 
a/services/wsn/wsn-osgi/src/main/java/org/apache/cxf/common/logging/LogUtils.java
+++ 
b/services/wsn/wsn-osgi/src/main/java/org/apache/cxf/common/logging/LogUtils.java
@@ -30,7 +30,7 @@ public final class LogUtils {
     private LogUtils() { }
 
     public static Logger getL7dLogger(Class<?> cls) {
-        return Logger.getLogger(cls.getName(), null); //NOPMD
+        return Logger.getLogger(cls.getName(), null);
     }
 
 }
diff --git 
a/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapSearch.java
 
b/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapSearch.java
index fc8a2605ef..5a252a53a0 100644
--- 
a/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapSearch.java
+++ 
b/services/xkms/xkms-x509-repo-ldap/src/main/java/org/apache/cxf/xkms/x509/repo/ldap/LdapSearch.java
@@ -57,7 +57,7 @@ public class LdapSearch {
 
     //CHECKSTYLE:OFF
     private InitialDirContext createInitialContext() throws NamingException {
-        Hashtable<String, String> env = new Hashtable<>(5); //NOPMD
+        Hashtable<String, String> env = new Hashtable<>(5);
         env.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, 
"com.sun.jndi.ldap.LdapCtxFactory");
         env.put(javax.naming.Context.PROVIDER_URL, ldapuri);
         env.put(javax.naming.Context.SECURITY_AUTHENTICATION, 
SECURITY_AUTHENTICATION);
diff --git a/src/site/site.xml b/src/site/site.xml
index 3201362755..7f6163b80c 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -22,7 +22,7 @@ under the License.
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.0</version>
+        <version>2.1.0</version>
     </skin>
     <body>
         <breadcrumbs>
diff --git 
a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/Injections.java
 
b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/Injections.java
index b76bdec45f..198fc526aa 100644
--- 
a/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/Injections.java
+++ 
b/systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/Injections.java
@@ -49,93 +49,93 @@ public class Injections {
 
     @Inject
     @ContextResolved
-    private Application cxfApplication; //NOPMD
+    private Application cxfApplication;
 
     @Inject
-    private UriInfo uriInfo; //NOPMD
+    private UriInfo uriInfo;
 
     @Inject
     @ContextResolved
-    private UriInfo cxfUriInfo; //NOPMD
+    private UriInfo cxfUriInfo;
 
     @Inject
-    private HttpHeaders httpHeaders; //NOPMD
+    private HttpHeaders httpHeaders;
 
     @Inject
     @ContextResolved
-    private HttpHeaders cxfHttpHeaders; //NOPMD
+    private HttpHeaders cxfHttpHeaders;
 
     @Inject
-    private Request request; //NOPMD
+    private Request request;
 
     @Inject
     @ContextResolved
-    private Request cxfRequest; //NOPMD
+    private Request cxfRequest;
 
     @Inject
-    private SecurityContext securityContext; //NOPMD
+    private SecurityContext securityContext;
 
     @Inject
     @ContextResolved
-    private SecurityContext cxfSecurityContext; //NOPMD
+    private SecurityContext cxfSecurityContext;
 
     @Inject
-    private Providers providers; //NOPMD
+    private Providers providers;
 
     @Inject
     @ContextResolved
-    private Providers cxfProviders; //NOPMD
+    private Providers cxfProviders;
 
     @SuppressWarnings("rawtypes")
     @Inject
-    private ContextResolver contextResolver; //NOPMD
+    private ContextResolver contextResolver;
 
     @SuppressWarnings("rawtypes")
     @Inject
     @ContextResolved
-    private ContextResolver cxfContextResolver; //NOPMD
+    private ContextResolver cxfContextResolver;
 
     @Inject
-    private HttpServletRequest httpServletRequest; //NOPMD
+    private HttpServletRequest httpServletRequest;
 
     @Inject
     @ContextResolved
-    private HttpServletRequest cxfHttpServletRequest; //NOPMD
+    private HttpServletRequest cxfHttpServletRequest;
 
     @Inject
-    private HttpServletResponse httpServletResponse; //NOPMD
+    private HttpServletResponse httpServletResponse;
 
     @Inject
     @ContextResolved
-    private HttpServletRequest cxfhttpServletResponse; //NOPMD
+    private HttpServletRequest cxfhttpServletResponse;
 
     @Inject
-    private ServletContext servletContext; //NOPMD
+    private ServletContext servletContext;
 
     @Inject
     @ContextResolved
-    private ServletContext cxfServletContext; //NOPMD
+    private ServletContext cxfServletContext;
 
     @Inject
-    private ResourceContext resourceContext; //NOPMD
+    private ResourceContext resourceContext;
 
     @Inject
     @ContextResolved
-    private ResourceContext cxfResourceContext; //NOPMD
+    private ResourceContext cxfResourceContext;
 
     @Inject
-    private ResourceInfo resourceInfo; //NOPMD
+    private ResourceInfo resourceInfo;
 
     @Inject
     @ContextResolved
-    private ResourceInfo cxfResourceInfo; //NOPMD
+    private ResourceInfo cxfResourceInfo;
 
     @Inject
-    private Configuration configuration; //NOPMD
+    private Configuration configuration;
 
     @Inject
     @ContextResolved
-    private Configuration cxfConfiguration; //NOPMD
+    private Configuration cxfConfiguration;
 
     public String state() {
         return Stream.of(Injections.class.getDeclaredFields())
diff --git 
a/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/JaxrsHeaderPropagationTest.java
 
b/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/JaxrsHeaderPropagationTest.java
index 02fbc6a4b6..cf800ba1be 100644
--- 
a/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/JaxrsHeaderPropagationTest.java
+++ 
b/systests/microprofile/client/jaxrs/src/test/java/org/apache/cxf/systest/microprofile/rest/client/JaxrsHeaderPropagationTest.java
@@ -87,7 +87,7 @@ public class JaxrsHeaderPropagationTest extends 
AbstractClientServerTestBase {
     @Test
     public void testHeadersArePropagated() throws Exception {
         Logger logger = 
-            
Logger.getLogger("org.eclipse.microprofile.rest.client.ext.DefaultClientHeadersFactoryImpl");
 //NOPMD
+            
Logger.getLogger("org.eclipse.microprofile.rest.client.ext.DefaultClientHeadersFactoryImpl");
         logger.setLevel(Level.ALL);
         ConsoleHandler h = new ConsoleHandler();
         h.setLevel(Level.ALL);
diff --git 
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
 
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
index 950807cd31..470cc2d5a8 100644
--- 
a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
+++ 
b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToIDLAction.java
@@ -529,7 +529,7 @@ public class WSDLToIDLAction {
                     scope.promoteHeldToScope();
                     result = intf;
                     intf = storedIntf;
-                } catch (Exception ex) { //NOPMD
+                } catch (Exception ex) {
                     String msgStr = "Interface type " + intf.fullName() + " 
not found.";
                     org.apache.cxf.common.i18n.Message msg =
                         new org.apache.cxf.common.i18n.Message(msgStr, LOG);
diff --git 
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
 
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
index f390f29247..651bed3c99 100644
--- 
a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
+++ 
b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
@@ -1179,7 +1179,7 @@ public class SourceGenerator {
         sbCode.append(localName).append(' ');
     }
     //CHECKSTYLE:OFF: ParameterNumber
-    private void writeRequestTypes(Element requestEl, //NOPMD
+    private void writeRequestTypes(Element requestEl,
                                    String classPackage,
                                    Element repElement,
                                    List<Element> inParamEls,
diff --git 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
index 4c00788a8e..427d760008 100644
--- 
a/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
+++ 
b/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java
@@ -682,7 +682,7 @@ public class JAXBDataBinding implements DataBindingProfile {
             }
             if (key.startsWith("file:") || key.startsWith("jar:")) {
                 InputStream in = null;
-                try {   //NOPMD
+                try {
                     if (key.startsWith("file:")) {
                         in = Files.newInputStream(new File(new 
URI(key)).toPath());
                     } else {
diff --git 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
index 8321a0727a..6b0c65d490 100644
--- 
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
+++ 
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
@@ -148,7 +148,7 @@ public final class CustomizationParser {
             }
             
             XMLStreamReader reader = null;
-            try {   //NOPMD
+            try {
                 reader = StaxUtils.createXMLStreamReader(uri, 
resolver.getInputStream());
                 doc = StaxUtils.read(reader, true);
             } catch (Exception e) {

Reply via email to