You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2018/10/24 10:11:50 UTC

[cxf] branch master updated: Fixing up some array declarations

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

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


The following commit(s) were added to refs/heads/master by this push:
     new b6e9e29  Fixing up some array declarations
b6e9e29 is described below

commit b6e9e297a253e8b6e285e009d57ab8964065939a
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Oct 24 11:11:34 2018 +0100

    Fixing up some array declarations
---
 .../cxf/performance/server/BenchmarkServer.java    |  2 +-
 .../cxf/performance/basic_type/client/Client.java  |  2 +-
 .../cxf/performance/basic_type/server/Server.java  |  2 +-
 .../performance/complex_type/client/Client.java    |  2 +-
 .../performance/complex_type/server/Server.java    |  2 +-
 .../performance/complex_type/client/Client.java    |  6 +-
 .../performance/complex_type/server/Server.java    |  2 +-
 bin/DoMerges.java                                  |  6 +-
 .../cxf/attachment/AttachmentDeserializer.java     |  2 +-
 .../cxf/attachment/MimeBodyPartInputStream.java    |  4 +-
 .../org/apache/cxf/bus/extension/Extension.java    |  4 +-
 .../cxf/bus/extension/ExtensionManagerImpl.java    |  4 +-
 .../org/apache/cxf/bus/osgi/OSGIBusListener.java   |  2 +-
 .../BusApplicationContextResourceResolver.java     |  2 +-
 .../apache/cxf/bus/spring/SpringBusFactory.java    |  6 +-
 .../java/org/apache/cxf/common/jaxb/JAXBUtils.java | 10 ++--
 .../common/logging/AbstractDelegatingLogger.java   | 20 +++----
 .../java/org/apache/cxf/common/util/ASMHelper.java |  4 +-
 .../apache/cxf/common/util/Base64OutputStream.java |  2 +-
 .../java/org/apache/cxf/common/util/Compiler.java  |  4 +-
 .../org/apache/cxf/common/util/StringUtils.java    |  4 +-
 .../cxf/databinding/AbstractWrapperHelper.java     |  2 +-
 .../databinding/source/XMLStreamDataWriter.java    |  2 +-
 .../java/org/apache/cxf/endpoint/ClientImpl.java   |  2 +-
 .../java/org/apache/cxf/helpers/FileUtils.java     |  2 +-
 .../main/java/org/apache/cxf/helpers/IOUtils.java  |  2 +-
 .../apache/cxf/interceptor/StaxInInterceptor.java  |  2 +-
 .../NameDigestPasswordCallbackHandler.java         |  2 +-
 .../security/NamePasswordCallbackHandler.java      |  2 +-
 .../java/org/apache/cxf/io/CachedOutputStream.java |  6 +-
 .../main/java/org/apache/cxf/io/CachedWriter.java  |  8 +--
 .../java/org/apache/cxf/message/MessageImpl.java   |  2 +-
 .../factory/AnnotationsFactoryBeanListener.java    |  2 +-
 .../service/model/AbstractPropertiesHolder.java    | 10 ++--
 .../java/org/apache/cxf/staxutils/StaxUtils.java   |  2 +-
 .../cxf/staxutils/StreamWriterContentHandler.java  |  4 +-
 .../cxf/workqueue/AutomaticWorkQueueImpl.java      |  2 +-
 .../cxf/attachment/AttachmentDeserializerTest.java | 10 ++--
 .../apache/cxf/common/util/Base64UtilityTest.java  | 12 ++--
 .../aegis/src/main/java/demo/hw/client/Client.java |  2 +-
 .../aegis/src/main/java/demo/hw/server/Server.java |  2 +-
 .../antbuild/src/demo/hw_http/client/Client.java   |  2 +-
 .../antbuild/src/demo/hw_http/server/Server.java   |  2 +-
 .../src/main/java/demo/callback/client/Client.java |  2 +-
 .../src/main/java/demo/callback/server/Server.java |  2 +-
 .../src/main/java/demo/stream/client/Client.java   |  2 +-
 .../src/main/java/demo/stream/server/Server.java   |  2 +-
 .../bank/src/main/java/cxf/client/Client.java      |  2 +-
 .../bank/src/main/java/cxf/server/Server.java      |  2 +-
 .../src/main/java/corba/client/Client.java         |  2 +-
 .../src/main/java/corba/server/Server.java         |  2 +-
 .../src/main/java/cxf/client/Client.java           |  2 +-
 .../src/main/java/cxf/server/Server.java           |  2 +-
 .../src/main/java/corba/client/Client.java         |  2 +-
 .../src/main/java/corba/server/Server.java         |  2 +-
 .../src/main/java/cxf/client/Client.java           |  2 +-
 .../src/main/java/cxf/server/Server.java           |  2 +-
 .../src/main/java/demo/spring/client/Client.java   |  2 +-
 .../src/main/java/demo/spring/servlet/Server.java  |  2 +-
 .../main/java/demo/colocated/client/Client.java    |  2 +-
 .../colocated/client/DispatchSourceClient.java     |  2 +-
 .../main/java/demo/colocated/server/Server.java    |  2 +-
 .../src/main/java/demo/hw/client/Client.java       |  2 +-
 .../src/main/java/demo/hw/server/Server.java       |  2 +-
 .../src/main/java/demo/hw/client/Client.java       |  2 +-
 .../src/main/java/demo/hw/server/Server.java       |  2 +-
 .../src/main/java/demo/server/ServerJMS.java       |  2 +-
 .../src/main/java/demo/hw/client/Client.java       |  2 +-
 .../src/main/java/demo/hw/server/Server.java       |  2 +-
 .../src/main/java/demo/spring/client/Client.java   |  2 +-
 .../src/main/java/demo/spring/service/Server.java  |  2 +-
 .../src/main/java/demo/jaxrs/client/Client.java    |  2 +-
 .../src/main/java/demo/jaxrs/server/Server.java    |  2 +-
 .../src/main/java/httpsdemo/client/Client.java     |  2 +-
 .../src/main/java/httpsdemo/server/Server.java     |  2 +-
 .../src/main/java/demo/jaxrs/client/Client.java    |  2 +-
 .../src/main/java/demo/jaxrs/server/Server.java    |  2 +-
 .../java/demo/jaxrs/openapi/server/Server.java     |  2 +-
 .../java/demo/jaxrs/swagger/server/Server.java     |  2 +-
 .../java/demo/jaxrs/swagger/server/Server.java     |  2 +-
 .../odata/src/main/java/odata/server/Server.java   |  2 +-
 .../main/java/demo/jaxrs/search/client/Client.java |  2 +-
 .../main/java/demo/jaxrs/search/server/Server.java |  2 +-
 .../main/java/demo/jaxrs/server/simple/Server.java |  4 +-
 .../main/java/demo/jaxrs/server/socket/Server.java |  4 +-
 .../src/main/java/demo/jaxrs/client/Client.java    |  2 +-
 .../src/main/java/demo/jaxrs/servlet/Server.java   |  2 +-
 .../java/demo/jaxrs/tracing/server/Server.java     |  2 +-
 .../java/demo/jaxrs/tracing/server/Server.java     |  2 +-
 .../java/demo/jaxrs/tracing/server/Server.java     |  2 +-
 .../src/main/java/demo/jaxrs/client/Client.java    |  2 +-
 .../src/main/java/demo/jaxrs/server/Server.java    |  2 +-
 .../src/main/java/demo/hw/client/Client.java       |  2 +-
 .../src/main/java/demo/hw/server/Server.java       |  2 +-
 .../src/main/java/demo/hw/client/Client.java       |  2 +-
 .../src/main/java/demo/hw/server/Server.java       |  2 +-
 .../main/java/demo/hwDispatch/client/Client.java   |  2 +-
 .../main/java/demo/hwDispatch/server/Server.java   |  2 +-
 .../src/main/java/demo/handlers/server/Server.java |  2 +-
 .../java/demo/jaxws/tracing/client/Client.java     |  2 +-
 .../main/java/demo/jms_greeter/server/Server.java  |  2 +-
 .../main/java/demo/jms_greeter/server/Server.java  |  2 +-
 .../main/java/demo/jms_greeter/server/Server.java  |  2 +-
 .../client/CustomerServiceSpringClient.java        |  2 +-
 .../server/CustomerServiceSpringServer.java        |  2 +-
 .../src/main/java/demo/hw/server/Server.java       |  2 +-
 .../src/main/java/demo/hw/client/Client.java       |  2 +-
 .../src/main/java/demo/hw/client/Get.java          |  2 +-
 .../src/main/java/demo/hw/server/Server.java       |  2 +-
 .../src/main/java/demo/hw/server/Server.java       |  2 +-
 .../main/java/demo/hwDispatch/client/Client.java   |  2 +-
 .../src/main/java/demo/mtom/client/Client.java     |  2 +-
 .../src/main/java/demo/mtom/server/Server.java     |  2 +-
 .../src/main/java/demo/restful/client/Client.java  |  2 +-
 .../src/main/java/demo/restful/server/Server.java  |  2 +-
 .../src/main/java/demo/spring/client/Client.java   |  2 +-
 .../src/main/java/demo/spring/service/Server.java  |  2 +-
 .../main/java/demo/soap_header/client/Client.java  |  2 +-
 .../main/java/demo/soap_header/server/Server.java  |  2 +-
 .../src/main/java/demo/wssec/client/Client.java    |  2 +-
 .../src/main/java/demo/wssec/server/Server.java    |  2 +-
 .../sts/src/main/java/demo/wssec/sts/Server.java   |  2 +-
 .../main/java/demo/throttling/client/Client.java   |  2 +-
 .../main/java/demo/throttling/server/Server.java   |  2 +-
 .../java/demo/ws_addressing/client/Client.java     |  2 +-
 .../java/demo/ws_addressing/server/Server.java     |  2 +-
 .../main/java/demo/ws_policy/client/Client.java    |  2 +-
 .../main/java/demo/ws_policy/server/Server.java    |  2 +-
 .../src/main/java/demo/ws_rm/client/Client.java    |  2 +-
 .../src/main/java/demo/ws_rm/server/Server.java    |  2 +-
 .../src/main/java/demo/wssec/client/Client.java    |  2 +-
 .../main/java/demo/wssec/client/StaxClient.java    |  2 +-
 .../src/main/java/demo/wssec/server/Server.java    |  2 +-
 .../main/java/demo/wssec/server/StaxServer.java    |  2 +-
 .../src/main/java/demo/wssec/client/Client.java    |  2 +-
 .../src/main/java/demo/wssec/server/Server.java    |  2 +-
 .../ut/src/main/java/demo/wssec/client/Client.java |  2 +-
 .../main/java/demo/wssec/client/StaxClient.java    |  2 +-
 .../ut/src/main/java/demo/wssec/server/Server.java |  2 +-
 .../main/java/demo/wssec/server/StaxServer.java    |  2 +-
 .../src/main/java/demo/wssec/client/Client.java    |  2 +-
 .../src/main/java/demo/wssec/server/Server.java    |  2 +-
 .../client/CustomerServiceClient.java              |  2 +-
 .../client/CustomerServiceSpringClient.java        |  2 +-
 .../server/CustomerServiceServer.java              |  2 +-
 .../server/CustomerServiceSpringServer.java        |  2 +-
 .../src/main/java/demo/hw/server/Server.java       |  2 +-
 .../src/main/java/demo/hw/server/SpringServer.java |  2 +-
 .../src/main/java/demo/hw_https/client/Client.java |  2 +-
 .../java/demo/hw_https/client/ClientNonSpring.java |  2 +-
 .../src/main/java/demo/hw_https/server/Server.java |  2 +-
 .../src/main/java/demo/hw/client/Client.java       |  2 +-
 .../src/main/java/demo/hw/server/Server.java       |  2 +-
 .../src/main/java/demo/hwRPCLit/server/Server.java |  2 +-
 .../src/main/java/demo/hw/client/Client.java       |  2 +-
 .../src/main/java/demo/hw/server/Server.java       |  2 +-
 .../src/main/java/demo/hw/client/Client.java       |  2 +-
 .../src/main/java/demo/hw/server/Server.java       |  2 +-
 .../apache/cxf/jca/core/classloader/Handler.java   |  2 +-
 .../jca/core/classloader/PlugInClassLoader.java    |  6 +-
 .../core/classloader/PlugInClassLoaderHelper.java  |  2 +-
 .../cxf/handlers/InvokingInvocationHandler.java    |  2 +-
 .../jca/cxf/handlers/ProxyInvocationHandler.java   |  2 +-
 .../org/apache/cxf/jca/jarloader/JarLoader.java    |  6 +-
 .../cxf/jca/cxf/ManagedConnectionImplTest.java     |  4 +-
 .../cxf/maven_plugin/AbstractCodegenMoho.java      |  6 +-
 .../org/apache/cxf/maven_plugin/WsdlUtilities.java |  2 +-
 .../maven_plugin/wsdl2java/ForkOnceWSDL2Java.java  |  4 +-
 .../apache/cxf/maven_plugin/wsdl2java/Option.java  |  4 +-
 .../maven_plugin/wsdl2java/WsdlOptionLoader.java   |  4 +-
 .../wsdl2js/ForkOnceWSDL2Javascript.java           |  4 +-
 .../cxf/maven_plugin/javatowadl/DumpJavaDoc.java   |  2 +-
 .../maven_plugin/common/ForkOnceCodeGenerator.java |  4 +-
 .../wadlto/AbstractCodeGeneratorMojo.java          |  6 +-
 .../org/apache/cxf/maven_plugin/wadlto/Option.java |  6 +-
 .../cxf/maven_plugin/wadlto/OptionLoader.java      |  6 +-
 .../apache/cxf/maven_plugin/WSDLValidatorMojo.java |  4 +-
 .../corba/interceptors/SystemExceptionHelper.java  |  2 +-
 .../corba/utils/CorbaObjectReferenceHelper.java    |  2 +-
 .../corba/runtime/CorbaObjectReaderTest.java       |  4 +-
 .../corba/runtime/CorbaObjectWriterTest.java       |  4 +-
 .../binding/corba/types/CorbaArrayHandlerTest.java |  2 +-
 .../binding/corba/types/CorbaEnumHandlerTest.java  |  2 +-
 .../corba/types/CorbaSequenceHandlerTest.java      |  2 +-
 .../cxf/binding/soap/saaj/SAAJOutInterceptor.java  |  2 +-
 .../org/apache/cxf/jaxb/JAXBEncoderDecoder.java    |  2 +-
 .../org/apache/cxf/jaxb/WrapperHelperCompiler.java |  2 +-
 .../apache/cxf/jaxb/JAXBEncoderDecoderTest.java    |  2 +-
 .../java/org/apache/cxf/jaxws/DispatchImpl.java    |  2 +-
 .../org/apache/cxf/jaxws/JaxWsClientProxy.java     |  2 +-
 .../java/org/apache/cxf/jaxws/JaxWsClientTest.java |  2 +-
 .../cxf/jaxws/context/WrappedAttachmentsTest.java  |  2 +-
 .../java/org/apache/cxf/frontend/ClientProxy.java  |  2 +-
 .../cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java   |  2 +-
 .../cxf/rs/security/jose/jwe/JweOutputStream.java  |  2 +-
 .../jose/jws/EcDsaJwsSignatureProvider.java        |  4 +-
 .../jose/jws/EcDsaJwsSignatureVerifier.java        |  4 +-
 .../cxf/rs/security/jose/jws/JwsInputStream.java   |  2 +-
 .../rs/security/jose/jws/JwsJsonOutputStream.java  |  2 +-
 .../cxf/rs/security/jose/jws/JwsOutputStream.java  |  2 +-
 .../security/oauth2/utils/AuthorizationUtils.java  |  2 +-
 .../cxf/rs/security/saml/sso/MetadataWriter.java   |  2 +-
 .../cxf/rs/security/xml/XmlEncOutInterceptor.java  |  2 +-
 .../http/asyncclient/AsyncHTTPConduit.java         |  4 +-
 .../transport/http_jetty/JettyHTTPDestination.java |  2 +-
 .../http/netty/client/NettyHttpConduit.java        |  2 +-
 .../cxf/transport/http/CXFAuthenticator.java       |  2 +-
 .../org/apache/cxf/transport/http/HTTPConduit.java |  2 +-
 .../https/AliasedX509ExtendedKeyManager.java       |  2 +-
 .../transport/https/SSLSocketFactoryWrapper.java   |  2 +-
 .../apache/cxf/transport/servlet/CXFServlet.java   |  2 +-
 .../cxf/transport/jms/AbstractJMSTester.java       |  4 +-
 .../cxf/transport/jms/JMSDestinationTest.java      |  4 +-
 .../org/apache/cxf/transport/udp/UDPConduit.java   |  4 +-
 .../apache/cxf/transport/udp/UDPDestination.java   |  4 +-
 .../websocket/ahc/AhcWebSocketConduit.java         |  2 +-
 .../cxf/ws/policy/PolicyAnnotationListener.java    |  4 +-
 .../security/policy/interceptors/STSInvoker.java   |  4 +-
 .../SecureConversationInInterceptor.java           |  2 +-
 .../cxf/ws/security/trust/AbstractSTSClient.java   |  8 +--
 .../cxf/wsdl/service/factory/ClassReader.java      |  2 +-
 .../cxf/systest/sts/asymmetric_encr/STSServer.java |  2 +-
 .../systest/sts/asymmetric_encr/StaxSTSServer.java |  2 +-
 .../apache/cxf/systest/sts/batch/STSServer.java    |  2 +-
 .../systest/sts/batch/SimpleBatchSTSClient.java    |  4 +-
 .../cxf/systest/sts/batch/StaxSTSServer.java       |  2 +-
 .../cxf/systest/sts/cross_domain/STSServer.java    |  2 +-
 .../cxf/systest/sts/cross_domain/STSServer2.java   |  2 +-
 .../apache/cxf/systest/sts/custom/STSServer.java   |  2 +-
 .../systest/sts/custom_onbehalfof/STSServer.java   |  2 +-
 .../systest/sts/defaultstsprovider/STSServer.java  |  2 +-
 .../cxf/systest/sts/deployment/STSServer.java      |  2 +-
 .../cxf/systest/sts/deployment/StaxSTSServer.java  |  2 +-
 .../systest/sts/distributed_caching/STSServer.java |  2 +-
 .../sts/distributed_caching/STSServer2.java        |  2 +-
 .../apache/cxf/systest/sts/realms/STSServer.java   |  2 +-
 .../apache/cxf/systest/sts/realms/STSServer2.java  |  2 +-
 .../apache/cxf/systest/sts/renew/STSServer.java    |  2 +-
 .../apache/cxf/systest/sts/renew/STSServerPOP.java |  2 +-
 .../cxf/systest/sts/renew/StaxSTSServer.java       |  2 +-
 .../cxf/systest/sts/secure_conv/STSServer.java     |  2 +-
 .../cxf/systest/sts/secure_conv/StaxSTSServer.java |  2 +-
 .../systest/sts/sts_sender_vouches/STSServer.java  |  2 +-
 .../sts/sts_sender_vouches/StaxSTSServer.java      |  2 +-
 .../cxf/systest/sts/x509/AsymmetricServer.java     |  2 +-
 .../org/apache/cxf/systest/sts/x509/Server.java    |  2 +-
 .../apache/cxf/systest/sts/x509/StaxServer.java    |  2 +-
 .../cxf/ws/discovery/WSDiscoveryClientTest.java    |  2 +-
 .../cxf/systest/aegis/AegisClientServerTest.java   |  4 +-
 .../org/apache/cxf/systest/aegis/AegisServer.java  |  2 +-
 .../apache/cxf/systest/jaxb/MTOMBase64Test.java    |  4 +-
 .../java/org/apache/cxf/systest/jaxb/MTOMTest.java |  4 +-
 .../java/org/apache/cxf/systest/source/Server.java |  2 +-
 .../cxf/systest/jaxrs/BookContinuationClient.java  |  2 +-
 .../jaxrs/BookContinuationServlet3Server.java      |  2 +-
 .../cxf/systest/jaxrs/BookDataBindingServer.java   |  2 +-
 .../cxf/systest/jaxrs/BookNonSpringServer.java     |  2 +-
 .../cxf/systest/jaxrs/BookServerProxySpring.java   |  2 +-
 .../systest/jaxrs/BookServerRequestDispatch.java   |  2 +-
 .../jaxrs/BookServerResourceCreatedSpring.java     |  2 +-
 .../BookServerResourceCreatedSpringProviders.java  |  2 +-
 .../BookServerResourceJacksonSpringProviders.java  |  2 +-
 .../cxf/systest/jaxrs/BookServerRestSoap.java      |  2 +-
 .../cxf/systest/jaxrs/BookServerServletFilter.java |  2 +-
 .../apache/cxf/systest/jaxrs/BookServerSpring.java |  2 +-
 .../cxf/systest/jaxrs/JAXRSMultipartTest.java      |  2 +-
 .../systest/jaxrs/description/Swagger2Server.java  |  2 +-
 .../jaxrs/description/openapi/OpenApiServer.java   |  2 +-
 .../cxf/systest/jaxrs/nio/NioBookStoreServer.java  |  2 +-
 .../jaxrs/security/BookServerJaasSecurity.java     |  2 +-
 .../security/BookServerSecuritySpringClass.java    |  2 +-
 .../BookServerSecuritySpringInterface.java         |  2 +-
 .../BookServerSecuritySpringNoAnnotations.java     |  2 +-
 .../jaxrs/security/BookServerSimpleSecurity.java   |  2 +-
 .../cxf/systest/jaxws/ClientServerMiscTest.java    | 10 ++--
 .../jaxws/DocLitWrappedCodeFirstServiceImpl.java   |  2 +-
 .../cxf/systest/jaxws/JaxWsDynamicClientTest.java  |  2 +-
 .../systest/jaxws/RpcLitCodeFirstServiceImpl.java  |  4 +-
 .../cxf/systest/jaxws/cxf5064/HeaderObj.java       |  2 +-
 .../provider/ProviderRPCClientServerTest.java      |  2 +-
 .../cxf/systest/swa/ClientServerSwaTest.java       |  6 +-
 .../java/org/apache/cxf/systest/swa/Server.java    |  2 +-
 .../cxf/systest/swa/SwANoMimeServiceImpl.java      |  2 +-
 .../org/apache/cxf/systest/swa/SwAServiceImpl.java |  6 +-
 .../cxf/systest/kerberos/wssec/sts/STSServer.java  |  2 +-
 .../systest/kerberos/wssec/sts/StaxSTSServer.java  |  2 +-
 .../org/apache/cxf/systest/jms/JMSTestMtom.java    |  4 +-
 .../cxf/systest/jms/swa/ClientServerSwaTest.java   |  2 +-
 .../apache/cxf/systest/jms/swa/SwAServiceImpl.java |  6 +-
 .../apache/cxf/systest/http/auth/DigestServer.java |  2 +-
 .../apache/cxf/systest/mtom/ClientMtomXopTest.java |  4 +-
 .../org/apache/cxf/systest/stringarray/Server.java |  2 +-
 .../systest/type_test/AbstractTypeTestClient.java  | 30 +++++-----
 .../type_test/corba/CORBADocLitClientTypeTest.java |  4 +-
 .../type_test/corba/CORBADocLitServerImpl.java     |  2 +-
 .../type_test/soap/SOAPDocLitServerImpl.java       |  2 +-
 .../type_test/soap/SOAPRpcLitServerImpl.java       |  2 +-
 .../cxf/systest/type_test/xml/XMLServerImpl.java   |  2 +-
 .../ws/rm/AbstractClientPersistenceTest.java       |  4 +-
 .../ws/rm/AbstractServerPersistenceTest.java       |  4 +-
 .../apache/cxf/systest/ws/rm/RedeliveryTest.java   |  2 +-
 .../systest/ws/rm/ServiceInvocationAckBase.java    |  2 +-
 .../cxf/systest/ws/rm/WSRM12ServerCycleTest.java   |  4 +-
 .../systest/ws/policy/JavaFirstPolicyServer.java   |  2 +-
 .../cxf/systest/ws/policy/handler/Server.java      |  2 +-
 .../ws/addr_feature/FaultToEndpointServer.java     |  2 +-
 .../ws/policy/AddressingAnonymousPolicyTest.java   |  2 +-
 .../ws/policy/AddressingOptionalPolicyTest.java    |  2 +-
 .../apache/cxf/systest/ws/policy/RMPolicyTest.java |  2 +-
 .../apache/cxf/no_body_parts/NoBodyPartsImpl.java  |  2 +-
 .../cxf/testutil/recorders/InMessageRecorder.java  |  2 +-
 .../cxf/testutil/recorders/OutMessageRecorder.java |  2 +-
 .../cxf/tools/common/AbstractCXFToolContainer.java |  2 +-
 .../common/toolspec/AbstractToolContainer.java     |  2 +-
 .../tools/corba/common/idltypes/IdlScopeBase.java  |  6 +-
 .../tools/corba/common/idltypes/IdlScopedName.java |  2 +-
 .../corba/processors/wsdl/WSDLToCorbaBinding.java  |  2 +-
 .../corba/processors/wsdl/WSDLToCorbaHelper.java   |  2 +-
 .../corba/processors/wsdl/WSDLToIDLAction.java     | 12 ++--
 .../org/apache/cxf/tools/corba/IDLToWSDLTest.java  |  2 +-
 .../org/apache/cxf/tools/corba/WSDLToIDLTest.java  |  2 +-
 .../corba/processors/WSDLToIDLGenerationTest.java  | 64 +++++++++++-----------
 .../tools/java2js/processor/JavaToJSProcessor.java |  2 +-
 .../org/apache/cxf/tools/java2ws/JavaToWS.java     |  2 +-
 .../java2wsdl/processor/JavaToWSDLProcessor.java   |  2 +-
 .../processor/internal/jaxws/FaultBean.java        |  2 +-
 .../org/apache/cxf/tools/wadlto/WADLToJava.java    |  2 +-
 .../org/apache/cxf/tools/wsdlto/WSDLToJava.java    |  2 +-
 .../tools/wsdlto/javascript/WSDLToJavaScript.java  |  2 +-
 .../wsdlto/frontend/jaxws/JAXWS21Container.java    |  2 +-
 .../wsdlto/frontend/jaxws/JAXWSContainer.java      |  2 +-
 .../processor/internal/OperationProcessor.java     |  6 +-
 .../processor/internal/PortTypeProcessor.java      |  2 +-
 .../WrapperStyleNameCollisionValidator.java        |  2 +-
 334 files changed, 488 insertions(+), 488 deletions(-)

diff --git a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
index 00cd212..be4d527 100644
--- a/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
+++ b/benchmark/benchmark1/src/org/apache/cxf/performance/server/BenchmarkServer.java
@@ -35,7 +35,7 @@ public class BenchmarkServer{
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new BenchmarkServer();
         System.out.println("Server ready...");
         Thread.sleep(Integer.MAX_VALUE);
diff --git a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
index 109ebee..c75558e 100644
--- a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
+++ b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/client/Client.java
@@ -75,7 +75,7 @@ public final class Client extends TestCaseBase<BasicPortType> {
         System.out.println("      echoString");
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         Client client = new Client(args);
         client.initialize();
         if (client.getOperationName().equals("echoString")) {
diff --git a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
index 2c2cca3..4cce831 100644
--- a/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
+++ b/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
@@ -35,7 +35,7 @@ public class Server implements Runnable {
         this("http://localhost:20000/performance/basic_type/SoapPort");
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         Server server = new Server(args);
         server.run();
     }
diff --git a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
index 05aeed8..5af6a8c 100644
--- a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
+++ b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/client/Client.java
@@ -59,7 +59,7 @@ public final class Client extends TestCaseBase<ComplexPortType> {
         packetSize = 1;
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         Client client = new Client(args);
 
diff --git a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
index 9c1d07c..df4e1c5 100644
--- a/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
+++ b/benchmark/performance/complex_type/src/org/apache/cxf/performance/complex_type/server/Server.java
@@ -36,7 +36,7 @@ public class Server implements Runnable {
         this("http://localhost:20003/performance/complex_type/SoapPort");
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         Server server = new Server(args);
         server.run();
     }
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
index 6d39c9b..ba5cecc 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/client/Client.java
@@ -96,7 +96,7 @@ public final class Client extends TestCaseBase<DocPortType> {
         }
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         //workaround issue of xmlsec logging too much
         Logger.getLogger("org.apache.xml.security.signature.Reference").setLevel(Level.WARNING);
 
@@ -111,7 +111,7 @@ public final class Client extends TestCaseBase<DocPortType> {
             }
         }
         if (servIdx != -1) {
-            String tmp[] = new String[args.length - servIdx];
+            String[] tmp = new String[args.length - servIdx];
             System.arraycopy(args, servIdx, tmp, 0, args.length - servIdx);
             Server.main(tmp);
 
@@ -121,7 +121,7 @@ public final class Client extends TestCaseBase<DocPortType> {
         }
         List<String> threadList = new ArrayList<>();
         if (threadIdx != -1) {
-            String threads[] = args[threadIdx].split(",");
+            String[] threads = args[threadIdx].split(",");
             for (String s : threads) {
                 if (s.indexOf("-") != -1) {
                     String s1 = s.substring(0, s.indexOf("-"));
diff --git a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
index 66f8675..acd2479 100644
--- a/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
+++ b/benchmark/performance/soap_http_doc_lit/src/main/java/org/apache/cxf/performance/complex_type/server/Server.java
@@ -35,7 +35,7 @@ public class Server implements Runnable {
         System.out.println("Server published " + address);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         String host = "localhost";
         String protocol = "http";
         String cfg = null;
diff --git a/bin/DoMerges.java b/bin/DoMerges.java
index 80627fd..cd92cb4 100644
--- a/bin/DoMerges.java
+++ b/bin/DoMerges.java
@@ -347,14 +347,14 @@ public class DoMerges {
     }
     private static String getPatchId(String id) throws Exception {
 
-        String commands[] = new String[] { "git", "show", id};
+        String[] commands = new String[] { "git", "show", id};
         Process p = Runtime.getRuntime().exec(commands);
         InputStream in = p.getInputStream();
 
         commands = new String[] { "git", "patch-id"};
         Process p2 = Runtime.getRuntime().exec(commands);
         OutputStream out = p2.getOutputStream();
-        byte bytes[] = new byte[1024];
+        byte[] bytes = new byte[1024];
         int len = in.read(bytes);
         BufferedReader r2 = new BufferedReader(new InputStreamReader(p2.getInputStream()));
         while (len > 0) {
@@ -382,7 +382,7 @@ public class DoMerges {
         return line;
     }
 
-    public static void main(String a[]) throws Exception {
+    public static void main(String[] a) throws Exception {
         File file = new File(".git-commit-message.txt");
         if (file.exists()) {
             //make sure we delete this to not cause confusion
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
index 7f46ec5..5245447 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDeserializer.java
@@ -172,7 +172,7 @@ public class AttachmentDeserializer {
         InputStream is = message.getContent(InputStream.class);
         //boundary should definitely be in the first 2K;
         PushbackInputStream in = new PushbackInputStream(is, 4096);
-        byte buf[] = new byte[2048];
+        byte[] buf = new byte[2048];
         int i = in.read(buf);
         int len = i;
         while (i > 0 && len < buf.length) {
diff --git a/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java b/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
index e6cf9ce..23ab63d 100644
--- a/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
+++ b/core/src/main/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
@@ -43,8 +43,8 @@ public class MimeBodyPartInputStream extends InputStream {
         this.pbAmount = pbsize;
     }
 
-    public int read(byte buf[], int origOff, int origLen) throws IOException {
-        byte b[] = buf;
+    public int read(byte[] buf, int origOff, int origLen) throws IOException {
+        byte[] b = buf;
         int off = origOff;
         int len = origLen;
         if (boundaryFound || closed) {
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/Extension.java b/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
index ca30aa8..39ae7e6 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/Extension.java
@@ -42,7 +42,7 @@ public class Extension {
     protected String interfaceName;
     protected boolean deferred;
     protected Collection<String> namespaces = new ArrayList<>();
-    protected Object args[];
+    protected Object[] args;
     protected volatile Object obj;
     protected boolean optional;
     protected boolean notFound;
@@ -153,7 +153,7 @@ public class Extension {
         return namespaces;
     }
 
-    public void setArgs(Object a[]) {
+    public void setArgs(Object[] a) {
         args = a;
     }
 
diff --git a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
index 56e9604..e45aecd 100644
--- a/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
+++ b/core/src/main/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
@@ -68,7 +68,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
                                 Bus b) {
         this(new String[] {resource}, cl, initialExtensions, rm, b);
     }
-    public ExtensionManagerImpl(String resources[],
+    public ExtensionManagerImpl(String[] resources,
                                 ClassLoader cl,
                                 Map<Class<?>, Object> initialExtensions,
                                 ResourceManager rm,
@@ -93,7 +93,7 @@ public class ExtensionManagerImpl implements ExtensionManager, ConfiguredBeanLoc
         }
     }
 
-    final void load(String resources[]) {
+    final void load(String[] resources) {
         if (resources == null) {
             return;
         }
diff --git a/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java b/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
index 41e1e9b..15f00ac 100644
--- a/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
+++ b/core/src/main/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
@@ -61,7 +61,7 @@ public class OSGIBusListener implements BusLifeCycleListener {
     public OSGIBusListener(Bus b) {
         this(b, null);
     }
-    public OSGIBusListener(Bus b, Object args[]) {
+    public OSGIBusListener(Bus b, Object[] args) {
         bus = b;
         if (args != null && args.length > 0
             && args[0] instanceof BundleContext) {
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
index 607ec69..54cbbfd 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/BusApplicationContextResourceResolver.java
@@ -68,7 +68,7 @@ public class BusApplicationContextResourceResolver
         try {
             T resource = null;
             if (resourceName == null) {
-                String names[] = context.getBeanNamesForType(resourceType);
+                String[] names = context.getBeanNamesForType(resourceType);
                 if (names != null && names.length > 0) {
                     resource = resourceType.cast(context.getBean(names[0], resourceType));
                 }
diff --git a/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java b/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
index 1144ac7..dd347d7 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBusFactory.java
@@ -94,7 +94,7 @@ public class SpringBusFactory extends BusFactory {
         return createBus(cfgFile, defaultBusNotExists());
     }
 
-    public Bus createBus(String cfgFiles[]) {
+    public Bus createBus(String[] cfgFiles) {
         return createBus(cfgFiles, defaultBusNotExists());
     }
 
@@ -124,7 +124,7 @@ public class SpringBusFactory extends BusFactory {
         return createBus(new String[] {cfgFile}, includeDefaults);
     }
 
-    public Bus createBus(String cfgFiles[], boolean includeDefaults) {
+    public Bus createBus(String[] cfgFiles, boolean includeDefaults) {
         try {
             String userCfgFile
                 = SystemPropertyAction.getPropertyOrNull(Configurer.USER_CFG_FILE_PROPERTY_NAME);
@@ -152,7 +152,7 @@ public class SpringBusFactory extends BusFactory {
         }
     }
 
-    protected ConfigurableApplicationContext createApplicationContext(String cfgFiles[], boolean includeDefaults) {
+    protected ConfigurableApplicationContext createApplicationContext(String[] cfgFiles, boolean includeDefaults) {
         try {
             return new BusApplicationContext(cfgFiles, includeDefaults, context, resolver);
         } catch (BeansException ex) {
diff --git a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
index c152e5b..bc5c528 100644
--- a/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/jaxb/JAXBUtils.java
@@ -1147,13 +1147,13 @@ public final class JAXBUtils {
     public static class MapNamespacePrefixMapper2
         extends org.eclipse.persistence.internal.oxm.record.namespaces.MapNamespacePrefixMapper {
 
-        String nsctxt[];
+        String[] nsctxt;
 
         public MapNamespacePrefixMapper2(Map<String, String> foo) {
             super(foo);
         }
         public String[] getPreDeclaredNamespaceUris() {
-            String sup[] = super.getPreDeclaredNamespaceUris();
+            String[] sup = super.getPreDeclaredNamespaceUris();
             if (nsctxt == null) {
                 return sup;
             }
@@ -1163,7 +1163,7 @@ public final class JAXBUtils {
             }
             return s.toArray(new String[s.size()]);
         }
-        public void setContextualNamespaceDecls(String f[]) {
+        public void setContextualNamespaceDecls(String[] f) {
             nsctxt = f;
         }
         public String[] getContextualNamespaceDecls() {
@@ -1341,7 +1341,7 @@ public final class JAXBUtils {
 
             cw.visitEnd();
 
-            byte bts[] = cw.toByteArray();
+            byte[] bts = cw.toByteArray();
             cls = helper.loadClass(className,
                                    mcls, bts);
         }
@@ -1506,7 +1506,7 @@ public final class JAXBUtils {
 
         cw.visitEnd();
 
-        byte bts[] = cw.toByteArray();
+        byte[] bts = cw.toByteArray();
         return helper.loadClass(className,
                                 ref, bts);
     }
diff --git a/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java b/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
index 437476d..d313098 100644
--- a/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
+++ b/core/src/main/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
@@ -57,13 +57,13 @@ public abstract class AbstractDelegatingLogger extends Logger {
     public void log(Level level, String msg, Object param1) {
         if (isLoggable(level)) {
             LogRecord lr = new LogRecord(level, msg);
-            Object params[] = {param1 };
+            Object[] params = {param1 };
             lr.setParameters(params);
             doLog(lr);
         }
     }
 
-    public void log(Level level, String msg, Object params[]) {
+    public void log(Level level, String msg, Object[] params) {
         if (isLoggable(level)) {
             LogRecord lr = new LogRecord(level, msg);
             lr.setParameters(params);
@@ -93,13 +93,13 @@ public abstract class AbstractDelegatingLogger extends Logger {
             LogRecord lr = new LogRecord(level, msg);
             lr.setSourceClassName(sourceClass);
             lr.setSourceMethodName(sourceMethod);
-            Object params[] = {param1 };
+            Object[] params = {param1 };
             lr.setParameters(params);
             doLog(lr);
         }
     }
 
-    public void logp(Level level, String sourceClass, String sourceMethod, String msg, Object params[]) {
+    public void logp(Level level, String sourceClass, String sourceMethod, String msg, Object[] params) {
         if (isLoggable(level)) {
             LogRecord lr = new LogRecord(level, msg);
             lr.setSourceClassName(sourceClass);
@@ -136,7 +136,7 @@ public abstract class AbstractDelegatingLogger extends Logger {
             LogRecord lr = new LogRecord(level, msg);
             lr.setSourceClassName(sourceClass);
             lr.setSourceMethodName(sourceMethod);
-            Object params[] = {param1 };
+            Object[] params = {param1 };
             lr.setParameters(params);
             doLog(lr, bundleName);
         }
@@ -144,7 +144,7 @@ public abstract class AbstractDelegatingLogger extends Logger {
 
     @Deprecated
     public void logrb(Level level, String sourceClass, String sourceMethod,
-                      String bundleName, String msg, Object params[]) {
+                      String bundleName, String msg, Object[] params) {
         if (isLoggable(level)) {
             LogRecord lr = new LogRecord(level, msg);
             lr.setSourceClassName(sourceClass);
@@ -174,12 +174,12 @@ public abstract class AbstractDelegatingLogger extends Logger {
 
     public void entering(String sourceClass, String sourceMethod, Object param1) {
         if (isLoggable(Level.FINER)) {
-            Object params[] = {param1 };
+            Object[] params = {param1 };
             logp(Level.FINER, sourceClass, sourceMethod, "ENTRY {0}", params);
         }
     }
 
-    public void entering(String sourceClass, String sourceMethod, Object params[]) {
+    public void entering(String sourceClass, String sourceMethod, Object[] params) {
         if (isLoggable(Level.FINER)) {
             String msg = "ENTRY";
             if (params == null) {
@@ -204,7 +204,7 @@ public abstract class AbstractDelegatingLogger extends Logger {
 
     public void exiting(String sourceClass, String sourceMethod, Object result) {
         if (isLoggable(Level.FINER)) {
-            Object params[] = {result };
+            Object[] params = {result };
             logp(Level.FINER, sourceClass, sourceMethod, "RETURN {0}", params);
         }
     }
@@ -370,7 +370,7 @@ public abstract class AbstractDelegatingLogger extends Logger {
             }
         }
         try {
-            Object parameters[] = record.getParameters();
+            Object[] parameters = record.getParameters();
             if (parameters == null || parameters.length == 0) {
                 return format;
             }
diff --git a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
index 9b31e27..007e379 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
@@ -197,7 +197,7 @@ public class ASMHelper {
     }
 
     public static String periodToSlashes(String s) {
-        char ch[] = s.toCharArray();
+        char[] ch = s.toCharArray();
         for (int x = 0; x < ch.length; x++) {
             if (ch[x] == '.') {
                 ch[x] = '/';
@@ -382,7 +382,7 @@ public class ASMHelper {
             return super.findClass(name);
         }
 
-        public Class<?> defineClass(String name, byte bytes[]) {
+        public Class<?> defineClass(String name, byte[] bytes) {
             Class<?> ret = defined.get(name.replace('/', '.'));
             if (ret != null) {
                 return ret;
diff --git a/core/src/main/java/org/apache/cxf/common/util/Base64OutputStream.java b/core/src/main/java/org/apache/cxf/common/util/Base64OutputStream.java
index 3b28ec5..e21c2fa 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Base64OutputStream.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Base64OutputStream.java
@@ -39,7 +39,7 @@ public class Base64OutputStream extends FilterOutputStream {
     }
 
     @Override
-    public void write(byte b[], int off, int len) throws IOException {
+    public void write(byte[] b, int off, int len) throws IOException {
         encodeAndWrite(b, off, len, false);
     }
 
diff --git a/core/src/main/java/org/apache/cxf/common/util/Compiler.java b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
index 228f4ba..403de6e 100644
--- a/core/src/main/java/org/apache/cxf/common/util/Compiler.java
+++ b/core/src/main/java/org/apache/cxf/common/util/Compiler.java
@@ -247,7 +247,7 @@ public class Compiler {
 
     public boolean internalCompile(String[] args, int sourceFileIndex) {
         Process p = null;
-        String cmdArray[] = null;
+        String[] cmdArray = null;
         File tmpFile = null;
         try {
             if (isLongCommandLines(args) && sourceFileIndex >= 0) {
@@ -324,7 +324,7 @@ public class Compiler {
         return false;
     }
 
-    private boolean isLongCommandLines(String args[]) {
+    private boolean isLongCommandLines(String[] args) {
         StringBuilder strBuffer = new StringBuilder();
         for (int i = 0; i < args.length; i++) {
             strBuffer.append(args[i]);
diff --git a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
index 762b017..effe6ca 100644
--- a/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/StringUtils.java
@@ -37,7 +37,7 @@ import java.util.stream.Stream;
 public final class StringUtils {
     public static final Map<String, Pattern> PATTERN_MAP = new HashMap<>();
     static {
-        String patterns[] = {"/", " ", ":", ",", ";", "=", "\\.", "\\+"};
+        String[] patterns = {"/", " ", ":", ",", ";", "=", "\\.", "\\+"};
         for (String p : patterns) {
             PATTERN_MAP.put(p, Pattern.compile(p));
         }
@@ -187,7 +187,7 @@ public final class StringUtils {
         if (name == null || name.length() == 0) {
             return name;
         }
-        char chars[] = name.toCharArray();
+        char[] chars = name.toCharArray();
         chars[0] = Character.toUpperCase(chars[0]);
         return new String(chars);
     }
diff --git a/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java b/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java
index 86d636d..29fab01 100644
--- a/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java
+++ b/core/src/main/java/org/apache/cxf/databinding/AbstractWrapperHelper.java
@@ -33,7 +33,7 @@ import org.apache.cxf.interceptor.Fault;
 public abstract class AbstractWrapperHelper implements WrapperHelper {
 
     public static final Class<?> NO_CLASSES[] = new Class<?>[0];
-    public static final Object NO_PARAMS[] = new Object[0];
+    public static final Object[] NO_PARAMS = new Object[0];
 
     protected final Class<?> wrapperType;
     protected final Method setMethods[];
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 04eb109..1e3015e 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
@@ -233,7 +233,7 @@ public class XMLStreamDataWriter implements DataWriter<XMLStreamWriter> {
         
         private String getAttachmentElementName(SAXParseException exception) {
             String msg = exception.getMessage();
-            String str[] = msg.split("'");
+            String[] str = msg.split("'");
             return str[1];
         }
         
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index eb2df49..ee0abff 100644
--- a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
+++ b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
@@ -846,7 +846,7 @@ public class ClientImpl
                     setResponseContext(resCtx);
                 }
                 try {
-                    Object obj[] = processResult(message, message.getExchange(),
+                    Object[] obj = processResult(message, message.getExchange(),
                                                  null, resCtx);
 
                     callback.handleResponse(resCtx, obj);
diff --git a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
index 5f09892..c03a9b1 100644
--- a/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/FileUtils.java
@@ -105,7 +105,7 @@ public final class FileUtils {
     public static synchronized void maybeDeleteDefaultTempDir() {
         if (defaultTempDir != null) {
             Runtime.getRuntime().gc(); // attempt a garbage collect to close any files
-            String files[] = defaultTempDir.list();
+            String[] files = defaultTempDir.list();
             if (files != null && files.length > 0) {
                 //there are files in there, we need to attempt some more cleanup
 
diff --git a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
index 0e3f5df..4f2e998 100644
--- a/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/IOUtils.java
@@ -363,7 +363,7 @@ public final class IOUtils {
         if (i > 65536) {
             i = 65536;
         }
-        byte bytes[] = new byte[i];
+        byte[] bytes = new byte[i];
         while (in.read(bytes) != -1) {
             //nothing - just discarding
         }
diff --git a/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
index ca035ef..0beb021 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/StaxInInterceptor.java
@@ -82,7 +82,7 @@ public class StaxInInterceptor extends AbstractPhaseInterceptor<Message> {
                 if (reader == null) {
                     reader = new InputStreamReader(is, (String)message.get(Message.ENCODING));
                 }
-                char s[] = new char[1024];
+                char[] s = new char[1024];
                 int i = reader.read(s);
                 while (htmlMessage.length() < 64536 && i > 0) {
                     htmlMessage.append(s, 0, i);
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java b/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
index 75e6b1a..a8e242d 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
@@ -101,7 +101,7 @@ public class NameDigestPasswordCallbackHandler implements CallbackHandler {
         for (Class<?> arg : PASSWORD_CALLBACK_TYPES) {
             try {
                 Method method = callback.getClass().getMethod(cbname, arg);
-                Object args[] = new Object[] {
+                Object[] args = new Object[] {
                     arg == String.class ? password : password.toCharArray()
                 };
                 method.invoke(callback, args);
diff --git a/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java b/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
index 908153d..a5c7e81 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
@@ -93,7 +93,7 @@ public class NamePasswordCallbackHandler implements CallbackHandler {
         for (Class<?> arg : PASSWORD_CALLBACK_TYPES) {
             try {
                 Method method = callback.getClass().getMethod(cbname, arg);
-                Object args[] = new Object[] {
+                Object[] args = new Object[] {
                     arg == String.class ? password : password.toCharArray()
                 };
                 method.invoke(callback, args);
diff --git a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
index 56cf5bd..d4a7bf0 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedOutputStream.java
@@ -340,7 +340,7 @@ public class CachedOutputStream extends OutputStream {
                 LoadingByteArrayOutputStream lout = (LoadingByteArrayOutputStream)currentStream;
                 out.append(IOUtils.newStringFromBytes(lout.getRawBytes(), charsetName, 0, (int)limit));
             } else if (currentStream instanceof ByteArrayOutputStream) {
-                byte bytes[] = ((ByteArrayOutputStream)currentStream).toByteArray();
+                byte[] bytes = ((ByteArrayOutputStream)currentStream).toByteArray();
                 out.append(IOUtils.newStringFromBytes(bytes, charsetName, 0, (int)limit));
             } else {
                 throw new IOException("Unknown format of currentStream");
@@ -349,7 +349,7 @@ public class CachedOutputStream extends OutputStream {
             // read the file
             try (InputStream fin = createInputStream(tempFile);
                 Reader reader = new InputStreamReader(fin, charsetName)) {
-                char bytes[] = new char[1024];
+                char[] bytes = new char[1024];
                 long x = reader.read(bytes);
                 while (x != -1) {
                     if ((count + x) > limit) {
@@ -388,7 +388,7 @@ public class CachedOutputStream extends OutputStream {
             // read the file
             try (InputStream fin = createInputStream(tempFile);
                 Reader reader = new InputStreamReader(fin, charsetName)) {
-                char bytes[] = new char[1024];
+                char[] bytes = new char[1024];
                 int x = reader.read(bytes);
                 while (x != -1) {
                     out.append(bytes, 0, x);
diff --git a/core/src/main/java/org/apache/cxf/io/CachedWriter.java b/core/src/main/java/org/apache/cxf/io/CachedWriter.java
index e3d67f4..019f6da 100644
--- a/core/src/main/java/org/apache/cxf/io/CachedWriter.java
+++ b/core/src/main/java/org/apache/cxf/io/CachedWriter.java
@@ -320,7 +320,7 @@ public class CachedWriter extends Writer {
         // read the file
         try (Reader fin = createInputStreamReader(tempFile)) {
             CharArrayWriter out = new CharArrayWriter((int)tempFile.length());
-            char bytes[] = new char[1024];
+            char[] bytes = new char[1024];
             int x = fin.read(bytes);
             while (x != -1) {
                 out.write(bytes, 0, x);
@@ -341,7 +341,7 @@ public class CachedWriter extends Writer {
         } else {
             // read the file
             try (Reader fin = createInputStreamReader(tempFile)) {
-                char bytes[] = new char[1024];
+                char[] bytes = new char[1024];
                 int x = fin.read(bytes);
                 while (x != -1) {
                     out.write(bytes, 0, x);
@@ -370,7 +370,7 @@ public class CachedWriter extends Writer {
         } else {
             // read the file
             try (Reader fin = createInputStreamReader(tempFile)) {
-                char bytes[] = new char[1024];
+                char[] bytes = new char[1024];
                 long x = fin.read(bytes);
                 while (x != -1) {
                     if ((count + x) > limit) {
@@ -401,7 +401,7 @@ public class CachedWriter extends Writer {
         } else {
             // read the file
             try (Reader r = createInputStreamReader(tempFile)) {
-                char chars[] = new char[1024];
+                char[] chars = new char[1024];
                 int x = r.read(chars);
                 while (x != -1) {
                     out.append(chars, 0, x);
diff --git a/core/src/main/java/org/apache/cxf/message/MessageImpl.java b/core/src/main/java/org/apache/cxf/message/MessageImpl.java
index 2de20ed..c44806f 100644
--- a/core/src/main/java/org/apache/cxf/message/MessageImpl.java
+++ b/core/src/main/java/org/apache/cxf/message/MessageImpl.java
@@ -115,7 +115,7 @@ public class MessageImpl extends StringMapImpl implements Message {
         if (index >= contents.length) {
             //very unlikely to happen.   Haven't seen more than about 6,
             //but just in case we'll add a few more
-            Object tmp[] = new Object[contents.length + 10];
+            Object[] tmp = new Object[contents.length + 10];
             System.arraycopy(contents, 0, tmp, 0, contents.length);
             contents = tmp;
         }
diff --git a/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java b/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
index fb7d8b4..c63ad24 100644
--- a/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
+++ b/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
@@ -225,7 +225,7 @@ public class AnnotationsFactoryBeanListener implements FactoryBeanListener {
             String ref = prop.ref();
             Class<?> cls = prop.beanClass();
             Object obj = null;
-            String s[] = prop.value();
+            String[] s = prop.value();
             if (!StringUtils.isEmpty(ref)) {
                 obj = bus.getExtension(ConfiguredBeanLocator.class).getBeanOfType(ref, cls);
             } else if (s.length == 0 && cls != Object.class) {
diff --git a/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java b/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
index d994d1f..4a85df5 100644
--- a/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
+++ b/core/src/main/java/org/apache/cxf/service/model/AbstractPropertiesHolder.java
@@ -138,7 +138,7 @@ public abstract class AbstractPropertiesHolder implements Extensible {
             return delegate.containsExtensor(el);
         }
 
-        Object exts[] = extensors.get();
+        Object[] exts = extensors.get();
         if (exts != null) {
             for (Object o : exts) {
                 if (o == el) {
@@ -153,8 +153,8 @@ public abstract class AbstractPropertiesHolder implements Extensible {
             delegate.addExtensor(el);
             return;
         }
-        Object exts[] = extensors.get();
-        Object exts2[];
+        Object[] exts = extensors.get();
+        Object[] exts2;
         if (exts == null) {
             exts2 = new Object[1];
         } else {
@@ -174,7 +174,7 @@ public abstract class AbstractPropertiesHolder implements Extensible {
         if (delegate != null) {
             return delegate.getExtensor(cls);
         }
-        Object exts[] = extensors.get();
+        Object[] exts = extensors.get();
         if (exts == null) {
             return null;
         }
@@ -190,7 +190,7 @@ public abstract class AbstractPropertiesHolder implements Extensible {
             return delegate.getExtensors(cls);
         }
 
-        Object exts[] = extensors.get();
+        Object[] exts = extensors.get();
         if (exts == null) {
             return null;
         }
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
index 7834ce4..b56e789 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
@@ -130,7 +130,7 @@ public final class StaxUtils {
     private static final XMLOutputFactory SAFE_OUTPUT_FACTORY;
 
     private static final String XML_NS = "http://www.w3.org/2000/xmlns/";
-    private static final String DEF_PREFIXES[] = new String[] {
+    private static final String[] DEF_PREFIXES = new String[] {
         "ns1".intern(), "ns2".intern(), "ns3".intern(),
         "ns4".intern(), "ns5".intern(), "ns6".intern(),
         "ns7".intern(), "ns8".intern(), "ns9".intern()
diff --git a/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java b/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
index be43431..39a82ee 100644
--- a/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
+++ b/core/src/main/java/org/apache/cxf/staxutils/StreamWriterContentHandler.java
@@ -72,7 +72,7 @@ public class StreamWriterContentHandler implements ContentHandler, LexicalHandle
      * @param length
      * @throws SAXException
      */
-    public void characters(char ch[], int start, int length) throws SAXException {
+    public void characters(char[] ch, int start, int length) throws SAXException {
         try {
             if (inCDATA) {
                 writer.writeCData(new String(ch, start, length));
@@ -92,7 +92,7 @@ public class StreamWriterContentHandler implements ContentHandler, LexicalHandle
      * @param length
      * @throws SAXException
      */
-    public void ignorableWhitespace(char ch[], int start, int length) throws SAXException {
+    public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
         try {
             writer.writeCharacters(ch, start, length);
         } catch (XMLStreamException e) {
diff --git a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
index ac3f0b4..2ec50a8 100644
--- a/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
+++ b/core/src/main/java/org/apache/cxf/workqueue/AutomaticWorkQueueImpl.java
@@ -67,7 +67,7 @@ public class AutomaticWorkQueueImpl implements AutomaticWorkQueue {
 
     ThreadPoolExecutor executor;
     Method addWorkerMethod;
-    Object addWorkerArgs[];
+    Object[] addWorkerArgs;
 
     AWQThreadFactory threadFactory;
     ReentrantLock mainLock;
diff --git a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
index 51eb3b5..83e997a 100644
--- a/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
+++ b/core/src/test/java/org/apache/cxf/attachment/AttachmentDeserializerTest.java
@@ -478,7 +478,7 @@ public class AttachmentDeserializerTest extends Assert {
 
     private String getString(InputStream ins) throws Exception {
         try (ByteArrayOutputStream bout = new ByteArrayOutputStream(100)) {
-            byte b[] = new byte[100];
+            byte[] b = new byte[100];
             int i = ins.read(b);
             while (i > 0) {
                 bout.write(b, 0, i);
@@ -516,7 +516,7 @@ public class AttachmentDeserializerTest extends Assert {
         for (int x = 1; x < 50; x++) {
             String cid = "1882f79d-e20a-4b36-a222-7a75518cf395-" + x + "@cxf.apache.org";
             DataSource ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
-            byte bts[] = new byte[1024];
+            byte[] bts = new byte[1024];
 
             InputStream ins = ds.getInputStream();
             int count = 0;
@@ -557,7 +557,7 @@ public class AttachmentDeserializerTest extends Assert {
 
         String cid = "1a66bb35-67fc-4e89-9f33-48af417bf9fe-1@apache.org";
         DataSource ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
-        byte bts[] = new byte[1024];
+        byte[] bts = new byte[1024];
         InputStream ins = ds.getInputStream();
         int count = ins.read(bts, 0, bts.length);
         assertEquals(500, count);
@@ -599,7 +599,7 @@ public class AttachmentDeserializerTest extends Assert {
 
         String cid = "1a66bb35-67fc-4e89-9f33-48af417bf9fe-1@apache.org";
         DataSource ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
-        byte bts[] = new byte[1024];
+        byte[] bts = new byte[1024];
         InputStream ins = ds.getInputStream();
         int count = 0;
         int x = ins.read(bts, 500, 200);
@@ -650,7 +650,7 @@ public class AttachmentDeserializerTest extends Assert {
 
         String cid = "1a66bb35-67fc-4e89-9f33-48af417bf9fe-1@apache.org";
         DataSource ds = AttachmentUtil.getAttachmentDataSource(cid, message.getAttachments());
-        byte bts[] = new byte[1024];
+        byte[] bts = new byte[1024];
         InputStream ins = ds.getInputStream();
         int count = 0;
         int x = ins.read(bts, 100, 600);
diff --git a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
index bec0dd3..3142519 100644
--- a/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/Base64UtilityTest.java
@@ -34,7 +34,7 @@ public class Base64UtilityTest extends Assert {
         super();
     }
 
-    void assertEquals(byte b1[], byte b2[]) {
+    void assertEquals(byte[] b1, byte b2[]) {
         assertEquals(b1.length, b2.length);
         for (int x = 0; x < b1.length; x++) {
             assertEquals(b1[x], b2[x]);
@@ -73,16 +73,16 @@ public class Base64UtilityTest extends Assert {
 
     @Test
     public void testEncodeDecodeChunk() throws Exception {
-        byte bytes[] = new byte[100];
+        byte[] bytes = new byte[100];
         for (int x = 0; x < bytes.length; x++) {
             bytes[x] = (byte)x;
         }
 
-        char encodedChars[] = Base64Utility.encodeChunk(bytes, 0, -2);
+        char[] encodedChars = Base64Utility.encodeChunk(bytes, 0, -2);
         assertNull(encodedChars);
         encodedChars = Base64Utility.encodeChunk(bytes, 0, bytes.length);
         assertNotNull(encodedChars);
-        byte bytesDecoded[] = Base64Utility.decodeChunk(encodedChars, 0, encodedChars.length);
+        byte[] bytesDecoded = Base64Utility.decodeChunk(encodedChars, 0, encodedChars.length);
         assertEquals(bytes, bytesDecoded);
 
         //require padding
@@ -123,7 +123,7 @@ public class Base64UtilityTest extends Assert {
     @Test
     public void testEncodeDecodeString() throws Exception {
         String in = "QWxhZGRpbjpvcGVuIHNlc2FtZQ==";
-        byte bytes[] = Base64Utility.decode(in);
+        byte[] bytes = Base64Utility.decode(in);
         assertEquals("Aladdin:open sesame", IOUtils.newStringFromBytes(bytes));
         String encoded = Base64Utility.encode(bytes);
         assertEquals(in, encoded);
@@ -142,7 +142,7 @@ public class Base64UtilityTest extends Assert {
 
     @Test
     public void testEncodeDecodeStreams() throws Exception {
-        byte bytes[] = new byte[100];
+        byte[] bytes = new byte[100];
         for (int x = 0; x < bytes.length; x++) {
             bytes[x] = (byte)x;
         }
diff --git a/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java
index 952e1e9..3870858 100644
--- a/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/client/Client.java
@@ -34,7 +34,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
         if (args != null && args.length > 0 && !"".equals(args[0])) {
             factory.setAddress(args[0]);
diff --git a/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/Server.java
index 51a4e28..446b75f 100644
--- a/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/aegis/src/main/java/demo/hw/server/Server.java
@@ -36,7 +36,7 @@ public final class Server {
         svrFactory.create();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         startServer();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/client/Client.java b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/client/Client.java
index 88dab7b..39c419b 100644
--- a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/client/Client.java
+++ b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/client/Client.java
@@ -37,7 +37,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify wsdl");
diff --git a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/Server.java b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/Server.java
index 5a0d4c1..5046e3b 100644
--- a/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/Server.java
+++ b/distribution/src/main/release/samples/antbuild/src/demo/hw_http/server/Server.java
@@ -31,7 +31,7 @@ public class Server {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java
index 34207f8..5eb2c24 100644
--- a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java
+++ b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/client/Client.java
@@ -48,7 +48,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
 
         Object implementor = new CallbackImpl();
diff --git a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/Server.java b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/Server.java
index 620e345..a4f7e2b 100644
--- a/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/Server.java
+++ b/distribution/src/main/release/samples/callback/src/main/java/demo/callback/server/Server.java
@@ -33,7 +33,7 @@ public class Server {
         Endpoint.publish(address, implementor, new LoggingFeature());
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
         Thread.sleep(5 * 60 * 1000);
diff --git a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
index 74304fa..329ff45 100644
--- a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
+++ b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/client/Client.java
@@ -38,7 +38,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         URL wsdlURL = Client.class.getResource("/wsdl/hello_world.wsdl");
         SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
diff --git a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/Server.java b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/Server.java
index b7a2b93..dc92355 100644
--- a/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/Server.java
+++ b/distribution/src/main/release/samples/configuration_interceptor/src/main/java/demo/stream/server/Server.java
@@ -38,7 +38,7 @@ public class Server {
         ep.getOutInterceptors().add(new StreamInterceptor());
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java
index 78691b4..56be9aa 100644
--- a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java
+++ b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/client/Client.java
@@ -35,7 +35,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         URL wsdlUrl = Client.class.getResource("/wsdl/bank.wsdl");
 
         BankCORBAService ss = new BankCORBAService(wsdlUrl, SERVICE_NAME);
diff --git a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java
index 967c879..1258e38 100644
--- a/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java
+++ b/distribution/src/main/release/samples/corba/bank/src/main/java/cxf/server/Server.java
@@ -32,7 +32,7 @@ public class Server {
         endpoint.publish(address);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java
index ad658df..53d1879 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/client/Client.java
@@ -96,7 +96,7 @@ public final class Client {
         return 0;
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         int status = 0;
         ORB orb = null;
 
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java
index aa1de39..2d3cbe6 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/Server.java
@@ -75,7 +75,7 @@ public final class Server {
         return 0;
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         Properties props = System.getProperties();
         props.put("org.omg.CORBA.ORBInitialHost", "localhost");
         props.put("org.omg.CORBA.ORBInitialPort", "1050");
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java
index 776c250..17bab99 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/client/Client.java
@@ -38,7 +38,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         LOG.log(Level.INFO, "Resolving the bank object");
         BankCORBAService service = new BankCORBAService();
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/Server.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/Server.java
index cac6d61..7c95fed 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/Server.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/cxf/server/Server.java
@@ -31,7 +31,7 @@ public class Server {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java b/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java
index baa4958..386bd1d 100644
--- a/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java
+++ b/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/client/Client.java
@@ -62,7 +62,7 @@ public final class Client {
     }
 
     // Standalone program initialization
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         int status = 0;
         ORB orb = null;
 
diff --git a/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/Server.java b/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/Server.java
index e3c750d..cbe4862 100644
--- a/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/Server.java
+++ b/distribution/src/main/release/samples/corba/hello_world/src/main/java/corba/server/Server.java
@@ -66,7 +66,7 @@ public final class Server {
         return 0;
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         java.util.Properties props = new Properties();
         props.putAll(System.getProperties());
 
diff --git a/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/client/Client.java b/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/client/Client.java
index 57f785b..b2e6ee1 100644
--- a/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/client/Client.java
+++ b/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/client/Client.java
@@ -28,7 +28,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         HelloWorldCORBAService ss = new HelloWorldCORBAService();
         HelloWorld port = ss.getHelloWorldCORBAPort();
diff --git a/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java b/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java
index 9958c51..acf1455 100644
--- a/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java
+++ b/distribution/src/main/release/samples/corba/hello_world/src/main/java/cxf/server/Server.java
@@ -31,7 +31,7 @@ public class Server {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java
index 3c6b77e..4f4ec34 100644
--- a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java
+++ b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/client/Client.java
@@ -29,7 +29,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         // START SNIPPET: client
         ClassPathXmlApplicationContext context
             = new ClassPathXmlApplicationContext(new String[] {"client-beans.xml"});
diff --git a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
index d50ee8c..a5f352c 100644
--- a/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
+++ b/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java
@@ -51,7 +51,7 @@ public class Server {
         server.join();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
     }
 
diff --git a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java
index 757031e..55c2717 100644
--- a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java
+++ b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/Client.java
@@ -39,7 +39,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify wsdl");
diff --git a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
index 2ddb7fa..76ceacd 100755
--- a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
+++ b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/client/DispatchSourceClient.java
@@ -64,7 +64,7 @@ public final class DispatchSourceClient {
     private DispatchSourceClient() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         Server.main(new String[]{"inProcess"});
 
diff --git a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/server/Server.java b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/server/Server.java
index 3ddc402..3ef5f7b 100644
--- a/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/server/Server.java
+++ b/distribution/src/main/release/samples/in_jvm_transport/src/main/java/demo/colocated/server/Server.java
@@ -31,7 +31,7 @@ public class Server {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
index 6c22154..94ebe1c 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/client/Client.java
@@ -40,7 +40,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         Service service = Service.create(SERVICE_NAME);
         // Endpoint Address
         String endpointAddress = "http://localhost:9000/helloWorld";
diff --git a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/Server.java
index 73a51e8..c9426a0 100644
--- a/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/java_first_jaxws/src/main/java/demo/hw/server/Server.java
@@ -34,7 +34,7 @@ public class Server {
         // END SNIPPET: publish
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java
index 2fa5cc9..a2aa386 100644
--- a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/client/Client.java
@@ -30,7 +30,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         JaxWsProxyFactoryBean factory = new JaxWsProxyFactoryBean();
         factory.getFeatures().add(new LoggingFeature());
         factory.setAddress("http://localhost:9000/helloWorld");
diff --git a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/server/Server.java
index 10d9f5c..c189da0 100644
--- a/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/java_first_jaxws_factory_bean/src/main/java/demo/hw/server/Server.java
@@ -35,7 +35,7 @@ public class Server {
         svrFactory.create();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
index c8f1d5b..59380c6 100644
--- a/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
+++ b/distribution/src/main/release/samples/java_first_jms/src/main/java/demo/server/ServerJMS.java
@@ -44,7 +44,7 @@ public final class ServerJMS {
         //
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         boolean launchAmqBroker = false;
         boolean jaxws = false;
diff --git a/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java
index f763908..ab111b1 100644
--- a/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/client/Client.java
@@ -27,7 +27,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
         if (args != null && args.length > 0 && !"".equals(args[0])) {
             factory.setAddress(args[0]);
diff --git a/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/Server.java
index 9dc5abd..c407d96 100644
--- a/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/java_first_pojo/src/main/java/demo/hw/server/Server.java
@@ -38,7 +38,7 @@ public class Server {
         svrFactory.create();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java
index 65abf4b..0a3fb67 100644
--- a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java
+++ b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/client/Client.java
@@ -28,7 +28,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         // START SNIPPET: client
         ClassPathXmlApplicationContext context
             = new ClassPathXmlApplicationContext(new String[] {"client-beans.xml"});
diff --git a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
index d661f67..d176e83 100644
--- a/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
+++ b/distribution/src/main/release/samples/java_first_spring_support/src/main/java/demo/spring/service/Server.java
@@ -51,7 +51,7 @@ public class Server {
         server.join();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
     }
 
diff --git a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
index 3452678..3cb40cb 100644
--- a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/client/Client.java
@@ -40,7 +40,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         // Sent HTTP GET request to query all customer info
         /*
          * URL url = new URL("http://localhost:9000/customers");
diff --git a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java
index 5e410f5..affb7b0 100644
--- a/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/basic/src/main/java/demo/jaxrs/server/Server.java
@@ -34,7 +34,7 @@ public class Server {
         sf.create();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
index 2c1b784..352c3bc 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/client/Client.java
@@ -47,7 +47,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         String keyStoreLoc = "src/main/config/clientKeystore.jks";
 
         KeyStore keyStore = KeyStore.getInstance("JKS");
diff --git a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java
index 333d323..168aab3 100644
--- a/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/basic_https/src/main/java/httpsdemo/server/Server.java
@@ -44,7 +44,7 @@ public class Server {
         sf.create();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/client/Client.java b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/client/Client.java
index c1a556a..433f6f8 100644
--- a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/client/Client.java
@@ -30,7 +30,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         // Sent HTTP GET request to query customer info, expect XML
         System.out.println("Sent HTTP GET request to query customer info, expect XML");
         HttpGet get = new HttpGet("http://localhost:9000/customerservice/customers/123");
diff --git a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java
index 25a0287..52bf8ca 100644
--- a/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/content_negotiation/src/main/java/demo/jaxrs/server/Server.java
@@ -34,7 +34,7 @@ public class Server {
         sf.create();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Server.java
index f15f2b0..cc1bf8e 100644
--- a/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Server.java
@@ -53,7 +53,7 @@ public class Server {
         server.join();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
index a5131d6..88252cb 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -53,7 +53,7 @@ public class Server {
         server.join();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
index 7b74a71..50ecfae 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_spring/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -26,7 +26,7 @@ public final class Server {
     private Server() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         ApplicationContext appctxt =
             new ClassPathXmlApplicationContext(Server.class.getResource("/context.xml").toString());
 
diff --git a/distribution/src/main/release/samples/jax_rs/odata/src/main/java/odata/server/Server.java b/distribution/src/main/release/samples/jax_rs/odata/src/main/java/odata/server/Server.java
index f10d6c3..968a4ed 100644
--- a/distribution/src/main/release/samples/jax_rs/odata/src/main/java/odata/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/odata/src/main/java/odata/server/Server.java
@@ -39,7 +39,7 @@ public class Server {
         sf.create();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java
index 0363cdf..091b081 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/client/Client.java
@@ -36,7 +36,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         final String url = "http://localhost:9000/catalog";
         CloseableHttpClient httpClient = HttpClientBuilder.create().build();
 
diff --git a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
index f14b7b4..a696ee9 100644
--- a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Server.java
@@ -70,7 +70,7 @@ public class Server {
         server.join();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
index eb7475e..b6a79d7 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/simple/Server.java
@@ -25,7 +25,7 @@ import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
 
 public class Server {
 
-    protected Server(String args[]) throws Exception {
+    protected Server(String[] args) throws Exception {
         JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
         sf.setResourceClasses(StreamingService.class);
 
@@ -38,7 +38,7 @@ public class Server {
         sf.create();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server(args);
         System.out.println("Server ready...");
         Thread.sleep(60 * 60 * 1000);
diff --git a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java
index 6588369..6653373 100644
--- a/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/spark/src/main/java/demo/jaxrs/server/socket/Server.java
@@ -44,7 +44,7 @@ import demo.jaxrs.server.simple.SparkStreamingOutput;
 
 public class Server {
 
-    protected Server(String args[]) throws Exception {
+    protected Server(String[] args) throws Exception {
 
         ServerSocket sparkServerSocket = new ServerSocket(9999);
         ServerSocket jaxrsResponseServerSocket = new ServerSocket(10000);
@@ -90,7 +90,7 @@ public class Server {
 
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server(args);
         System.out.println("Server ready...");
         Thread.sleep(60 * 60 * 1000);
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
index 3461352..129d99d 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/client/Client.java
@@ -39,7 +39,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         System.out.println("\n");
         Client c = new Client();
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
index 98eab1b..f093934 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/java/demo/jaxrs/servlet/Server.java
@@ -51,7 +51,7 @@ public class Server {
         server.join();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
     }
 
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
index c57083d..99c15bc 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/src/main/java/demo/jaxrs/tracing/server/Server.java
@@ -41,7 +41,7 @@ public class Server {
         server.join();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java
index c57083d..99c15bc 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java
@@ -41,7 +41,7 @@ public class Server {
         server.join();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Server.java b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Server.java
index bd805aa..32f9f48 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_opentracing/src/main/java/demo/jaxrs/tracing/server/Server.java
@@ -65,7 +65,7 @@ public class Server {
         server.join();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
index cf37b6e..0237e6f 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
@@ -32,7 +32,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         // Create a websocket client and connect to the target service
         WebSocketTestClient client = new WebSocketTestClient(Server.HOST_URL + Server.CONTEXT_PATH);
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java
index 9a7ad62..af7f3b4 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java
@@ -36,7 +36,7 @@ public class Server {
         sf.create();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java
index 7c56ae8..1eca219 100644
--- a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java
@@ -29,7 +29,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
         String serviceURL;
         if (args != null && args.length > 0 && !"".equals(args[0])) {
diff --git a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/Server.java
index eb1477a..4dfc3bd 100644
--- a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/Server.java
@@ -33,7 +33,7 @@ public class Server {
         svrFactory.create();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
index 13f8124..2d7b6cc 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
@@ -42,7 +42,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify wsdl");
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
index 554d035..9f36260 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
@@ -35,7 +35,7 @@ public class Server {
         Endpoint.publish(address, implementor, new LoggingFeature());
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
index 4cf90fc..8b7e364 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
@@ -42,7 +42,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify wsdl");
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
index 92c9cd9..0dbc955 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
@@ -41,7 +41,7 @@ public class Server {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
index dbddb5e..a470255 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
@@ -32,7 +32,7 @@ public class Server {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/client/Client.java b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/client/Client.java
index 2ac4c6b..2d45d2b 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/client/Client.java
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/client/Client.java
@@ -37,7 +37,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         URL wsdl = new URL("http://localhost:8181/cxf/catalog?wsdl");
 
diff --git a/distribution/src/main/release/samples/jms_pubsub/src/main/java/demo/jms_greeter/server/Server.java b/distribution/src/main/release/samples/jms_pubsub/src/main/java/demo/jms_greeter/server/Server.java
index b415b73..0353323 100644
--- a/distribution/src/main/release/samples/jms_pubsub/src/main/java/demo/jms_greeter/server/Server.java
+++ b/distribution/src/main/release/samples/jms_pubsub/src/main/java/demo/jms_greeter/server/Server.java
@@ -43,7 +43,7 @@ public class Server {
         }
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         Server s = new Server();
         System.out.println("Server ready...");
         try {
diff --git a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java
index 404de2d..711abeb 100644
--- a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java
+++ b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java
@@ -62,7 +62,7 @@ public class Server {
         }
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         Server s = new Server();
         System.out.println("Server ready...");
         try {
diff --git a/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/Server.java b/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/Server.java
index 15a65ec..992e72b 100644
--- a/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/Server.java
+++ b/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/Server.java
@@ -34,7 +34,7 @@ public class Server {
         Endpoint.publish(address, implementor, new LoggingFeature());
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
index 10c1277..daae425 100644
--- a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
+++ b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
@@ -27,7 +27,7 @@ public final class CustomerServiceSpringClient {
     private CustomerServiceSpringClient() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         ClassPathXmlApplicationContext context
             = new ClassPathXmlApplicationContext(new String[] {"classpath:client-applicationContext.xml"});
         CustomerServiceTester client = (CustomerServiceTester)context.getBean("tester");
diff --git a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
index bd1b515..06884cd 100644
--- a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
+++ b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
@@ -27,7 +27,7 @@ public final class CustomerServiceSpringServer {
     private CustomerServiceSpringServer() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         ClassPathXmlApplicationContext ctx
             = new ClassPathXmlApplicationContext("server-applicationContext.xml");
         Thread.sleep(5 * 60 * 1000);
diff --git a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/Server.java
index 76e56f3..85e5a75 100644
--- a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/Server.java
@@ -30,7 +30,7 @@ public class Server {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java
index b9fbb88..0f3ac44 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java
@@ -37,7 +37,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify wsdl");
diff --git a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
index cf46a24..4b79bc9 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
+++ b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
@@ -37,7 +37,7 @@ public final class Get {
     private Get() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         // Sent HTTP GET request to invoke sayHi
         String target = "http://localhost:9000/SoapContext/SoapPort/sayHi";
         URL url = new URL(target);
diff --git a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/Server.java
index c879433..e17dc82 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/Server.java
@@ -30,7 +30,7 @@ public class Server {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready on http://localhost:9000/SoapContext/SoapPort ...");
 
diff --git a/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/Server.java
index 066154b..5282270 100644
--- a/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/Server.java
@@ -32,7 +32,7 @@ public class Server {
         Endpoint.publish(address, implementor, new LoggingFeature());
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/js_provider/src/main/java/demo/hwDispatch/client/Client.java b/distribution/src/main/release/samples/js_provider/src/main/java/demo/hwDispatch/client/Client.java
index 53689cb..f01a482 100644
--- a/distribution/src/main/release/samples/js_provider/src/main/java/demo/hwDispatch/client/Client.java
+++ b/distribution/src/main/release/samples/js_provider/src/main/java/demo/hwDispatch/client/Client.java
@@ -38,7 +38,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify wsdl");
diff --git a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java
index 39bbae6..ab32b8e 100644
--- a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java
+++ b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/client/Client.java
@@ -48,7 +48,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         if (args.length == 0) {
             System.out.println("Please specify the WSDL file.");
             System.exit(1);
diff --git a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java
index 3d57c8e..12f1274 100644
--- a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java
+++ b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java
@@ -34,7 +34,7 @@ public class Server {
         ((SOAPBinding)binding).setMTOMEnabled(true);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java b/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
index e5f8a43..8e9df30 100644
--- a/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
+++ b/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/client/Client.java
@@ -42,7 +42,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         QName serviceName = new QName("http://apache.org/hello_world_xml_http/wrapped",
                                                 "cutomerservice");
         QName portName = new QName("http://apache.org/hello_world_xml_http/wrapped",
diff --git a/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/Server.java b/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/Server.java
index 02aae8d..e9b4ded 100644
--- a/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/Server.java
+++ b/distribution/src/main/release/samples/restful_dispatch/src/main/java/demo/restful/server/Server.java
@@ -31,7 +31,7 @@ public class Server {
         e.publish(address);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
index 65abf4b..0a3fb67 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
+++ b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
@@ -28,7 +28,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         // START SNIPPET: client
         ClassPathXmlApplicationContext context
             = new ClassPathXmlApplicationContext(new String[] {"client-beans.xml"});
diff --git a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
index dda52fc..417dd72 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
+++ b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/service/Server.java
@@ -51,7 +51,7 @@ public class Server {
         server.join();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
     }
 
diff --git a/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java b/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java
index df29d17..cf27725 100644
--- a/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java
+++ b/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/client/Client.java
@@ -44,7 +44,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify wsdl");
diff --git a/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/server/Server.java b/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/server/Server.java
index 4768cc3..584c2ea 100644
--- a/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/server/Server.java
+++ b/distribution/src/main/release/samples/soap_header/src/main/java/demo/soap_header/server/Server.java
@@ -35,7 +35,7 @@ public class Server {
         Endpoint.publish(address, implementor, new LoggingFeature());
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java
index cf7959a..7ae9741 100644
--- a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java
+++ b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/client/Client.java
@@ -41,7 +41,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length < 2) {
             System.out.println("please specify wsdl and configuration file");
diff --git a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/Server.java b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/Server.java
index 5a5aea0..6f7814e 100644
--- a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/Server.java
+++ b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/server/Server.java
@@ -36,7 +36,7 @@ public class Server {
         BusFactory.setDefaultBus(bus);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify configuration file");
diff --git a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/Server.java b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/Server.java
index 7bba1a3..b5181ad 100644
--- a/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/Server.java
+++ b/distribution/src/main/release/samples/sts/src/main/java/demo/wssec/sts/Server.java
@@ -36,7 +36,7 @@ public class Server {
         BusFactory.setDefaultBus(bus);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify configuration file");
diff --git a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/client/Client.java b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/client/Client.java
index 5616433..1f2a7c4 100644
--- a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/client/Client.java
+++ b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/client/Client.java
@@ -96,7 +96,7 @@ public final class Client implements Runnable {
         doStop = true;
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         if (args.length == 0) {
             args = new String[] {SOAPService.WSDL_LOCATION.toExternalForm()};
         }
diff --git a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Server.java b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Server.java
index 337c7aa..9bdd286 100644
--- a/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Server.java
+++ b/distribution/src/main/release/samples/throttling/src/main/java/demo/throttling/server/Server.java
@@ -86,7 +86,7 @@ public class Server {
                          new ThrottlingFeature(manager));
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java b/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java
index dbb74e0..442d3f5 100644
--- a/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java
+++ b/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/client/Client.java
@@ -52,7 +52,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         if (args.length == 0) {
             System.out.println("please specify wsdl");
             System.exit(1);
diff --git a/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/Server.java b/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/Server.java
index 1211abe..b62c6e9 100644
--- a/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/Server.java
+++ b/distribution/src/main/release/samples/ws_addressing/src/main/java/demo/ws_addressing/server/Server.java
@@ -41,7 +41,7 @@ public class Server {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/client/Client.java b/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/client/Client.java
index d9c7f0a..67678fd 100644
--- a/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/client/Client.java
+++ b/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/client/Client.java
@@ -35,7 +35,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
 
             SpringBusFactory bf = new SpringBusFactory();
diff --git a/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/Server.java b/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/Server.java
index e13caf5..2fee2f7 100644
--- a/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/Server.java
+++ b/distribution/src/main/release/samples/ws_policy/src/main/java/demo/ws_policy/server/Server.java
@@ -42,7 +42,7 @@ public class Server {
         Endpoint.publish(address, implementor, new LoggingFeature());
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
index 2dc64da..3da2f22 100644
--- a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
+++ b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/client/Client.java
@@ -38,7 +38,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         try {
 
             SpringBusFactory bf = new SpringBusFactory();
diff --git a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java
index f54ef73..e6a2309 100644
--- a/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java
+++ b/distribution/src/main/release/samples/ws_rm/src/main/java/demo/ws_rm/server/Server.java
@@ -37,7 +37,7 @@ public class Server {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = Server.class.getResource("/server.xml");
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
index c7364de..db9f377 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/Client.java
@@ -48,7 +48,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         try {
 
             SpringBusFactory bf = new SpringBusFactory();
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java
index 8b00152..582681a 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/client/StaxClient.java
@@ -50,7 +50,7 @@ public final class StaxClient {
     private StaxClient() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         try {
 
             SpringBusFactory bf = new SpringBusFactory();
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
index aa11ef0..fb33fe6 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/Server.java
@@ -102,7 +102,7 @@ public class Server {
 
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = Server.class.getResource("wssec.xml");
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java
index d0d8111..319f309 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc/src/main/java/demo/wssec/server/StaxServer.java
@@ -50,7 +50,7 @@ public class StaxServer {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = Server.class.getResource("wssec.xml");
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/Client.java b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/Client.java
index a0496fe..73378e5 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/Client.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/client/Client.java
@@ -40,7 +40,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length < 2) {
             System.out.println("please specify wsdl and configuration file");
diff --git a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/server/Server.java b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/server/Server.java
index 77e9e5e..cc9e5da 100644
--- a/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/server/Server.java
+++ b/distribution/src/main/release/samples/ws_security/sign_enc_policy/src/main/java/demo/wssec/server/Server.java
@@ -40,7 +40,7 @@ public class Server {
         //Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify configuration file");
diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java
index d91b743..6152c10 100644
--- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java
+++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java
@@ -42,7 +42,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         try {
 
             SpringBusFactory bf = new SpringBusFactory();
diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java
index c2fcb61..f20a318 100644
--- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java
+++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/StaxClient.java
@@ -44,7 +44,7 @@ public final class StaxClient {
     private StaxClient() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         try {
 
             SpringBusFactory bf = new SpringBusFactory();
diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
index 0414d4d..290a409 100644
--- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
+++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
@@ -61,7 +61,7 @@ public class Server {
         impl.getInInterceptors().add(new WSS4JInInterceptor(inProps));
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = Server.class.getResource("/wssec.xml");
diff --git a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java
index 61b2d0f..aabca17 100644
--- a/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java
+++ b/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/StaxServer.java
@@ -64,7 +64,7 @@ public class StaxServer {
         impl.getInInterceptors().add(new WSS4JStaxInInterceptor(inProperties));
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = StaxServer.class.getResource("/wssec.xml");
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
index a0496fe..73378e5 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/client/Client.java
@@ -40,7 +40,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length < 2) {
             System.out.println("please specify wsdl and configuration file");
diff --git a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/Server.java b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/Server.java
index 77e9e5e..cc9e5da 100644
--- a/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/Server.java
+++ b/distribution/src/main/release/samples/ws_security/ut_policy/src/main/java/demo/wssec/server/Server.java
@@ -40,7 +40,7 @@ public class Server {
         //Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify configuration file");
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java
index bb84550..4887416 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceClient.java
@@ -28,7 +28,7 @@ public class CustomerServiceClient {
     protected CustomerServiceClient() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         CustomerServiceService customerServiceService;
         if (args.length != 0 && args[0].length() != 0) {
             File wsdlFile = new File(args[0]);
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
index 8b13599..f1c7f92 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
@@ -27,7 +27,7 @@ public final class CustomerServiceSpringClient {
     private CustomerServiceSpringClient() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         // Initialize the spring context and fetch our test client
         ClassPathXmlApplicationContext context
             = new ClassPathXmlApplicationContext(new String[] {"classpath:client-applicationContext.xml"});
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceServer.java b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceServer.java
index e0ded7f..056b096 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceServer.java
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceServer.java
@@ -35,7 +35,7 @@ public class CustomerServiceServer {
                                                          new LoggingFeature());
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new CustomerServiceServer();
         System.out.println("Server ready...");
         Thread.sleep(5 * 60 * 1000);
diff --git a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
index 70d52db..d92da26 100644
--- a/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
+++ b/distribution/src/main/release/samples/wsdl_first/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
@@ -25,7 +25,7 @@ public class CustomerServiceSpringServer {
     protected CustomerServiceSpringServer() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new ClassPathXmlApplicationContext("server-applicationContext.xml");
         System.in.read();
     }
diff --git a/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/server/Server.java
index 2f61aea..4fe9808 100644
--- a/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/server/Server.java
@@ -33,7 +33,7 @@ public class Server {
         Endpoint.publish(address, complexImpl, new LoggingFeature());
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/server/SpringServer.java b/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/server/SpringServer.java
index 032a574..a532f0b 100644
--- a/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/server/SpringServer.java
+++ b/distribution/src/main/release/samples/wsdl_first_dynamic_client/src/main/java/demo/hw/server/SpringServer.java
@@ -29,7 +29,7 @@ public class SpringServer {
         new ClassPathXmlApplicationContext(new String[] {"/server-beans.xml"});
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new SpringServer();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/Client.java b/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/Client.java
index c2fb5bb..bed6efb 100644
--- a/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/Client.java
+++ b/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/Client.java
@@ -40,7 +40,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify wsdl");
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java b/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java
index f2ea332..543f04e 100644
--- a/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java
+++ b/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java
@@ -53,7 +53,7 @@ public final class ClientNonSpring {
     private ClientNonSpring() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify wsdl");
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/server/Server.java b/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/server/Server.java
index 0383ebe..51f97b1 100644
--- a/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/server/Server.java
+++ b/distribution/src/main/release/samples/wsdl_first_https/src/main/java/demo/hw_https/server/Server.java
@@ -43,7 +43,7 @@ public class Server {
         Endpoint.publish(address, implementor, new LoggingFeature());
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         System.out.println("The server's security configuration will be taken "
                            + "from server.xml using the bean name : "
                            + "\"{http://apache.org/hello_world_soap_http}"
diff --git a/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/client/Client.java
index c0bdeda..4ed6cec 100644
--- a/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/client/Client.java
@@ -40,7 +40,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify wsdl");
diff --git a/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/server/Server.java
index 52e19e4..3c8442b 100644
--- a/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/wsdl_first_pure_xml/src/main/java/demo/hw/server/Server.java
@@ -33,7 +33,7 @@ public class Server {
         Endpoint.publish(address, implementor, new LoggingFeature());
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java b/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java
index a6bbd18..c7b6e88 100644
--- a/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java
+++ b/distribution/src/main/release/samples/wsdl_first_rpclit/src/main/java/demo/hwRPCLit/server/Server.java
@@ -31,7 +31,7 @@ public class Server {
         Endpoint.publish(address, implementor, new LoggingFeature());
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java
index 9a56382..acc1a36 100644
--- a/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/client/Client.java
@@ -37,7 +37,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify wsdl");
diff --git a/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/Server.java
index 4d23307..c70898e 100644
--- a/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/wsdl_first_soap12/src/main/java/demo/hw/server/Server.java
@@ -40,7 +40,7 @@ public class Server {
         svrFactory.create();
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server(args[0]);
         System.out.println("Server ready...");
 
diff --git a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java
index aa69ba9..f8e66ca 100644
--- a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/client/Client.java
@@ -38,7 +38,7 @@ public final class Client {
     private Client() {
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
 
         if (args.length == 0) {
             System.out.println("please specify wsdl");
diff --git a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/Server.java
index 68d5bf8..7a4d378 100644
--- a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/wsdl_first_xml_wrapped/src/main/java/demo/hw/server/Server.java
@@ -32,7 +32,7 @@ public class Server {
         Endpoint.publish(address, implementor, new LoggingFeature());
     }
 
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         new Server();
         System.out.println("Server ready...");
 
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/Handler.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/Handler.java
index 753da32..2aef4ca 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/Handler.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/Handler.java
@@ -38,7 +38,7 @@ public class Handler extends URLStreamHandler {
         }
 
         public InputStream getInputStream() throws java.io.IOException {
-            byte bytes[] = PlugInClassLoaderHelper.getResourceAsBytes(url.getPath());
+            byte[] bytes = PlugInClassLoaderHelper.getResourceAsBytes(url.getPath());
 
             if (bytes != null) {
                 return new java.io.ByteArrayInputStream(bytes);
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
index 5823b78..67c2e1f 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoader.java
@@ -43,7 +43,7 @@ public class PlugInClassLoader extends SecureClassLoader {
     private static final String JARS_PROPS_FILE = "jars.properties";
     private static final String FILTERS_PROPS_FILE = "filters.properties";
     private static final String NEFILTERS_PROPS_FILE = "negativefilters.properties";
-    private String jarUrls[] = new String[0];
+    private String[] jarUrls = new String[0];
     private final ProtectionDomain protectionDomain;
 
     private final ClassLoader ploader;
@@ -58,7 +58,7 @@ public class PlugInClassLoader extends SecureClassLoader {
         processJarUrls(jarUrls);
     }
 
-    private void processJarUrls(String urls[]) {
+    private void processJarUrls(String[] urls) {
         for (int i = 0; i < urls.length; i++) {
             if (urls[i].startsWith(ZIP_COLON)) {
                 urls[i] = FILE_COLON + urls[i].substring(ZIP_COLON.length());
@@ -124,7 +124,7 @@ public class PlugInClassLoader extends SecureClassLoader {
     protected Class<?> findClass(String name) throws ClassNotFoundException {
         String path = name.replace('.', '/').concat(".class");
         LOG.fine("findClass " + path);
-        byte bytes[] = null;
+        byte[] bytes = null;
 
         for (int i = 0; i < jarUrls.length; i++) {
             String fullpath = jarUrls[i] + "!/" + path;
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
index a00ec6a..7589ec8 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/core/classloader/PlugInClassLoaderHelper.java
@@ -74,7 +74,7 @@ public final class PlugInClassLoaderHelper {
         Map<?, ?> jarMap = JarLoader.getJarContents(enclosingJar);
 
         if (null != jarMap && jarMap.containsKey(resourceName)) {
-            byte bytes[] = (byte[])jarMap.get(resourceName);
+            byte[] bytes = (byte[])jarMap.get(resourceName);
 
             // this class will not be looked for again
             // once it is loaded so to save memory we
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java
index e2b9811..ccd0cf7 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/InvokingInvocationHandler.java
@@ -60,7 +60,7 @@ public class InvokingInvocationHandler extends CXFInvocationHandlerBase {
         getData().getManagedConnection().close(handle);
     }
 
-    private Object invokeTargetMethod(Object proxy, Method method, Object args[]) throws Throwable {
+    private Object invokeTargetMethod(Object proxy, Method method, Object[] args) throws Throwable {
 
         Object ret = null;
 
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java
index 39a3fd6..4db5974 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/cxf/handlers/ProxyInvocationHandler.java
@@ -45,7 +45,7 @@ public class ProxyInvocationHandler extends CXFInvocationHandlerBase  {
 
     public final Object invoke(final Object proxy,
                                final Method method,
-                               final Object args[]) throws Throwable {
+                               final Object[] args) throws Throwable {
 
         LOG.fine(this + " on " + method);
         Object o = getData().getManagedConnection().getManagedConnectionFactory();
diff --git a/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java b/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
index a13ada9..73e5d6f 100644
--- a/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
+++ b/integration/jca/src/main/java/org/apache/cxf/jca/jarloader/JarLoader.java
@@ -137,7 +137,7 @@ public final class JarLoader {
         } else {
             Map<?, ?> parentMap
                 = (Map<?, ?>)archives.get(buildPartialName(nameComponents, nameComponents.size() - 1));
-            byte bytes[] = (byte[])(parentMap.get(nameComponents.get(nameComponents.size() - 1)));
+            byte[] bytes = (byte[])(parentMap.get(nameComponents.get(nameComponents.size() - 1)));
 
             if (null == bytes) {
                 // unexpected, classpath entry in error, referenced jar is not in the archive
@@ -161,7 +161,7 @@ public final class JarLoader {
             if (ze.isDirectory()) {
                 map.put(ze.getName(), ze.getName());
             } else {
-                byte bytes[] = getBytesFromInputStream(zis, ze.getSize());
+                byte[] bytes = getBytesFromInputStream(zis, ze.getSize());
                 map.put(ze.getName(), bytes);
             }
         }
@@ -171,7 +171,7 @@ public final class JarLoader {
 
     private static byte[] getBytesFromInputStream(InputStream is, long size) throws IOException {
 
-        byte chunk[] = new byte[((size > CHUNK_SIZE) && (size < MAX_CHUNK_SIZE)) ? (int)size : CHUNK_SIZE];
+        byte[] chunk = new byte[((size > CHUNK_SIZE) && (size < MAX_CHUNK_SIZE)) ? (int)size : CHUNK_SIZE];
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
diff --git a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
index 79aa9c3..828f8b2 100644
--- a/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
+++ b/integration/jca/src/test/java/org/apache/cxf/jca/cxf/ManagedConnectionImplTest.java
@@ -119,7 +119,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
     @Test
     public void testGetConnectionWithDudSubjectB() throws ResourceException {
         String user = new String("user");
-        char password[] = {'a', 'b', 'c'};
+        char[] password = {'a', 'b', 'c'};
         PasswordCredential creds = new PasswordCredential(user, password);
         subj.getPrivateCredentials().add(creds);
         Object o = mci.getConnection(subj, cri);
@@ -131,7 +131,7 @@ public class ManagedConnectionImplTest extends ManagedConnectionTestBase {
     @Test
     public void testGetConnectionWithSubject() throws ResourceException {
         String user = new String("user");
-        char password[] = {'a', 'b', 'c'};
+        char[] password = {'a', 'b', 'c'};
         PasswordCredential creds = new PasswordCredential(user, password);
         creds.setManagedConnectionFactory(factory);
         subj.getPrivateCredentials().add(creds);
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
index b83ad8e..2c9201f 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
@@ -129,7 +129,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
      * *.wsdl
      */
     @Parameter
-    protected String includes[];
+    protected String[] includes;
     /**
      * Directory in which the "DONE" markers are saved that
      */
@@ -156,7 +156,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
      * A list of wsdl files to exclude. Can contain ant-style wildcards and double wildcards.
      */
     @Parameter
-    protected String excludes[];
+    protected String[] excludes;
 
     @Parameter(property = "cxf.testWsdlRoot", defaultValue = "${basedir}/src/test/resources/wsdl")
     protected File testWsdlRoot;
@@ -549,7 +549,7 @@ public abstract class AbstractCodegenMoho extends AbstractMojo {
         addPluginArtifact(artifactsPath);
         artifactsPath.addAll(classPath);
 
-        String args[] = createForkOnceArgs(wargs);
+        String[] args = createForkOnceArgs(wargs);
         runForked(artifactsPath, getForkClass().getName(), args);
 
         for (GenericWsdlOption wsdlOption : toDo) {
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
index 91b473e..913c483 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WsdlUtilities.java
@@ -58,7 +58,7 @@ public final class WsdlUtilities {
         return String.join(",", arr);
     }
 
-    public static List<File> getWsdlFiles(File dir, String includes[], String excludes[])
+    public static List<File> getWsdlFiles(File dir, String[] includes, String excludes[])
         throws MojoExecutionException {
 
         List<String> exList = new ArrayList<>();
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java
index 3103621..654ae28 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/ForkOnceWSDL2Java.java
@@ -33,7 +33,7 @@ public final class ForkOnceWSDL2Java {
     private ForkOnceWSDL2Java() {
         //utility
     }
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         File file = new File(args[0]);
         BufferedReader reader = new BufferedReader(new FileReader(file));
         String line = reader.readLine();
@@ -43,7 +43,7 @@ public final class ForkOnceWSDL2Java {
                 reader.close();
                 return;
             }
-            String wargs[] = new String[i];
+            String[] wargs = new String[i];
             for (int x = 0; x < i; x++) {
                 wargs[x] = reader.readLine();
             }
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
index bde505c..4150dea 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/Option.java
@@ -89,7 +89,7 @@ public class Option {
      * A set of dependent files used to detect that the generator must process WSDL, even
      * if generator marker files are up to date.
      */
-    String dependencies[];
+    String[] dependencies;
 
     /**
      * Redundant directories to be deleted after code generation
@@ -252,7 +252,7 @@ public class Option {
     public void setNamespaceExcludes(List<String> namespaceExcludes) {
         this.namespaceExcludes = namespaceExcludes;
     }
-    public void setDependencies(String dependencies[]) {
+    public void setDependencies(String[] dependencies) {
         this.dependencies = dependencies;
     }
 
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
index 677d94e..a451e46 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2java/WsdlOptionLoader.java
@@ -75,8 +75,8 @@ public final class WsdlOptionLoader {
      * @throws MojoExecutionException
      */
     public static List<GenericWsdlOption> loadWsdlOptionsFromFiles(File wsdlBasedir,
-                                                                   String includes[],
-                                                                   String excludes[],
+                                                                   String[] includes,
+                                                                   String[] excludes,
                                                                    File defaultOutputDir)
         throws MojoExecutionException {
 
diff --git a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java
index 148b64a..91d3ab2 100644
--- a/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java
+++ b/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/wsdl2js/ForkOnceWSDL2Javascript.java
@@ -33,7 +33,7 @@ public final class ForkOnceWSDL2Javascript {
     private ForkOnceWSDL2Javascript() {
         //utility
     }
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         File file = new File(args[0]);
         BufferedReader reader = new BufferedReader(new FileReader(file));
         String line = reader.readLine();
@@ -43,7 +43,7 @@ public final class ForkOnceWSDL2Javascript {
                 reader.close();
                 return;
             }
-            String wargs[] = new String[i];
+            String[] wargs = new String[i];
             for (int x = 0; x < i; x++) {
                 wargs[x] = reader.readLine();
             }
diff --git a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
index 8369efc..69c8298 100644
--- a/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
+++ b/maven-plugins/java2wadl-plugin/src/main/java/org/apache/cxf/maven_plugin/javatowadl/DumpJavaDoc.java
@@ -88,7 +88,7 @@ public final class DumpJavaDoc {
         return 0;
     }
 
-    public static boolean validOptions(String options[][], DocErrorReporter reporter) {
+    public static boolean validOptions(String[] options[], DocErrorReporter reporter) {
         boolean foundTagOption = false;
         for (int i = 0; i < options.length; i++) {
             String[] opt = options[i];
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
index b7a68b8..7945dd4 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/common/ForkOnceCodeGenerator.java
@@ -31,7 +31,7 @@ public final class ForkOnceCodeGenerator {
     private ForkOnceCodeGenerator() {
         //utility
     }
-    public static void main(String args[]) throws Exception {
+    public static void main(String[] args) throws Exception {
         File file = new File(args[0]);
         BufferedReader reader = new BufferedReader(new FileReader(file));
         String line = reader.readLine();
@@ -41,7 +41,7 @@ public final class ForkOnceCodeGenerator {
                 reader.close();
                 return;
             }
-            String wargs[] = new String[i];
+            String[] wargs = new String[i];
             for (int x = 0; x < i; x++) {
                 wargs[x] = reader.readLine();
             }
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
index 10e55be..52750de 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
@@ -123,13 +123,13 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
      * *.wadl
      */
     @Parameter
-    String includes[];
+    String[] includes;
 
     /**
      * A list of wadl files to exclude. Can contain ant-style wildcards and double wildcards.
      */
     @Parameter
-    String excludes[];
+    String[] excludes;
 
     /**
      * Allows running the JavaToWs in a separate process.
@@ -299,7 +299,7 @@ public abstract class AbstractCodeGeneratorMojo extends AbstractMojo {
         addPluginArtifact(artifactsPath);
         artifactsPath.addAll(classPath);
 
-        String args[] = createForkOnceArgs(wargs);
+        String[] args = createForkOnceArgs(wargs);
         runForked(artifactsPath, ForkOnceCodeGenerator.class, args);
 
         for (WadlOption option : toDo) {
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java
index 785c7ce..55c894b 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/Option.java
@@ -52,7 +52,7 @@ public class Option {
     /**
      * Specifies JAXB binding files. Use spaces to separate multiple entries.
      */
-    String bindingFiles[] = new String[0];
+    String[] bindingFiles = new String[0];
 
     /**
      * Specifies catalog file to map the imported wadl/schema
@@ -118,14 +118,14 @@ public class Option {
         outputDir = f;
     }
 
-    public void setBindingFiles(String files[]) {
+    public void setBindingFiles(String[] files) {
         bindingFiles = files;
     }
     public String[] getBindingFiles() {
         return bindingFiles;
     }
     public void addBindingFile(File file) {
-        String tmp[] = new String[bindingFiles.length + 1];
+        String[] tmp = new String[bindingFiles.length + 1];
         System.arraycopy(bindingFiles, 0, tmp, 0, bindingFiles.length);
         bindingFiles = tmp;
         bindingFiles[bindingFiles.length - 1] = file.getAbsolutePath();
diff --git a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
index 88822fd..c54ab9d 100644
--- a/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
+++ b/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/OptionLoader.java
@@ -85,8 +85,8 @@ public final class OptionLoader {
      * @throws MojoExecutionException
      */
     public static List<WadlOption> loadWadlOptionsFromFile(File wadlBasedir,
-                                                           String includes[],
-                                                            String excludes[],
+                                                           String[] includes,
+                                                            String[] excludes,
                                                             Option defaultOptions,
                                                             File defaultOutputDir)
         throws MojoExecutionException {
@@ -117,7 +117,7 @@ public final class OptionLoader {
         return String.join(",", arr);
     }
 
-    private static List<File> getWadlFiles(File dir, String includes[], String excludes[])
+    private static List<File> getWadlFiles(File dir, String[] includes, String excludes[])
         throws MojoExecutionException {
 
         List<String> exList = new ArrayList<>();
diff --git a/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java b/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
index 35aadbb..0da2c7c 100644
--- a/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
+++ b/maven-plugins/wsdl-validator-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDLValidatorMojo.java
@@ -71,13 +71,13 @@ public class WSDLValidatorMojo extends AbstractMojo {
      *
      * @parameter
      */
-    private String includes[];
+    private String[] includes;
     /**
      * A list of wsdl files to exclude. Can contain ant-style wildcards and double wildcards.
      *
      * @parameter
      */
-    private String excludes[];
+    private String[] excludes;
 
     private String getIncludeExcludeString(String[] arr) {
         if (arr == null || arr.length == 0) {
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
index c3e04d9..6c30a4e 100755
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/interceptors/SystemExceptionHelper.java
@@ -272,7 +272,7 @@ public final class SystemExceptionHelper
             TypeCode minortc = orb.get_primitive_tc(TCKind.tk_long);
             smBuf[0] = new StructMember("minor", minortc, null);
 
-            String csLabels[] = {"COMPLETED_YES", "COMPLETED_NO", "COMPLETED_MAYBE"};
+            String[] csLabels = {"COMPLETED_YES", "COMPLETED_NO", "COMPLETED_MAYBE"};
             TypeCode completedtc = orb
                 .create_enum_tc("IDL:omg.org/CORBA/CompletionStatus:1.0",
                               "CompletionStatus", csLabels);
diff --git a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
index ddf6d00..6cdead7 100644
--- a/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
+++ b/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/utils/CorbaObjectReferenceHelper.java
@@ -149,7 +149,7 @@ public final class CorbaObjectReferenceHelper {
 
     public static String extractTypeIdFromIOR(String url) {
         String ret = "";
-        byte data[] = DatatypeConverter.parseHexBinary(url.substring(4));
+        byte[] data = DatatypeConverter.parseHexBinary(url.substring(4));
         if (data.length > 0) {
             // parse out type_id from IOR CDR encapsulation
             boolean bigIndian = !(data[0] > 0);
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
index f72c92c..9171156 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
@@ -252,7 +252,7 @@ public class CorbaObjectReaderTest extends Assert {
     @Test
     public void testReadArray() {
 
-        int data[] = {1, 1, 2, 3, 5, 8, 13, 21};
+        int[] data = {1, 1, 2, 3, 5, 8, 13, 21};
 
         OutputStream oStream = orb.create_output_stream();
         oStream.write_long_array(data, 0, data.length);
@@ -288,7 +288,7 @@ public class CorbaObjectReaderTest extends Assert {
 
     @Test
     public void testReadSequence() {
-        String data[] = {"one", "one", "two", "three", "five", "eight", "thirteen", "twenty-one"};
+        String[] data = {"one", "one", "two", "three", "five", "eight", "thirteen", "twenty-one"};
 
         OutputStream oStream = orb.create_output_stream();
         oStream.write_long(data.length);
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
index 0cb0fbf..f8504d7 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectWriterTest.java
@@ -245,7 +245,7 @@ public class CorbaObjectWriterTest extends Assert {
 
     @Test
     public void testWriteArray() {
-        int data[] = {1, 1, 2, 3, 5, 8, 13, 21};
+        int[] data = {1, 1, 2, 3, 5, 8, 13, 21};
 
         // create an array of longs
         QName longIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "long", CorbaConstants.NP_WSDL_CORBA);
@@ -279,7 +279,7 @@ public class CorbaObjectWriterTest extends Assert {
 
     @Test
     public void testWriteSequence() {
-        String data[] = {"one", "one", "two", "three", "five", "eight", "thirteen", "twenty-one"};
+        String[] data = {"one", "one", "two", "three", "five", "eight", "thirteen", "twenty-one"};
 
         // create an sequence of strings
         QName stringIdlType = new QName(CorbaConstants.NU_WSDL_CORBA, "string", CorbaConstants.NP_WSDL_CORBA);
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
index e929c10..4a5e3eb 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaArrayHandlerTest.java
@@ -76,7 +76,7 @@ public class CorbaArrayHandlerTest extends Assert {
         obj = new CorbaArrayHandler(objName, objIdlType, objTypeCode, arrayType);
         assertNotNull(obj);
 
-        int arrayData[] = {2, 4, 6, 8, 10};
+        int[] arrayData = {2, 4, 6, 8, 10};
         for (int i = 0; i < arrayData.length; ++i) {
             QName elName = new QName("item");
             QName elIdlType = CorbaConstants.NT_CORBA_LONG;
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
index 23785ed..5a2d2ec 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaEnumHandlerTest.java
@@ -72,7 +72,7 @@ public class CorbaEnumHandlerTest extends Assert {
         QName enumName = new QName("EnumType");
         QName enumIdlType =
             new QName(CorbaConstants.NU_WSDL_CORBA, "EnumType", CorbaConstants.NP_WSDL_CORBA);
-        String members[] = new String[3];
+        String[] members = new String[3];
         members[0] = enumerator0.getValue();
         members[1] = enumerator1.getValue();
         members[2] = enumerator2.getValue();
diff --git a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
index 693f94d..9af999e 100644
--- a/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
+++ b/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/types/CorbaSequenceHandlerTest.java
@@ -78,7 +78,7 @@ public class CorbaSequenceHandlerTest extends Assert {
         obj = new CorbaSequenceHandler(objName, objIdlType, objTypeCode, sequenceType);
         assertNotNull(obj);
 
-        int sequenceData[] = {2, 4, 6, 8, 10};
+        int[] sequenceData = {2, 4, 6, 8, 10};
         for (int i = 0; i < sequenceData.length; ++i) {
             QName elName = new QName("item");
             QName elIdlType = CorbaConstants.NT_CORBA_LONG;
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
index 60bf875..d3c40c4 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJOutInterceptor.java
@@ -148,7 +148,7 @@ public class SAAJOutInterceptor extends AbstractSoapInterceptor {
             XMLStreamWriter dummyWriter = StaxUtils.createXMLStreamWriter(new OutputStream() {
                     public void write(int b) throws IOException {
                     }
-                    public void write(byte b[], int off, int len) throws IOException {
+                    public void write(byte[] b, int off, int len) throws IOException {
                     }
                 });
             message.setContent(XMLStreamWriter.class, dummyWriter);
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
index 15d476d..f8a25ab 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
@@ -983,7 +983,7 @@ public final class JAXBEncoderDecoder {
                 }
                 Field f = ReflectionUtil.getDeclaredField(c.getClass(), "mNamespaces");
                 ReflectionUtil.setAccessible(f);
-                String ns[] = (String[])f.get(c);
+                String[] ns = (String[])f.get(c);
                 for (int x = 0; x < ns.length; x += 2) {
                     if (ns[x] == null) {
                         nsMap.put("", ns[x + 1]);
diff --git a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
index ed9f64f..7dbfa30 100644
--- a/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
+++ b/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/WrapperHelperCompiler.java
@@ -126,7 +126,7 @@ final class WrapperHelperCompiler extends ASMHelper {
         try {
             if (b) {
                 cw.visitEnd();
-                byte bt[] = cw.toByteArray();
+                byte[] bt = cw.toByteArray();
                 Class<?> cl = loadClass(newClassName.replace('/', '.'), wrapperType, bt);
                 Object o = cl.newInstance();
                 return WrapperHelper.class.cast(o);
diff --git a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
index 56f3a03..346a4c8 100644
--- a/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
+++ b/rt/databinding/jaxb/src/test/java/org/apache/cxf/jaxb/JAXBEncoderDecoderTest.java
@@ -84,7 +84,7 @@ public class JAXBEncoderDecoderTest extends Assert {
     JAXBContext context;
     Schema schema;
     Map<String, String> mapField;
-    String arrayField[];
+    String[] arrayField;
     List<String> listField;
 
     @Before
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
index 5f40291..1374a1d 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
@@ -319,7 +319,7 @@ public class DispatchImpl<T> implements Dispatch<T>, BindingProvider, Closeable
             Holder<T> holder = new Holder<>(obj);
             opName = calculateOpName(holder, opName, hasOpName);
 
-            Object ret[] = client.invokeWrapped(opName, holder.value);
+            Object[] ret = client.invokeWrapped(opName, holder.value);
             if (isOneWay || ret == null || ret.length == 0) {
                 return null;
             }
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
index e5e7911..bad105a 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxWsClientProxy.java
@@ -281,7 +281,7 @@ public class JaxWsClientProxy extends org.apache.cxf.frontend.ClientProxy implem
 
     private static Locale stringToLocale(String locale) {
         // use the IETF BCP 47 delimiter but accept the toString delimiter for cxf 2.7.x
-        String parts[] = locale.split("-", 0);
+        String[] parts = locale.split("-", 0);
         if (parts.length == 1) {
             return new Locale(parts[0]);
         } else if (parts.length == 2) {
diff --git a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
index fa46e26..c582c88 100644
--- a/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
+++ b/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java
@@ -256,7 +256,7 @@ public class JaxWsClientTest extends AbstractJaxWsTest {
         assertEquals(0, part.getIndex());
 
         d.setMessageObserver(new MessageReplayObserver("sayHiResponse.xml"));
-        Object ret[] = client.invoke(bop, new Object[] {"hi"}, null);
+        Object[] ret = client.invoke(bop, new Object[] {"hi"}, null);
         assertNotNull(ret);
         assertEquals("Wrong number of return objects", 1, ret.length);
 
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 d6b6db8..f9402a6 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
@@ -71,7 +71,7 @@ public class WrappedAttachmentsTest extends Assert {
         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(); //NOPMD - explicitly test this
         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/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
index d0670ca..4f5ad54 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ClientProxy.java
@@ -93,7 +93,7 @@ public class ClientProxy implements InvocationHandler, Closeable {
         if (client == null) {
             throw new IllegalStateException("The client has been closed.");
         }
-        Object rawRet[] = client.invoke(oi, params);
+        Object[] rawRet = client.invoke(oi, params);
 
         if (rawRet != null && rawRet.length > 0) {
             return rawRet[0];
diff --git a/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java b/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
index f3f53d0..0a72785 100644
--- a/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
+++ b/rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java
@@ -26,7 +26,7 @@ import org.osgi.framework.FrameworkUtil;
 
 public class OsgiSwaggerUiResolver extends SwaggerUiResolver {
     private static final String DEFAULT_COORDINATES = "org.webjars/swagger-ui";
-    private static final String DEFAULT_LOCATIONS[] = {
+    private static final String[] DEFAULT_LOCATIONS = {
         "mvn:" + DEFAULT_COORDINATES + "/",
         "wrap:mvn:" + DEFAULT_COORDINATES + "/"
     };
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweOutputStream.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweOutputStream.java
index f9da335..059fc57 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweOutputStream.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweOutputStream.java
@@ -53,7 +53,7 @@ public class JweOutputStream extends FilterOutputStream {
     }
 
     @Override
-    public void write(byte b[], int off, int len) throws IOException {
+    public void write(byte[] b, int off, int len) throws IOException {
         if (lastRawDataChunk != null) {
             int remaining = blockSize - lastRawDataChunk.length;
             int lenToCopy = remaining < len ? remaining : len;
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/EcDsaJwsSignatureProvider.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/EcDsaJwsSignatureProvider.java
index dc811d81..991b014 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/EcDsaJwsSignatureProvider.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/EcDsaJwsSignatureProvider.java
@@ -61,7 +61,7 @@ public class EcDsaJwsSignatureProvider extends PrivateKeyJwsSignatureProvider {
         }
     }
 
-    private static byte[] jcaOutputToJoseOutput(int jwsSignatureLen, byte jcaDer[]) {
+    private static byte[] jcaOutputToJoseOutput(int jwsSignatureLen, byte[] jcaDer) {
         // Apache2 Licensed Jose4j code which adapts the Apache Santuario XMLSecurity
         // code and aligns it with JWS/JWA requirements
         if (jcaDer.length < 8 || jcaDer[0] != 48) {
@@ -101,7 +101,7 @@ public class EcDsaJwsSignatureProvider extends PrivateKeyJwsSignatureProvider {
             throw new JoseException("Invalid format of ECDSA signature");
         }
         
-        byte concatenatedSignatureBytes[] = new byte[2 * rawLen];
+        byte[] concatenatedSignatureBytes = new byte[2 * rawLen];
 
         System.arraycopy(jcaDer, (offset + 2 + rLength) - i, concatenatedSignatureBytes, rawLen - i, i);
         System.arraycopy(jcaDer, (offset + 2 + rLength + 2 + sLength) - j, 
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/EcDsaJwsSignatureVerifier.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/EcDsaJwsSignatureVerifier.java
index 456b75a..33c03a0 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/EcDsaJwsSignatureVerifier.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/EcDsaJwsSignatureVerifier.java
@@ -66,7 +66,7 @@ public class EcDsaJwsSignatureVerifier extends PublicKeyJwsSignatureVerifier {
         return AlgorithmUtils.isEcDsaSign(algo);
     }
     
-    private static byte[] signatureToDer(byte joseSig[]) {
+    private static byte[] signatureToDer(byte[] joseSig) {
         // Apache2 Licensed Jose4j code which adapts the Apache Santuario XMLSecurity
         // code and aligns it with JWS/JWA requirements
         int rawLen = joseSig.length / 2;
@@ -100,7 +100,7 @@ public class EcDsaJwsSignatureVerifier extends PublicKeyJwsSignatureVerifier {
             throw new JoseException("Invalid format of ECDSA signature");
         }
         int offset;
-        byte derEncodedSignatureBytes[];
+        byte[] derEncodedSignatureBytes;
         if (len < 128) {
             derEncodedSignatureBytes = new byte[2 + 2 + j + 2 + l];
             offset = 1;
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsInputStream.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsInputStream.java
index b94eef7..148d3dd 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsInputStream.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsInputStream.java
@@ -49,7 +49,7 @@ public class JwsInputStream extends FilterInputStream {
         return value;
     }
  
-    public int read(byte b[], int off, int len) throws IOException {
+    public int read(byte[] b, int off, int len) throws IOException {
         int num = in.read(b, off, len);
         if (num != -1) {
             signature.update(b, off, num);
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJsonOutputStream.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJsonOutputStream.java
index bbd6e32..7018024 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJsonOutputStream.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsJsonOutputStream.java
@@ -53,7 +53,7 @@ public class JwsJsonOutputStream extends FilterOutputStream {
     }
 
     @Override
-    public void write(final byte b[], final int off, final int len) throws IOException {
+    public void write(final byte[] b, final int off, final int len) throws IOException {
         //TODO: Review if it is at least theoretically possible that a given b[] region
         // can be modified in a subsequent write which might affect the signature calculation
         executor.execute(new Runnable() {
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsOutputStream.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsOutputStream.java
index d7d5cf1..7aaebf2 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsOutputStream.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsOutputStream.java
@@ -42,7 +42,7 @@ public class JwsOutputStream extends FilterOutputStream {
     }
 
     @Override
-    public void write(byte b[], int off, int len) throws IOException {
+    public void write(byte[] b, int off, int len) throws IOException {
         signature.update(b, off, len);
         out.write(b, off, len);
         out.flush();
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtils.java
index 8b50b5e..9b0623b 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtils.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/AuthorizationUtils.java
@@ -52,7 +52,7 @@ public final class AuthorizationUtils {
         } catch (Exception ex) {
             throw ExceptionUtils.toNotAuthorizedException(ex, null);
         }
-        String authInfo[] = authDecoded.split(":");
+        String[] authInfo = authDecoded.split(":");
         if (authInfo.length == 2) {
             return authInfo;
         }
diff --git a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
index ecf2f7c..036ad3e 100644
--- a/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
+++ b/rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/MetadataWriter.java
@@ -175,7 +175,7 @@ public class MetadataWriter {
             writer.writeStartElement("ds", "X509Certificate", "http://www.w3.org/2000/09/xmldsig#");
 
             // Write the Base-64 encoded certificate
-            byte data[] = signingCert.getEncoded();
+            byte[] data = signingCert.getEncoded();
             String encodedCertificate = Base64.getMimeEncoder().encodeToString(data);
             writer.writeCharacters(encodedCertificate);
 
diff --git a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java
index c14a5b5..74d84a2 100644
--- a/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java
+++ b/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/xml/XmlEncOutInterceptor.java
@@ -266,7 +266,7 @@ public class XmlEncOutInterceptor extends AbstractXmlSecOutInterceptor {
 
         Node keyIdentifierNode = null;
         if (keyIdType.equals(RSSecurityUtils.X509_CERT)) {
-            byte data[] = null;
+            byte[] data = null;
             try {
                 data = remoteCert.getEncoded();
             } catch (CertificateEncodingException e) {
diff --git a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index 29e4692..b3806ab 100755
--- a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++ b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -429,7 +429,7 @@ public class AsyncHTTPConduit extends URLConnectionHTTPConduit {
         protected void setupWrappedStream() throws IOException {
             connect(true);
             wrappedStream = new OutputStream() {
-                public void write(byte b[], int off, int len) throws IOException {
+                public void write(byte[] b, int off, int len) throws IOException {
                     if (exception instanceof IOException) {
                         throw (IOException) exception;
                     }
@@ -658,7 +658,7 @@ public class AsyncHTTPConduit extends URLConnectionHTTPConduit {
         }
 
         protected void closeInputStream() throws IOException {
-            byte bytes[] = new byte[1024];
+            byte[] bytes = new byte[1024];
             while (inbuf.read(bytes) > 0) {
                 //nothing
             }
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
index 2ee0ff2..9ca5b93 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
@@ -317,7 +317,7 @@ public class JettyHTTPDestination extends ServletDestination {
             written = true;
             out.write(b);
         }
-        public void write(byte b[], int off, int len) throws IOException {
+        public void write(byte[] b, int off, int len) throws IOException {
             written = true;
             out.write(b, off, len);
         }
diff --git a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
index d11da9c..f735e14 100644
--- a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
+++ b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
@@ -289,7 +289,7 @@ public class NettyHttpConduit extends URLConnectionHTTPConduit implements BusLif
         protected void setupWrappedStream() throws IOException {
             connect(true);
             wrappedStream = new OutputStream() {
-                public void write(byte b[], int off, int len) throws IOException {
+                public void write(byte[] b, int off, int len) throws IOException {
                     outputStream.write(b, off, len);
                 }
                 public void write(int b) throws IOException {
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
index 7729c79..b8d97eb 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/CXFAuthenticator.java
@@ -79,7 +79,7 @@ public class CXFAuthenticator extends Authenticator {
 
                 InputStream ins = ReferencingAuthenticator.class
                         .getResourceAsStream("ReferencingAuthenticator.class");
-                byte b[] = IOUtils.readBytesFromStream(ins);
+                byte[] b = IOUtils.readBytesFromStream(ins);
 
                 ReflectionUtil.setAccessible(m).invoke(loader, ReferencingAuthenticator.class.getName(),
                                                        b, 0, b.length);
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 2bcc8bd..b3dbba6 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -659,7 +659,7 @@ public abstract class HTTPConduit
         try {
             if (in != null) {
                 int count = 0;
-                byte buffer[] = new byte[1024];
+                byte[] buffer = new byte[1024];
                 while (in.read(buffer) != -1
                     && count < 25) {
                     //don't do anything, we just need to pull off the unread data (like
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/AliasedX509ExtendedKeyManager.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/AliasedX509ExtendedKeyManager.java
index 787b7b2..573ada8 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/AliasedX509ExtendedKeyManager.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/AliasedX509ExtendedKeyManager.java
@@ -115,7 +115,7 @@ public class AliasedX509ExtendedKeyManager extends X509ExtendedKeyManager {
      * @see javax.net.ssl.X509ExtendedKeyManager#chooseEngineClientAlias(String[], Principal[], SSLEngine)
      */
     @Override
-    public String chooseEngineClientAlias(String keyType[], Principal[] issuers, SSLEngine engine) {
+    public String chooseEngineClientAlias(String[] keyType, Principal[] issuers, SSLEngine engine) {
         return keyAlias == null ? super.chooseEngineClientAlias(keyType, issuers, engine) : keyAlias;
     }
 }
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java
index e0a762e..235f7e5 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/SSLSocketFactoryWrapper.java
@@ -104,7 +104,7 @@ class SSLSocketFactoryWrapper extends SSLSocketFactory {
         }
 
         if (protocol != null) {
-            String p[] = findProtocols(protocol, socket.getSupportedProtocols());
+            String[] p = findProtocols(protocol, socket.getSupportedProtocols());
             if (p != null) {
                 socket.setEnabledProtocols(p);
             }
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
index 15bd03c..6caa5c9 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/CXFServlet.java
@@ -136,7 +136,7 @@ public class CXFServlet extends CXFNonSpringServlet
         }
         if (ctx != null) {
             ctx2.setParent(ctx);
-            String names[] = ctx.getBeanNamesForType(Bus.class);
+            String[] names = ctx.getBeanNamesForType(Bus.class);
             if (names == null || names.length == 0) {
                 ctx2.setConfigLocations(new String[] {"classpath:/META-INF/cxf/cxf.xml",
                                                       location});
diff --git a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
index 807c4ec..d69dfcd 100644
--- a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
+++ b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/AbstractJMSTester.java
@@ -184,7 +184,7 @@ public abstract class AbstractJMSTester extends Assert {
         ByteArrayInputStream bis = (ByteArrayInputStream)message.getContent(InputStream.class);
         String response = "<not found>";
         if (bis != null) {
-            byte bytes[] = new byte[bis.available()];
+            byte[] bytes = new byte[bis.available()];
             try {
                 bis.read(bytes);
             } catch (IOException ex) {
@@ -194,7 +194,7 @@ public abstract class AbstractJMSTester extends Assert {
             response = IOUtils.newStringFromBytes(bytes);
         } else {
             StringReader reader = (StringReader)message.getContent(Reader.class);
-            char buffer[] = new char[5000];
+            char[] buffer = new char[5000];
             try {
                 int i = reader.read(buffer);
                 response = new String(buffer, 0, i);
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 89e603b..4d54868 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
@@ -148,7 +148,7 @@ public class JMSDestinationTest extends AbstractJMSTester {
         ByteArrayInputStream bis = (ByteArrayInputStream)message.getContent(InputStream.class);
         String response = "<not found>";
         if (bis != null) {
-            byte bytes[] = new byte[bis.available()];
+            byte[] bytes = new byte[bis.available()];
             try {
                 bis.read(bytes);
             } catch (IOException ex) {
@@ -158,7 +158,7 @@ public class JMSDestinationTest extends AbstractJMSTester {
             response = IOUtils.newStringFromBytes(bytes);
         } else {
             StringReader reader = (StringReader)message.getContent(Reader.class);
-            char buffer[] = new char[5000];
+            char[] buffer = new char[5000];
             try {
                 int i = reader.read(buffer);
                 response = new String(buffer, 0, i);
diff --git a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
index 8a2edc4..9c62ce3 100644
--- a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
+++ b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPConduit.java
@@ -304,7 +304,7 @@ public class UDPConduit extends AbstractConduit {
                 }
 
                 if (!message.getExchange().isOneWay()) {
-                    byte bytes[] = new byte[64 * 1024];
+                    byte[] bytes = new byte[64 * 1024];
                     DatagramPacket p = new DatagramPacket(bytes, bytes.length);
                     Object to = message.getContextualProperty(MULTI_RESPONSE_TIMEOUT);
                     Integer i = null;
@@ -358,7 +358,7 @@ public class UDPConduit extends AbstractConduit {
         public void write(int b) throws IOException {
             buffer.put(new byte[] {(byte)b}, 0, 1);
         }
-        public void write(byte b[], int off, int len) throws IOException {
+        public void write(byte[] b, int off, int len) throws IOException {
             while (len > buffer.remaining()) {
                 int nlen = buffer.remaining();
                 buffer.put(b, off, nlen);
diff --git a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPDestination.java b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPDestination.java
index ed78692..c5b8996 100644
--- a/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPDestination.java
+++ b/rt/transports/udp/src/main/java/org/apache/cxf/transport/udp/UDPDestination.java
@@ -83,7 +83,7 @@ public class UDPDestination extends AbstractDestination {
                     return;
                 }
                 try {
-                    byte bytes[] = new byte[64 * 1024];
+                    byte[] bytes = new byte[64 * 1024];
                     final DatagramPacket p = new DatagramPacket(bytes, bytes.length);
                     mcast.receive(p);
 
@@ -341,7 +341,7 @@ public class UDPDestination extends AbstractDestination {
         public void write(int b) throws IOException {
             buffer.put(new byte[] {(byte)b}, 0, 1);
         }
-        public void write(byte b[], int off, int len) throws IOException {
+        public void write(byte[] b, int off, int len) throws IOException {
             while (len > buffer.remaining()) {
                 int nlen = buffer.remaining();
                 buffer.put(b, off, nlen);
diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
index 61f1f9a..4136a73 100644
--- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
+++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java
@@ -170,7 +170,7 @@ public class AhcWebSocketConduit extends URLConnectionHTTPConduit {
             wrappedStream = new OutputStream() {
 
                 @Override
-                public void write(byte b[], int off, int len) throws IOException {
+                public void write(byte[] b, int off, int len) throws IOException {
                     //REVISIT support multiple writes and flush() to write the entire block data?
                     // or provides the fragment mode?
                     Map<String, String> headers = new HashMap<>();
diff --git a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
index 665cfde..66a9024 100644
--- a/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
+++ b/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/PolicyAnnotationListener.java
@@ -419,7 +419,7 @@ public class PolicyAnnotationListener implements FactoryBeanListener {
     private String getPolicyRefURI(Element element) {
         return element.getAttributeNS(null, "URI");
     }
-    private boolean isExistsPolicy(Object exts[], String uri) {
+    private boolean isExistsPolicy(Object[] exts, String uri) {
         exts = exts == null ? new Object[0] : exts;
         for (Object o : exts) {
             if (o instanceof UnknownExtensibilityElement) {
@@ -433,7 +433,7 @@ public class PolicyAnnotationListener implements FactoryBeanListener {
         return false;
     }
 
-    private boolean isExistsPolicyReference(Object exts[], String uri) {
+    private boolean isExistsPolicyReference(Object[] exts, String uri) {
         exts = exts == null ? new Object[0] : exts;
         for (Object o : exts) {
             if (o instanceof UnknownExtensibilityElement) {
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
index ccc7c17..9165f731e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java
@@ -204,7 +204,7 @@ abstract class STSInvoker implements Invoker {
         byte[] clientEntropy,
         int keySize
     ) throws NoSuchAlgorithmException, WSSecurityException, XMLStreamException {
-        byte secret[] = null;
+        byte[] secret = null;
         writer.writeStartElement(prefix, "RequestedProofToken", namespace);
         if (clientEntropy == null) {
             secret = WSSecurityUtil.generateNonce(keySize / 8);
@@ -214,7 +214,7 @@ abstract class STSInvoker implements Invoker {
             writer.writeCharacters(XMLUtils.encodeToString(secret));
             writer.writeEndElement();
         } else {
-            byte entropy[] = WSSecurityUtil.generateNonce(keySize / 8);
+            byte[] entropy = WSSecurityUtil.generateNonce(keySize / 8);
             P_SHA1 psha1 = new P_SHA1();
             secret = psha1.createKey(clientEntropy, entropy, 0, keySize / 8);
 
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
index 3e3ba5c..3f53d5f 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/SecureConversationInInterceptor.java
@@ -330,7 +330,7 @@ class SecureConversationInInterceptor extends AbstractPhaseInterceptor<SoapMessa
             }
             writer.writeStartElement(prefix, "RequestSecurityTokenResponse", namespace);
 
-            byte clientEntropy[] = null;
+            byte[] clientEntropy = null;
             int keySize = 256;
             long ttl = WSS4JUtils.getSecurityTokenLifetime(exchange.getOutMessage());
             String tokenType = null;
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index 6a61736..c9f688c 100755
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -871,7 +871,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
 
         writer.writeEndElement();
 
-        Object obj[] = client.invoke(boi, new DOMSource(writer.getDocument().getDocumentElement()));
+        Object[] obj = client.invoke(boi, new DOMSource(writer.getDocument().getDocumentElement()));
 
         return new STSResponse((DOMSource)obj[0], requestorEntropy, cert, crypto);
     }
@@ -1091,7 +1091,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
 
         writer.writeEndElement();
 
-        Object obj[] = client.invoke(boi, new DOMSource(writer.getDocument().getDocumentElement()));
+        Object[] obj = client.invoke(boi, new DOMSource(writer.getDocument().getDocumentElement()));
 
         return new STSResponse((DOMSource)obj[0], null);
     }
@@ -1164,7 +1164,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
             writer.writeEndElement();
             writer.writeEndElement();
 
-            Object o[] = client.invoke(boi, new DOMSource(writer.getDocument().getDocumentElement()));
+            Object[] o = client.invoke(boi, new DOMSource(writer.getDocument().getDocumentElement()));
 
             return new STSResponse((DOMSource)o[0], null);
         }
@@ -1211,7 +1211,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
         writer.writeEndElement();
         writer.writeEndElement();
 
-        Object o[] = client.invoke(boi, new DOMSource(writer.getDocument().getDocumentElement()));
+        Object[] o = client.invoke(boi, new DOMSource(writer.getDocument().getDocumentElement()));
 
         return new STSResponse((DOMSource)o[0], requestorEntropy, cert, crypto);
     }
diff --git a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
index d9dde8e..283adee 100644
--- a/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
+++ b/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ClassReader.java
@@ -72,7 +72,7 @@ class ClassReader extends ByteArrayInputStream {
 
     private Map<String, Method> attrMethods;
 
-    protected ClassReader(byte buf[], Map<String, Method> attrMethods) {
+    protected ClassReader(byte[] buf, Map<String, Method> attrMethods) {
         super(buf);
 
         this.attrMethods = attrMethods;
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/STSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/STSServer.java
index 4a0ca23..f148a15 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/STSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/STSServer.java
@@ -44,7 +44,7 @@ public class STSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/StaxSTSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/StaxSTSServer.java
index 1e819d5..4a27729 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/StaxSTSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/asymmetric_encr/StaxSTSServer.java
@@ -44,7 +44,7 @@ public class StaxSTSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new StaxSTSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/STSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/STSServer.java
index 7bd80fc..700f488 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/STSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/STSServer.java
@@ -44,7 +44,7 @@ public class STSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
index d458ee2..50c21c7 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/SimpleBatchSTSClient.java
@@ -559,7 +559,7 @@ public class SimpleBatchSTSClient implements Configurable, InterceptorProvider {
         }
         writer.writeEndElement();
 
-        Object obj[] = client.invoke(boi, new DOMSource(writer.getDocument().getDocumentElement()));
+        Object[] obj = client.invoke(boi, new DOMSource(writer.getDocument().getDocumentElement()));
 
         Element responseCollection = getDocumentElement((DOMSource)obj[0]);
         Node child = responseCollection.getFirstChild();
@@ -609,7 +609,7 @@ public class SimpleBatchSTSClient implements Configurable, InterceptorProvider {
         }
         writer.writeEndElement();
 
-        Object obj[] = client.invoke(boi, new DOMSource(writer.getDocument().getDocumentElement()));
+        Object[] obj = client.invoke(boi, new DOMSource(writer.getDocument().getDocumentElement()));
 
         Element responseCollection = getDocumentElement((DOMSource)obj[0]);
         Node child = responseCollection.getFirstChild();
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/StaxSTSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/StaxSTSServer.java
index 24c1a79..e12cb10 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/StaxSTSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/batch/StaxSTSServer.java
@@ -44,7 +44,7 @@ public class StaxSTSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new StaxSTSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/STSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/STSServer.java
index 895320e..7bef409 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/STSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/STSServer.java
@@ -44,7 +44,7 @@ public class STSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/STSServer2.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/STSServer2.java
index 85212f6..5d7c330 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/STSServer2.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/cross_domain/STSServer2.java
@@ -44,7 +44,7 @@ public class STSServer2 extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer2().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/STSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/STSServer.java
index d0f11ff..dbf4f21 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/STSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom/STSServer.java
@@ -44,7 +44,7 @@ public class STSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/STSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/STSServer.java
index 779ee04..65bc7eb 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/STSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/custom_onbehalfof/STSServer.java
@@ -44,7 +44,7 @@ public class STSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/defaultstsprovider/STSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/defaultstsprovider/STSServer.java
index 8838df9..c227a01 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/defaultstsprovider/STSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/defaultstsprovider/STSServer.java
@@ -44,7 +44,7 @@ public class STSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/STSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/STSServer.java
index c66e92f..eb5e64c 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/STSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/STSServer.java
@@ -44,7 +44,7 @@ public class STSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/StaxSTSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/StaxSTSServer.java
index 5a74a41..f7885d6 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/StaxSTSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/deployment/StaxSTSServer.java
@@ -44,7 +44,7 @@ public class StaxSTSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new StaxSTSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/STSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/STSServer.java
index 77a9465..1029e7c 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/STSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/STSServer.java
@@ -44,7 +44,7 @@ public class STSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/STSServer2.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/STSServer2.java
index a1ff325..8946708 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/STSServer2.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/distributed_caching/STSServer2.java
@@ -44,7 +44,7 @@ public class STSServer2 extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer2().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/STSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/STSServer.java
index 030eb0f..3cbcc19 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/STSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/STSServer.java
@@ -44,7 +44,7 @@ public class STSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/STSServer2.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/STSServer2.java
index 4070658..a7fa0ea 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/STSServer2.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/realms/STSServer2.java
@@ -44,7 +44,7 @@ public class STSServer2 extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer2().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/STSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/STSServer.java
index c6bc916..6bf0dfa 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/STSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/STSServer.java
@@ -44,7 +44,7 @@ public class STSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/STSServerPOP.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/STSServerPOP.java
index c5f2bb3..cd9dbe6 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/STSServerPOP.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/STSServerPOP.java
@@ -47,7 +47,7 @@ public class STSServerPOP extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServerPOP().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/StaxSTSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/StaxSTSServer.java
index 569ffa4..b52734bc 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/StaxSTSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/renew/StaxSTSServer.java
@@ -44,7 +44,7 @@ public class StaxSTSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new StaxSTSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/STSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/STSServer.java
index 663ea25..119fb7f 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/STSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/STSServer.java
@@ -44,7 +44,7 @@ public class STSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/StaxSTSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/StaxSTSServer.java
index 4729d42..e7f0d85 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/StaxSTSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/secure_conv/StaxSTSServer.java
@@ -44,7 +44,7 @@ public class StaxSTSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new StaxSTSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSServer.java
index 09b00ed..c1c9f58 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/STSServer.java
@@ -44,7 +44,7 @@ public class STSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer().run();
     }
 }
diff --git a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/StaxSTSServer.java b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/StaxSTSServer.java
index afef229..d22ec1d 100644
--- a/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/StaxSTSServer.java
+++ b/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/sts_sender_vouches/StaxSTSServer.java
@@ -44,7 +44,7 @@ public class StaxSTSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new StaxSTSServer().run();
     }
 }
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/AsymmetricServer.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/AsymmetricServer.java
index a7e3015..71ca1f9 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/AsymmetricServer.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/AsymmetricServer.java
@@ -44,7 +44,7 @@ public class AsymmetricServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new AsymmetricServer().run();
     }
 }
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/Server.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/Server.java
index d21e054..a51bcef 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/Server.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/Server.java
@@ -44,7 +44,7 @@ public class Server extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new Server().run();
     }
 }
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/StaxServer.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/StaxServer.java
index 976fa59..b7c5be7 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/StaxServer.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/StaxServer.java
@@ -44,7 +44,7 @@ public class StaxServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new StaxServer().run();
     }
 }
diff --git a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
index d11b4bc..b31ac99 100644
--- a/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
+++ b/services/ws-discovery/ws-discovery-api/src/test/java/org/apache/cxf/ws/discovery/WSDiscoveryClientTest.java
@@ -129,7 +129,7 @@ public final class WSDiscoveryClientTest {
                         String msg = IOUtils.readStringFromStream(ins);
                         msg = msg.replace("urn:uuid:883d0d53-92aa-4066-9b6f-9eadb1832366",
                                           incoming);
-                        byte out[] = msg.getBytes(StandardCharsets.UTF_8);
+                        byte[] out = msg.getBytes(StandardCharsets.UTF_8);
                         DatagramPacket outp = new DatagramPacket(out, 0, out.length, sa);
                         s.send(outp);
                     }
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
index c179b9e..f1bc5c0 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java
@@ -74,7 +74,7 @@ public class AegisClientServerTest extends AbstractBusClientServerTestBase {
         assertEquals("Joe", list.get(0));
         assertEquals("Joe-1", list.get(1));
         assertEquals("Joe-2", list.get(2));
-        String roles[] = service.getRolesAsArray("Joe");
+        String[] roles = service.getRolesAsArray("Joe");
         assertEquals(2, roles.length);
         assertEquals("Joe", roles[0]);
         assertEquals("Joe-1", roles[1]);
@@ -104,7 +104,7 @@ public class AegisClientServerTest extends AbstractBusClientServerTestBase {
         assertEquals("Joe", list.get(0));
         assertEquals("Joe-1", list.get(1));
         assertEquals("Joe-2", list.get(2));
-        String roles[] = service.getRolesAsArray("Joe");
+        String[] roles = service.getRolesAsArray("Joe");
         assertEquals(2, roles.length);
         assertEquals("Joe", roles[0]);
         assertEquals("Joe-1", roles[1]);
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
index 3e46c13..6718a69 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/aegis/AegisServer.java
@@ -69,7 +69,7 @@ public class AegisServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             AegisServer s = new AegisServer();
             s.start();
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMBase64Test.java b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMBase64Test.java
index 0198bff..d5c10c0 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMBase64Test.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMBase64Test.java
@@ -92,7 +92,7 @@ public class MTOMBase64Test extends AbstractBusClientServerTestBase {
         }
 
         private byte[] generateByteData(int x) {
-            byte bytes[] = new byte[x];
+            byte[] bytes = new byte[x];
             for (int y = 0; y < x; y++) {
                 int z = 'A' + y;
                 if (z > 'z') {
@@ -139,7 +139,7 @@ public class MTOMBase64Test extends AbstractBusClientServerTestBase {
         final int count = 99;
         ObjectWithHashMapData data = port.getHashMapData(count);
         for (int y = 1;  y < count; y++) {
-            byte bytes[] = data.getKeyData().get(Integer.toHexString(y));
+            byte[] bytes = data.getKeyData().get(Integer.toHexString(y));
             assertEquals(y, bytes.length);
         }
     }
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java
index 587c7f0..ab99f7f 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/jaxb/MTOMTest.java
@@ -87,7 +87,7 @@ public class MTOMTest extends AbstractBusClientServerTestBase {
         }
 
         private byte[] generateByteData(int x) {
-            byte bytes[] = new byte[x];
+            byte[] bytes = new byte[x];
             for (int y = 0; y < x; y++) {
                 int z = 'A' + y;
                 if (z > 'z') {
@@ -131,7 +131,7 @@ public class MTOMTest extends AbstractBusClientServerTestBase {
         final int count = 99;
         ObjectWithHashMapData data = port.getHashMapData(count);
         for (int y = 1;  y < count; y++) {
-            byte bytes[] = data.getKeyData().get(Integer.toHexString(y));
+            byte[] bytes = data.getKeyData().get(Integer.toHexString(y));
             assertEquals(y, bytes.length);
         }
     }
diff --git a/systests/databinding/src/test/java/org/apache/cxf/systest/source/Server.java b/systests/databinding/src/test/java/org/apache/cxf/systest/source/Server.java
index 8938096..681a012 100644
--- a/systests/databinding/src/test/java/org/apache/cxf/systest/source/Server.java
+++ b/systests/databinding/src/test/java/org/apache/cxf/systest/source/Server.java
@@ -44,7 +44,7 @@ public class Server extends AbstractBusTestServerBase {
                          new PutLastTradePriceImpl());
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             Server s = new Server();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationClient.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationClient.java
index 6f7d508..b8f46c5 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationClient.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationClient.java
@@ -33,7 +33,7 @@ public class BookContinuationClient extends AbstractTestServerBase {
 
     }
 
-    public static void main(String args[]) throws InterruptedException, ExecutionException {
+    public static void main(String[] args) throws InterruptedException, ExecutionException {
         final String url = "http://localhost:" + PORT + "/async/bookstore/disconnect";
         WebClient wc = WebClient.create(url);
         try {
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationServlet3Server.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationServlet3Server.java
index 89b51d4..da1fd61 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationServlet3Server.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookContinuationServlet3Server.java
@@ -27,7 +27,7 @@ public class BookContinuationServlet3Server extends AbstractSpringServer {
         super("/jaxrs_async", Integer.valueOf(PORT));
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookContinuationServlet3Server s = new BookContinuationServlet3Server();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java
index 193da93..72976ef 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookDataBindingServer.java
@@ -67,7 +67,7 @@ public class BookDataBindingServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookDataBindingServer s = new BookDataBindingServer();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNonSpringServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNonSpringServer.java
index 930d74d..78d9825 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNonSpringServer.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookNonSpringServer.java
@@ -29,7 +29,7 @@ public class BookNonSpringServer extends AbstractSpringServer {
         super("/jaxrs_non_spring", PORT);
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookNonSpringServer s = new BookNonSpringServer();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java
index 015fb4f..0a387e1 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerProxySpring.java
@@ -67,7 +67,7 @@ public class BookServerProxySpring extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookServerProxySpring s = new BookServerProxySpring();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java
index 8985165..a00244f 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRequestDispatch.java
@@ -67,7 +67,7 @@ public class BookServerRequestDispatch extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookServerRequestDispatch s = new BookServerRequestDispatch();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java
index 8900763..9647397 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpring.java
@@ -68,7 +68,7 @@ public class BookServerResourceCreatedSpring extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookServerResourceCreatedSpring s = new BookServerResourceCreatedSpring();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java
index 07f986d..d455505 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceCreatedSpringProviders.java
@@ -68,7 +68,7 @@ public class BookServerResourceCreatedSpringProviders extends AbstractBusTestSer
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookServerResourceCreatedSpringProviders s = new BookServerResourceCreatedSpringProviders();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java
index 1d15504..8245af7 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerResourceJacksonSpringProviders.java
@@ -68,7 +68,7 @@ public class BookServerResourceJacksonSpringProviders extends AbstractBusTestSer
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookServerResourceJacksonSpringProviders s = new BookServerResourceJacksonSpringProviders();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java
index 4fc8260..1935feb 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerRestSoap.java
@@ -67,7 +67,7 @@ public class BookServerRestSoap extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookServerRestSoap s = new BookServerRestSoap();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerServletFilter.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerServletFilter.java
index 08953d9..3ba0cc6 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerServletFilter.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerServletFilter.java
@@ -68,7 +68,7 @@ public class BookServerServletFilter extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookServerServletFilter s = new BookServerServletFilter();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java
index caad315..a7a14eb 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java
@@ -67,7 +67,7 @@ public class BookServerSpring extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookServerSpring s = new BookServerSpring();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
index 8b9b80b..ae99687 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSMultipartTest.java
@@ -172,7 +172,7 @@ public class JAXRSMultipartTest extends AbstractBusClientServerTestBase {
         PushbackInputStream buf = new PushbackInputStream(is, 1024 * 20) {
             int bcount = -1;
             @Override
-            public int read(byte b[], int offset, int len) throws IOException {
+            public int read(byte[] b, int offset, int len) throws IOException {
                 if (bcount >= 0 && bcount < 1024 * 50) {
                     for (int x = 0; x < len; x++) {
                         b[offset + x] = (byte)x;
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2Server.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2Server.java
index 0fd86f4..4ad3538 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2Server.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/Swagger2Server.java
@@ -67,7 +67,7 @@ public class Swagger2Server extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             Swagger2Server s = new Swagger2Server();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiServer.java
index ec358d6..ccde34f 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiServer.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/openapi/OpenApiServer.java
@@ -67,7 +67,7 @@ public class OpenApiServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             OpenApiServer s = new OpenApiServer();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nio/NioBookStoreServer.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nio/NioBookStoreServer.java
index 7b08260..fc663a2 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nio/NioBookStoreServer.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/nio/NioBookStoreServer.java
@@ -67,7 +67,7 @@ public class NioBookStoreServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             NioBookStoreServer s = new NioBookStoreServer();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerJaasSecurity.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerJaasSecurity.java
index 081fadf..58dbc63 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerJaasSecurity.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerJaasSecurity.java
@@ -34,7 +34,7 @@ public class BookServerJaasSecurity extends AbstractSpringServer {
         super("/jaxrs_jaas_security", PORT);
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookServerJaasSecurity s = new BookServerJaasSecurity();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java
index 3a269b0..f58dc9f 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringClass.java
@@ -30,7 +30,7 @@ public class BookServerSecuritySpringClass extends AbstractSpringServer {
         super("/jaxrs_security_cglib", PORT);
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookServerSecuritySpringClass s = new BookServerSecuritySpringClass();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java
index 069901f..5104657 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringInterface.java
@@ -29,7 +29,7 @@ public class BookServerSecuritySpringInterface extends AbstractSpringServer {
         super("/jaxrs_security", PORT);
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookServerSecuritySpringInterface s = new BookServerSecuritySpringInterface();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java
index 427acf6..59966d3 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSecuritySpringNoAnnotations.java
@@ -30,7 +30,7 @@ public class BookServerSecuritySpringNoAnnotations extends AbstractSpringServer
         super("/jaxrs_security_no_annotations", PORT);
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookServerSecuritySpringNoAnnotations s = new BookServerSecuritySpringNoAnnotations();
             s.start();
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java
index 5861a47..32e22ce 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/BookServerSimpleSecurity.java
@@ -43,7 +43,7 @@ public class BookServerSimpleSecurity extends AbstractSpringServer {
         server.addBean(realm);
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             BookServerSimpleSecurity s = new BookServerSimpleSecurity();
             s.start();
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
index 2f4ef35..4db0de4 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java
@@ -197,7 +197,7 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
         DocLitBareCodeFirstService.GreetMeRequest req =
             new DocLitBareCodeFirstService.GreetMeRequest();
         DocLitBareCodeFirstService.GreetMeResponse resp;
-        BigInteger i[];
+        BigInteger[] i;
 
         req.setName("Foo");
         resp = port.greetMe(req);
@@ -534,7 +534,7 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
 
         String s;
 
-        String arrayOut[] = port.arrayOutput();
+        String[] arrayOut = port.arrayOutput();
         assertNotNull(arrayOut);
         assertEquals(3, arrayOut.length);
         for (int x = 0; x < 3; x++) {
@@ -598,7 +598,7 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
         assertEquals(2, foos2.get(0).length);
         assertEquals(2, foos2.get(1).length);
 
-        int ints[] = port.echoIntArray(new int[] {1, 2, 3}, null);
+        int[] ints = port.echoIntArray(new int[] {1, 2, 3}, null);
         assertEquals(3, ints.length);
         assertEquals(1, ints[0]);
 
@@ -707,7 +707,7 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
 
     private void runRpcLitTest(RpcLitCodeFirstService port) throws Exception {
 
-        String ret[] = port.convertToString(new int[] {1, 2, 3});
+        String[] ret = port.convertToString(new int[] {1, 2, 3});
         assertEquals(3, ret.length);
 
         List<String> rev = new ArrayList<>(Arrays.asList(RpcLitCodeFirstServiceImpl.DATA));
@@ -715,7 +715,7 @@ public class ClientServerMiscTest extends AbstractBusClientServerTestBase {
 
         String s;
 
-        String arrayOut[] = port.arrayOutput();
+        String[] arrayOut = port.arrayOutput();
         assertNotNull(arrayOut);
         assertEquals(3, arrayOut.length);
         for (int x = 0; x < 3; x++) {
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
index ee1351c..e91c211 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
@@ -44,7 +44,7 @@ import org.apache.cxf.systest.jaxws.types.BarImpl;
 @GZIP(threshold = 10)
 @FastInfoset(force = true)
 public class DocLitWrappedCodeFirstServiceImpl implements DocLitWrappedCodeFirstService {
-    public static final String DATA[] = new String[] {"string1", "string2", "string3"};
+    public static final String[] DATA = new String[] {"string1", "string2", "string3"};
 
     @Resource
     WebServiceContext context;
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
index 6d2b746..acd536b 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JaxWsDynamicClientTest.java
@@ -54,7 +54,7 @@ public class JaxWsDynamicClientTest extends AbstractBusClientServerTestBase {
         }
         algorithm.reset();
         algorithm.update(bytes);
-        byte messageDigest[] = algorithm.digest();
+        byte[] messageDigest = algorithm.digest();
 
         StringBuilder hexString = new StringBuilder();
         for (int i = 0; i < messageDigest.length; i++) {
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java
index ea8c819..b787d29 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/RpcLitCodeFirstServiceImpl.java
@@ -30,7 +30,7 @@ import javax.xml.ws.Holder;
             portName = "RpcLitCodeFirstServicePort",
             targetNamespace = "http://cxf.apache.org/systest/jaxws/RpcLitCodeFirstService")
 public class RpcLitCodeFirstServiceImpl implements RpcLitCodeFirstService {
-    public static final String DATA[] = new String[] {"string1", "string2", "string3"};
+    public static final String[] DATA = new String[] {"string1", "string2", "string3"};
 
     public int thisShouldNotBeInTheWSDL(int i) {
         return i;
@@ -127,7 +127,7 @@ public class RpcLitCodeFirstServiceImpl implements RpcLitCodeFirstService {
     }
 
     public String[] convertToString(int[] numbers) {
-        String ret[] = new String[numbers.length];
+        String[] ret = new String[numbers.length];
         for (int x = 0; x < numbers.length; x++) {
             ret[x] = Integer.toString(numbers[x]);
         }
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/cxf5064/HeaderObj.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/cxf5064/HeaderObj.java
index d4943bb..73d9606 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/cxf5064/HeaderObj.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/cxf5064/HeaderObj.java
@@ -31,7 +31,7 @@ public class HeaderObj {
 
     public HeaderObj(String value) {
         if (value != null && !value.trim().isEmpty()) {
-            String fields[] = value.split("-");
+            String[] fields = value.split("-");
             if (fields.length == 2) {
                 field1 = fields[0];
                 field2 = fields[1];
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java
index 8e8b0c9..7c66893 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java
@@ -178,7 +178,7 @@ public class ProviderRPCClientServerTest extends AbstractBusClientServerTestBase
         SOAPServiceRPCLit service = new SOAPServiceRPCLit(wsdl, serviceName);
         assertNotNull(service);
 
-        String addresses[] = {
+        String[] addresses = {
             "http://localhost:" + PORT
                 + "/SOAPServiceProviderRPCLit/SoapPortProviderRPCLit8",
             "http://localhost:" + PORT
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
index 31f15f0..366f704 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java
@@ -118,7 +118,7 @@ public class ClientServerSwaTest extends AbstractBusClientServerTestBase {
         port.echoData(textHolder, data);
         InputStream bis = null;
         bis = data.value.getDataSource().getInputStream();
-        byte b[] = new byte[10];
+        byte[] b = new byte[10];
         bis.read(b, 0, 10);
         String string = IOUtils.newStringFromBytes(b);
         assertEquals("testfoobar", string);
@@ -147,7 +147,7 @@ public class ClientServerSwaTest extends AbstractBusClientServerTestBase {
         port.echoDataWithHeader(textHolder, data, headerHolder);
         InputStream bis = null;
         bis = data.value.getDataSource().getInputStream();
-        byte b[] = new byte[10];
+        byte[] b = new byte[10];
         bis.read(b, 0, 10);
         String string = IOUtils.newStringFromBytes(b);
         assertEquals("testfoobar", string);
@@ -175,7 +175,7 @@ public class ClientServerSwaTest extends AbstractBusClientServerTestBase {
 
         handler = structHolder.value.getDataRef();
         InputStream bis = handler.getDataSource().getInputStream();
-        byte b[] = new byte[10];
+        byte[] b = new byte[10];
         bis.read(b, 0, 10);
         String string = IOUtils.newStringFromBytes(b);
         assertEquals("testfoobar", string);
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/Server.java
index 1870b37..4c04ed2 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/Server.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/Server.java
@@ -48,7 +48,7 @@ public class Server extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             Server s = new Server();
             s.start();
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
index 8b2b771..4012aab 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwANoMimeServiceImpl.java
@@ -103,7 +103,7 @@ public class SwANoMimeServiceImpl implements SwAServiceInterface {
         try {
             InputStream bis = null;
             bis = data.value.getDataRef().getDataSource().getInputStream();
-            byte b[] = new byte[6];
+            byte[] b = new byte[6];
             bis.read(b, 0, 6);
             String string = IOUtils.newStringFromBytes(b);
 
diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwAServiceImpl.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwAServiceImpl.java
index 073fd00..0fe0ccd 100644
--- a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwAServiceImpl.java
+++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwAServiceImpl.java
@@ -46,7 +46,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
         try {
             InputStream bis = null;
             bis = data.value.getDataRef().getDataSource().getInputStream();
-            byte b[] = new byte[6];
+            byte[] b = new byte[6];
             bis.read(b, 0, 6);
             String string = IOUtils.newStringFromBytes(b);
 
@@ -63,7 +63,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
         try {
             InputStream bis = null;
             bis = data.value.getDataSource().getInputStream();
-            byte b[] = new byte[6];
+            byte[] b = new byte[6];
             bis.read(b, 0, 6);
             String string = IOUtils.newStringFromBytes(b);
 
@@ -81,7 +81,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
         try {
             InputStream bis = null;
             bis = data.value.getDataSource().getInputStream();
-            byte b[] = new byte[6];
+            byte[] b = new byte[6];
             bis.read(b, 0, 6);
             String string = IOUtils.newStringFromBytes(b);
 
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/sts/STSServer.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/sts/STSServer.java
index e009863..6ca4d1d 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/sts/STSServer.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/sts/STSServer.java
@@ -44,7 +44,7 @@ public class STSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new STSServer().run();
     }
 }
diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/sts/StaxSTSServer.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/sts/StaxSTSServer.java
index 27cdcfc..d35e9e3 100644
--- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/sts/StaxSTSServer.java
+++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/sts/StaxSTSServer.java
@@ -44,7 +44,7 @@ public class StaxSTSServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new StaxSTSServer().run();
     }
 }
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSTestMtom.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSTestMtom.java
index 9d2f265..ed91c77 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSTestMtom.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/JMSTestMtom.java
@@ -86,7 +86,7 @@ public class JMSTestMtom {
         int size = handler1.value.getInputStream().available();
         mtom.testDataHandler(name, handler1);
 
-        byte bytes[] = IOUtils.readBytesFromStream(handler1.value.getInputStream());
+        byte[] bytes = IOUtils.readBytesFromStream(handler1.value.getInputStream());
         Assert.assertEquals("The response file is not same with the sent file.", size, bytes.length);
         ((Closeable)mtom).close();
     }
@@ -106,7 +106,7 @@ public class JMSTestMtom {
         int size = handler1.getInputStream().available();
         DataHandler ret = mtom.testOutMtom();
 
-        byte bytes[] = IOUtils.readBytesFromStream(ret.getInputStream());
+        byte[] bytes = IOUtils.readBytesFromStream(ret.getInputStream());
         Assert.assertEquals("The response file is not same with the original file.", size, bytes.length);
         ((Closeable)mtom).close();
     }
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
index b909bdb..9179cbd 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java
@@ -104,7 +104,7 @@ public class ClientServerSwaTest extends AbstractBusClientServerTestBase {
         port.echoData(textHolder, data);
         InputStream bis = null;
         bis = data.value.getDataSource().getInputStream();
-        byte b[] = new byte[10];
+        byte[] b = new byte[10];
         bis.read(b, 0, 10);
         String string = IOUtils.newStringFromBytes(b);
         assertEquals("testfoobar", string);
diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/SwAServiceImpl.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/SwAServiceImpl.java
index 69d449a..d7d75b9 100644
--- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/SwAServiceImpl.java
+++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/SwAServiceImpl.java
@@ -46,7 +46,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
         try {
             InputStream bis = null;
             bis = data.value.getDataRef().getDataSource().getInputStream();
-            byte b[] = new byte[6];
+            byte[] b = new byte[6];
             bis.read(b, 0, 6);
             String string = IOUtils.newStringFromBytes(b);
 
@@ -63,7 +63,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
         try {
             InputStream bis = null;
             bis = data.value.getDataSource().getInputStream();
-            byte b[] = new byte[6];
+            byte[] b = new byte[6];
             bis.read(b, 0, 6);
             String string = IOUtils.newStringFromBytes(b);
 
@@ -81,7 +81,7 @@ public class SwAServiceImpl implements SwAServiceInterface {
         try {
             InputStream bis = null;
             bis = data.value.getDataSource().getInputStream();
-            byte b[] = new byte[6];
+            byte[] b = new byte[6];
             bis.read(b, 0, 6);
             String string = IOUtils.newStringFromBytes(b);
 
diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
index 5b33d2e..250c69d 100644
--- a/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
+++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/auth/DigestServer.java
@@ -85,7 +85,7 @@ public class DigestServer extends AbstractBusTestServerBase {
             server = null;
         }
     }
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             DigestServer s = new DigestServer();
             s.start();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
index 70b3845..ae938a5 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java
@@ -112,7 +112,7 @@ public class ClientMtomXopTest extends AbstractBusClientServerTestBase {
         try {
             Holder<DataHandler> param = new Holder<>();
             Holder<String> name;
-            byte bytes[];
+            byte[] bytes;
             InputStream in;
 
             InputStream pre = this.getClass().getResourceAsStream("/wsdl/mtom_xop.wsdl");
@@ -215,7 +215,7 @@ public class ClientMtomXopTest extends AbstractBusClientServerTestBase {
         try {
             Holder<DataHandler> param = new Holder<>();
             Holder<String> name;
-            byte bytes[];
+            byte[] bytes;
             InputStream in;
 
             InputStream pre = this.getClass().getResourceAsStream("/wsdl/mtom_xop.wsdl");
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/Server.java
index 8c14ec3..93844ab 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/Server.java
@@ -36,7 +36,7 @@ public class Server extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             Server s = new Server();
             s.start();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
index c13a15d..37b180c 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
@@ -164,7 +164,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("Byte")) {
             return;
         }
-        byte valueSets[][] = {{0, 1}, {-1, 0}, {Byte.MIN_VALUE, Byte.MAX_VALUE}};
+        byte[] valueSets[] = {{0, 1}, {-1, 0}, {Byte.MIN_VALUE, Byte.MAX_VALUE}};
 
         for (int i = 0; i < valueSets.length; i++) {
             byte x = valueSets[i][0];
@@ -222,7 +222,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("UnsignedShort")) {
             return;
         }
-        int valueSets[][] = {{0, 1}, {1, 0}, {0, Short.MAX_VALUE * 2 + 1}};
+        int[] valueSets[] = {{0, 1}, {1, 0}, {0, Short.MAX_VALUE * 2 + 1}};
 
         for (int i = 0; i < valueSets.length; i++) {
             int x = valueSets[i][0];
@@ -252,7 +252,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("Int")) {
             return;
         }
-        int valueSets[][] = {{5, 10}, {-10, 50}, {Integer.MIN_VALUE, Integer.MAX_VALUE}};
+        int[] valueSets[] = {{5, 10}, {-10, 50}, {Integer.MIN_VALUE, Integer.MAX_VALUE}};
 
         for (int i = 0; i < valueSets.length; i++) {
             int x = valueSets[i][0];
@@ -281,7 +281,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("UnsignedInt")) {
             return;
         }
-        long valueSets[][] = {{0, ((long)Integer.MAX_VALUE) * 2 + 1}, {11, 20}, {1, 0}};
+        long[] valueSets[] = {{0, ((long)Integer.MAX_VALUE) * 2 + 1}, {11, 20}, {1, 0}};
 
         for (int i = 0; i < valueSets.length; i++) {
             long x = valueSets[i][0];
@@ -312,7 +312,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("Long")) {
             return;
         }
-        long valueSets[][] = {{0, 1}, {-1, 0}, {Long.MIN_VALUE, Long.MAX_VALUE}};
+        long[] valueSets[] = {{0, 1}, {-1, 0}, {Long.MIN_VALUE, Long.MAX_VALUE}};
 
         for (int i = 0; i < valueSets.length; i++) {
             long x = valueSets[i][0];
@@ -341,7 +341,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("UnsignedLong")) {
             return;
         }
-        BigInteger valueSets[][] = {{new BigInteger("0"), new BigInteger("1")},
+        BigInteger[] valueSets[] = {{new BigInteger("0"), new BigInteger("1")},
                                     {new BigInteger("1"), new BigInteger("0")},
                                     {new BigInteger("0"),
                                      new BigInteger(String.valueOf(Long.MAX_VALUE))}};
@@ -543,7 +543,7 @@ public abstract class AbstractTypeTestClient
             buffer2.append((char)('A' + (x % 26)));
         }
 
-        String valueSets[][] = {{"hello", "world"},
+        String[] valueSets[] = {{"hello", "world"},
                                 {"is pi > 3 ?", " is pi < 4\\\""},
                                 {"<illegal_tag/>", ""},
                                 {buffer.toString(), buffer2.toString()},
@@ -576,7 +576,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("StringI18N")) {
             return;
         }
-        String valueSets[][] = {{"hello", I18NStrings.CHINESE_COMPLEX_STRING},
+        String[] valueSets[] = {{"hello", I18NStrings.CHINESE_COMPLEX_STRING},
                                 {"hello", I18NStrings.JAP_SIMPLE_STRING}, };
 
         for (int i = 0; i < valueSets.length; i++) {
@@ -606,7 +606,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("QName")) {
             return;
         }
-        String valueSets[][] = {{"NoNamespaceService", ""},
+        String[] valueSets[] = {{"NoNamespaceService", ""},
                                 {"HelloWorldService", "http://www.iona.com/services"},
                                 {I18NStrings.JAP_SIMPLE_STRING, "http://www.iona.com/iona"},
                                 {"MyService", "http://www.iona.com/iona"}};
@@ -1145,7 +1145,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("Integer")) {
             return;
         }
-        BigInteger valueSets[][] = {{new BigInteger("-1234567890"), new BigInteger("1234567890")},
+        BigInteger[] valueSets[] = {{new BigInteger("-1234567890"), new BigInteger("1234567890")},
                                     {new BigInteger("-" + String.valueOf(Long.MAX_VALUE)),
                                      new BigInteger(String.valueOf(Long.MAX_VALUE))}};
 
@@ -1176,7 +1176,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("PositiveInteger")) {
             return;
         }
-        BigInteger valueSets[][] = {{new BigInteger("1"), new BigInteger("1234567890")},
+        BigInteger[] valueSets[] = {{new BigInteger("1"), new BigInteger("1234567890")},
                                     {new BigInteger(String.valueOf(Integer.MAX_VALUE)),
                                      new BigInteger(String.valueOf(Long.MAX_VALUE))}};
 
@@ -1207,7 +1207,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("NonPositiveInteger")) {
             return;
         }
-        BigInteger valueSets[][] = {{new BigInteger("0"), new BigInteger("-1234567890")},
+        BigInteger[] valueSets[] = {{new BigInteger("0"), new BigInteger("-1234567890")},
                                     {new BigInteger("-"
                                                     + String.valueOf(Integer.MAX_VALUE * Integer.MAX_VALUE)),
                                      new BigInteger("-" + String.valueOf(Long.MAX_VALUE * Long.MAX_VALUE))}};
@@ -1239,7 +1239,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("NegativeInteger")) {
             return;
         }
-        BigInteger valueSets[][] = {{new BigInteger("-1"), new BigInteger("-1234567890")},
+        BigInteger[] valueSets[] = {{new BigInteger("-1"), new BigInteger("-1234567890")},
                                     {new BigInteger("-"
                                                     + String.valueOf(Integer.MAX_VALUE * Integer.MAX_VALUE)),
                                      new BigInteger("-" + String.valueOf(Long.MAX_VALUE * Long.MAX_VALUE))}};
@@ -1271,7 +1271,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("NonNegativeInteger")) {
             return;
         }
-        BigInteger valueSets[][] = {{new BigInteger("0"),
+        BigInteger[] valueSets[] = {{new BigInteger("0"),
                                         new BigInteger("1234567890")},
                                     {new BigInteger(String.valueOf(Integer.MAX_VALUE)),
                                      new BigInteger(String.valueOf(Long.MAX_VALUE))}};
@@ -1369,7 +1369,7 @@ public abstract class AbstractTypeTestClient
         if (!shouldRunTest("AnyURI")) {
             return;
         }
-        String valueSets[][] = {{"file:///root%20%20/-;?&+",
+        String[] valueSets[] = {{"file:///root%20%20/-;?&+",
                                     "file:///w:/test!artix~java*"},
                                 {"http://iona.com/",
                                     "file:///z:/mail_iona=com,\'xmlbus\'"},
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
index 66c3933..281e23d 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
@@ -46,7 +46,7 @@ public class CORBADocLitClientTypeTest extends AbstractTypeTestClient5 {
     private static final Set<String> RUN_TESTS = new HashSet<>();
     static {
 
-        String notWorking[] = new String[] {
+        String[] notWorking = new String[] {
             "AnonEnumList",
             "AnonymousType",
             "AnyURIRestriction",
@@ -175,7 +175,7 @@ public class CORBADocLitClientTypeTest extends AbstractTypeTestClient5 {
         };
         NOT_WORKING_TESTS.addAll(Arrays.asList(notWorking));
 
-        String notWorkingIBM[] = new String[] {
+        String[] notWorkingIBM = new String[] {
             "AnyURIEnum",
             "NMTokenEnum",
             "DecimalEnum",
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitServerImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitServerImpl.java
index 80bd769..b9a9f43 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitServerImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitServerImpl.java
@@ -41,7 +41,7 @@ public class CORBADocLitServerImpl extends AbstractBusTestServerBase {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             CORBADocLitServerImpl s = new CORBADocLitServerImpl();
             s.start();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java
index a832e74..e269428 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java
@@ -44,7 +44,7 @@ public class SOAPDocLitServerImpl extends AbstractBusTestServerBase {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             SOAPDocLitServerImpl s = new SOAPDocLitServerImpl();
             s.start();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java
index 3df7644..172b667 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java
@@ -34,7 +34,7 @@ public class SOAPRpcLitServerImpl extends AbstractBusTestServerBase {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             SOAPRpcLitServerImpl s = new SOAPRpcLitServerImpl();
             s.start();
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java
index 15db15c..a6fbfac 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java
@@ -40,7 +40,7 @@ public class XMLServerImpl extends AbstractBusTestServerBase {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             XMLServerImpl s = new XMLServerImpl();
             s.start();
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java
index 93fae4c..117565c 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractClientPersistenceTest.java
@@ -76,7 +76,7 @@ public abstract class AbstractClientPersistenceTest extends AbstractBusClientSer
         String port;
         String pfx;
 
-        public Server(String args[]) {
+        public Server(String[] args) {
             port = args[0];
             pfx = args[1];
         }
@@ -112,7 +112,7 @@ public abstract class AbstractClientPersistenceTest extends AbstractBusClientSer
             ep = null;
         }
 
-        public static void main(String args[]) {
+        public static void main(String[] args) {
             new Server(args).start();
         }
 
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java
index fa2ff72..00b2abf 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/AbstractServerPersistenceTest.java
@@ -77,7 +77,7 @@ public abstract class AbstractServerPersistenceTest extends AbstractBusClientSer
         String port;
         String pfx;
         Endpoint ep;
-        public Server(String args[]) {
+        public Server(String[] args) {
             port = args[0];
             pfx = args[1];
         }
@@ -102,7 +102,7 @@ public abstract class AbstractServerPersistenceTest extends AbstractBusClientSer
             ep.stop();
             ep = null;
         }
-        public static void main(String args[]) {
+        public static void main(String[] args) {
             new Server(args).start();
         }
     }
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java
index 91ada49..a2a4aba0 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java
@@ -57,7 +57,7 @@ public class RedeliveryTest extends AbstractBusClientServerTestBase {
         String pfx;
         Endpoint ep;
 
-        public Server(String args[]) {
+        public Server(String[] args) {
             port = args[0];
             pfx = args[1];
         }
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckBase.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckBase.java
index 6b643ed..3136ac6 100755
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckBase.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckBase.java
@@ -53,7 +53,7 @@ public abstract class ServiceInvocationAckBase extends AbstractBusClientServerTe
         String port;
         String pfx;
         Endpoint ep;
-        public Server(String args[]) {
+        public Server(String[] args) {
             port = args[0];
             pfx = args[1];
         }
diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java
index 70ebd2d..6b2851b 100644
--- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java
+++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/WSRM12ServerCycleTest.java
@@ -64,7 +64,7 @@ public class WSRM12ServerCycleTest extends AbstractBusClientServerTestBase {
         String port;
         String pfx;
         Endpoint ep;
-        public Server(String args[]) {
+        public Server(String[] args) {
             port = args[0];
             pfx = args[1];
         }
@@ -89,7 +89,7 @@ public class WSRM12ServerCycleTest extends AbstractBusClientServerTestBase {
             ep.stop();
             ep = null;
         }
-        public static void main(String args[]) {
+        public static void main(String[] args) {
             new Server(args).start();
         }
     }
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java
index c04e1e0..831a7f1 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/JavaFirstPolicyServer.java
@@ -51,7 +51,7 @@ public class JavaFirstPolicyServer extends AbstractBusTestServerBase {
         }
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         new JavaFirstPolicyServer().start();
     }
 }
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/Server.java
index bcd7072..28418f1 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/Server.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/Server.java
@@ -31,7 +31,7 @@ public class Server extends AbstractBusTestServerBase {
         Endpoint.publish(address, implementor);
     }
 
-    public static void main(String args[]) {
+    public static void main(String[] args) {
         try {
             Server s = new Server();
             s.start();
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/FaultToEndpointServer.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/FaultToEndpointServer.java
index dbcaa18..4b76a81 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/FaultToEndpointServer.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_feature/FaultToEndpointServer.java
@@ -119,7 +119,7 @@ public class FaultToEndpointServer extends AbstractBusTestServerBase {
 
             //System.out.println("In handler: " + request.getContentLength());
 
-            byte bytes[] = new byte[1024];
+            byte[] bytes = new byte[1024];
             InputStream in = request.getInputStream();
             while (in.read(bytes) > -1) {
                 //nothing
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingAnonymousPolicyTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingAnonymousPolicyTest.java
index e181147..ce51174 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingAnonymousPolicyTest.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingAnonymousPolicyTest.java
@@ -60,7 +60,7 @@ public class AddressingAnonymousPolicyTest extends AbstractBusClientServerTestBa
         public Server(String dir) {
             tmpDir = dir;
         }
-        public Server(String args[]) {
+        public Server(String[] args) {
             tmpDir = args[0];
         }
         protected void run()  {
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java
index d1638b0..c69fb91 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java
@@ -67,7 +67,7 @@ public class AddressingOptionalPolicyTest extends AbstractBusClientServerTestBas
         public Server(String dir) {
             tmpDir = dir;
         }
-        public Server(String args[]) {
+        public Server(String[] args) {
             tmpDir = args[0];
         }
         protected void run()  {
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java
index 287d2c3..37f0587 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java
@@ -78,7 +78,7 @@ public class RMPolicyTest extends AbstractBusClientServerTestBase {
         public Server(String dir) {
             tmpDir = dir;
         }
-        public Server(String args[]) {
+        public Server(String[] args) {
             tmpDir = args[0];
         }
         protected void run()  {
diff --git a/testutils/src/main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java b/testutils/src/main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java
index 011cc8b..31730b3 100644
--- a/testutils/src/main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java
+++ b/testutils/src/main/java/org/apache/cxf/no_body_parts/NoBodyPartsImpl.java
@@ -40,7 +40,7 @@ public class NoBodyPartsImpl implements NoBodyPartsSEI {
         MessageDigest algorithm = MessageDigest.getInstance("MD5");
         algorithm.reset();
         algorithm.update(bytes);
-        byte messageDigest[] = algorithm.digest();
+        byte[] messageDigest = algorithm.digest();
 
         StringBuilder hexString = new StringBuilder();
         for (int i = 0; i < messageDigest.length; i++) {
diff --git a/testutils/src/main/java/org/apache/cxf/testutil/recorders/InMessageRecorder.java b/testutils/src/main/java/org/apache/cxf/testutil/recorders/InMessageRecorder.java
index 5805136..0924419 100644
--- a/testutils/src/main/java/org/apache/cxf/testutil/recorders/InMessageRecorder.java
+++ b/testutils/src/main/java/org/apache/cxf/testutil/recorders/InMessageRecorder.java
@@ -55,7 +55,7 @@ public class InMessageRecorder extends AbstractPhaseInterceptor<Message> {
             IOUtils.copy(is, bos);
             is.close();
             bos.close();
-            byte bytes[] = bos.toByteArray();
+            byte[] bytes = bos.toByteArray();
             synchronized (inbound) {
                 inbound.add(bytes);
             }
diff --git a/testutils/src/main/java/org/apache/cxf/testutil/recorders/OutMessageRecorder.java b/testutils/src/main/java/org/apache/cxf/testutil/recorders/OutMessageRecorder.java
index df797c7..973f005 100644
--- a/testutils/src/main/java/org/apache/cxf/testutil/recorders/OutMessageRecorder.java
+++ b/testutils/src/main/java/org/apache/cxf/testutil/recorders/OutMessageRecorder.java
@@ -84,7 +84,7 @@ public class OutMessageRecorder extends AbstractPhaseInterceptor<Message> {
         public void onClose(CachedOutputStream cos) {
             // bytes were already copied after flush
             try {
-                byte bytes[] = cos.getBytes();
+                byte[] bytes = cos.getBytes();
                 synchronized (outbound) {
                     outbound.add(bytes);
                 }
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java b/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java
index 4becd52..73e4879 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java
@@ -282,7 +282,7 @@ public abstract class AbstractCXFToolContainer extends AbstractToolContainer {
 
     protected ClassCollector createClassCollector() {
         ClassCollector collector = new ClassCollector();
-        String reserved[] = (String[])context.get(ToolConstants.CFG_RESERVE_NAME);
+        String[] reserved = (String[])context.get(ToolConstants.CFG_RESERVE_NAME);
         if (reserved != null) {
             for (String r : reserved) {
                 collector.reserveClass(r);
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainer.java b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainer.java
index 0e84bea..a91400a 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainer.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/toolspec/AbstractToolContainer.java
@@ -49,7 +49,7 @@ public abstract class AbstractToolContainer implements ToolContainer {
     protected PrintStream out = System.out;
     protected PrintStream err = System.err;
 
-    private String arguments[];
+    private String[] arguments;
     private boolean isVerbose;
     private boolean isQuiet;
     private CommandDocument commandDoc;
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlScopeBase.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlScopeBase.java
index f6fc494..80990b9 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlScopeBase.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlScopeBase.java
@@ -116,7 +116,7 @@ public abstract class IdlScopeBase extends IdlDefnImplBase {
 
     public IdlDefn lookup(IdlScopedName name, boolean undefined) {
         IdlScopeBase scope = this;
-        String parents[] = name.parentNames();
+        String[] parents = name.parentNames();
 
         if (parents != null) {
             IdlDefn defn = lookup(parents, undefined);
@@ -133,11 +133,11 @@ public abstract class IdlScopeBase extends IdlDefnImplBase {
     }
 
 
-    public IdlDefn lookup(String scopedName[]) {
+    public IdlDefn lookup(String[] scopedName) {
         return lookup(scopedName, false);
     }
 
-    public IdlDefn lookup(String scopedName[], boolean undefined) {
+    public IdlDefn lookup(String[] scopedName, boolean undefined) {
         IdlScopeBase scope = this;
 
         for (;;) {
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlScopedName.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlScopedName.java
index 88e94ac..2fc755c 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlScopedName.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/common/idltypes/IdlScopedName.java
@@ -24,7 +24,7 @@ import org.apache.cxf.tools.corba.common.ToolCorbaConstants;
 public class IdlScopedName {
     private String fullName;
     private String localName;
-    private String parentNames[];
+    private String[] parentNames;
 
     IdlScopedName(IdlScopeBase parent, String name) {
         if (parent != null) {
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
index 38d48dd..460fe54 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaBinding.java
@@ -856,7 +856,7 @@ public class WSDLToCorbaBinding {
         }
     }
 
-    public void main(String args[]) {
+    public void main(String[] args) {
         if (args.length != 6) {
             System.err.println("usage: WSDLToCORBABinding "
                                + "-w <wsdl file> -i <interfaceName> -o <output wsdl file>");
diff --git a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
index ac293da..7b9d6d6 100644
--- a/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
+++ b/tools/corba/src/main/java/org/apache/cxf/tools/corba/processors/wsdl/WSDLToCorbaHelper.java
@@ -93,7 +93,7 @@ public class WSDLToCorbaHelper {
     public static final String IDL_VERSION = ":1.0";
 
     protected static final Logger LOG = LogUtils.getL7dLogger(WSDLToCorbaHelper.class);
-    protected static final String DISCRIMINATORTYPES[]
+    protected static final String[] DISCRIMINATORTYPES
         = new String[] {"long", "short", "boolean", "char"};
     protected static final Set<String> SUPPORTEDDISTYPES =
         new TreeSet<String>(Arrays.asList(DISCRIMINATORTYPES));
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 3cdd2af..b3131cf 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
@@ -161,7 +161,7 @@ public class WSDLToIDLAction {
                                        + "please pass a corba binding/porttype to use");
         }
 
-        String nm[] = unscopeName(binding.getPortType().getQName().getLocalPart());
+        String[] nm = unscopeName(binding.getPortType().getQName().getLocalPart());
         int pos = nm[nm.length - 1].lastIndexOf("Binding");
 
         if (pos != -1) {
@@ -352,7 +352,7 @@ public class WSDLToIDLAction {
                 root.addInclude("<omg/TimeBase.idl>");
             }
 
-            String name[] = unscopeName(local);
+            String[] name = unscopeName(local);
             IdlDefn defn = root.lookup(name);
 
             if (defn != null) {
@@ -394,7 +394,7 @@ public class WSDLToIDLAction {
         return (IdlType)result;
     }
 
-    protected IdlType createType(QName idlType, String name[], CorbaType corbaType) throws Exception {
+    protected IdlType createType(QName idlType, String[] name, CorbaType corbaType) throws Exception {
         if (idlType.getLocalPart().equals("CORBA.Object")) {
             return IdlInterface.create(null, "Object");
         }
@@ -590,7 +590,7 @@ public class WSDLToIDLAction {
 
             if (!undefinedCircular && !(bt instanceof IdlSequence)) {
                 String mlocal = qname.getLocalPart();
-                String mname[] = unscopeName(mlocal);
+                String[] mname = unscopeName(mlocal);
                 undefinedCircular = null != root.lookup(mname, true);
             }
 
@@ -625,7 +625,7 @@ public class WSDLToIDLAction {
 
             if (!undefinedCircular && !(type instanceof IdlSequence)) {
                 String mlocal = qname.getLocalPart();
-                String mname[] = unscopeName(mlocal);
+                String[] mname = unscopeName(mlocal);
                 undefinedCircular = null != root.lookup(mname, true);
             }
 
@@ -778,7 +778,7 @@ public class WSDLToIDLAction {
 
     private String[] unscopeName(String nm) {
         StringTokenizer strtok = new StringTokenizer(nm, ".");
-        String result[] = new String[strtok.countTokens()];
+        String[] result = new String[strtok.countTokens()];
 
         for (int i = 0; strtok.hasMoreTokens(); ++i) {
             result[i] = strtok.nextToken();
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
index 4163564..aef5cb0 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/IDLToWSDLTest.java
@@ -112,7 +112,7 @@ public class IDLToWSDLTest extends ToolTestBase {
         return noError;
     }
 
-    private void checkStrings(byte orig[], byte generated[]) throws Exception {
+    private void checkStrings(byte[] orig, byte generated[]) throws Exception {
         BufferedReader origReader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(orig)));
         BufferedReader genReader =
             new BufferedReader(new InputStreamReader(
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
index da12864..78b9867 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/WSDLToIDLTest.java
@@ -99,7 +99,7 @@ public class WSDLToIDLTest extends ToolTestBase {
         return 0;
     }
 
-    private void checkStrings(byte orig[], byte generated[]) throws Exception {
+    private void checkStrings(byte[] orig, byte generated[]) throws Exception {
         BufferedReader origReader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(orig)));
         BufferedReader genReader =
             new BufferedReader(new InputStreamReader(
diff --git a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
index f3b99d4..6eb895e 100644
--- a/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
+++ b/tools/corba/src/test/java/org/apache/cxf/tools/corba/processors/WSDLToIDLGenerationTest.java
@@ -56,7 +56,7 @@ public class WSDLToIDLGenerationTest extends Assert {
     }
 
 
-    private void checkIDLStrings(byte orig[], byte generated[]) throws Exception {
+    private void checkIDLStrings(byte[] orig, byte generated[]) throws Exception {
         BufferedReader origReader = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(orig)));
         BufferedReader genReader = new BufferedReader(
                                        new InputStreamReader(new ByteArrayInputStream(generated)));
@@ -124,7 +124,7 @@ public class WSDLToIDLGenerationTest extends Assert {
         idlgen.generateIDL(null);
 
         InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_oneway.idl");
-        byte orig[] = inputStreamToBytes(origstream);
+        byte[] orig = inputStreamToBytes(origstream);
 
         checkIDLStrings(orig, idloutput.toByteArray());
     }
@@ -141,7 +141,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_stringtypes.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -161,7 +161,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_integertypes.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -181,7 +181,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_uniontypes.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -201,7 +201,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_defaultuniontypes.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -223,7 +223,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_exceptions.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -244,7 +244,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_struct.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -266,7 +266,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_sequencetype.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -287,7 +287,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_array.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -309,7 +309,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_enum.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -330,7 +330,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_content.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -351,7 +351,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_alltype.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -372,7 +372,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_fixed.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -393,7 +393,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_anonfixed.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -414,7 +414,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_any.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -436,7 +436,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_typeInheritance.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -457,7 +457,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_nillable.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -478,7 +478,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_typedef.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -499,7 +499,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_nested.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -521,7 +521,7 @@ public class WSDLToIDLGenerationTest extends Assert {
 
             InputStream origstream =
                 getClass().getResourceAsStream("/idlgen/expected_nested-derivedtypes.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -543,7 +543,7 @@ public class WSDLToIDLGenerationTest extends Assert {
 
             InputStream origstream =
                 getClass().getResourceAsStream("/idlgen/expected_nested_complex.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -565,7 +565,7 @@ public class WSDLToIDLGenerationTest extends Assert {
 
             InputStream origstream =
                 getClass().getResourceAsStream("/idlgen/expected_nested_interfaces.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -587,7 +587,7 @@ public class WSDLToIDLGenerationTest extends Assert {
 
             InputStream origstream =
                 getClass().getResourceAsStream("/idlgen/expected_datetime.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -609,7 +609,7 @@ public class WSDLToIDLGenerationTest extends Assert {
 
             InputStream origstream =
                 getClass().getResourceAsStream("/idlgen/expected_wsaddressing_server.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -631,7 +631,7 @@ public class WSDLToIDLGenerationTest extends Assert {
 
             InputStream origstream =
                 getClass().getResourceAsStream("/idlgen/expected_wsaddressing_account.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -653,7 +653,7 @@ public class WSDLToIDLGenerationTest extends Assert {
 
             InputStream origstream =
                 getClass().getResourceAsStream("/idlgen/expected_wsaddressing_bank.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -674,7 +674,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_multiplebinding.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             try {
                 checkIDLStrings(orig, idloutput.toByteArray());
@@ -703,7 +703,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_complex_types.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -725,7 +725,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_databaseService.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -747,7 +747,7 @@ public class WSDLToIDLGenerationTest extends Assert {
 
             InputStream origstream =
                 getClass().getResourceAsStream("/idlgen/expected_recursivestruct.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
@@ -768,7 +768,7 @@ public class WSDLToIDLGenerationTest extends Assert {
             idlgen.generateIDL(null);
 
             InputStream origstream = getClass().getResourceAsStream("/idlgen/expected_recursiveunion.idl");
-            byte orig[] = inputStreamToBytes(origstream);
+            byte[] orig = inputStreamToBytes(origstream);
 
             checkIDLStrings(orig, idloutput.toByteArray());
         } finally {
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
index 4520ddb..0958ceb 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2js/processor/JavaToJSProcessor.java
@@ -134,7 +134,7 @@ public class JavaToJSProcessor implements Processor {
                 // is there a better way to avoid the warning?
                 beanDefinitions.addAll((List<String>)beanFilesParameter);
             } else {
-                String list[] = (String[])beanFilesParameter;
+                String[] list = (String[])beanFilesParameter;
                 for (String b : list) {
                     beanDefinitions.add(b);
                 }
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
index dc6a166..5331844 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2ws/JavaToWS.java
@@ -35,7 +35,7 @@ public class JavaToWS {
         args = new String[0];
     }
 
-    public JavaToWS(String pargs[]) {
+    public JavaToWS(String[] pargs) {
         args = pargs;
     }
 
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
index 10a23c0..2bcb140 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessor.java
@@ -168,7 +168,7 @@ public class JavaToWSDLProcessor implements Processor {
                 // is there a better way to avoid the warning?
                 beanDefinitions.addAll((List<String>)beanFilesParameter);
             } else {
-                String list[] = (String[]) beanFilesParameter;
+                String[] list = (String[]) beanFilesParameter;
                 for (String b : list) {
                     beanDefinitions.add(b);
                 }
diff --git a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
index ed619ad..220908d 100644
--- a/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
+++ b/tools/javato/ws/src/main/java/org/apache/cxf/tools/java2wsdl/processor/internal/jaxws/FaultBean.java
@@ -95,7 +95,7 @@ public final class FaultBean {
 
     private String getFieldName(final Method method) {
         String name = method.getName().substring(3);
-        char chars[] = name.toCharArray();
+        char[] chars = name.toCharArray();
         chars[0] = Character.toLowerCase(chars[0]);
         return new String(chars);
     }
diff --git a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java
index eeb3b0b..9f1048d 100644
--- a/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java
+++ b/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/WADLToJava.java
@@ -40,7 +40,7 @@ public class WADLToJava {
     public WADLToJava() {
         args = new String[0];
     }
-    public WADLToJava(String pargs[]) {
+    public WADLToJava(String[] pargs) {
         args = pargs;
     }
 
diff --git a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java
index 3af097d..4e0c7a7 100644
--- a/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java
+++ b/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/WSDLToJava.java
@@ -50,7 +50,7 @@ public class WSDLToJava {
     public WSDLToJava() {
         args = new String[0];
     }
-    public WSDLToJava(String pargs[]) {
+    public WSDLToJava(String[] pargs) {
         args = pargs;
     }
 
diff --git a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScript.java b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScript.java
index 657ba97..5f35e73 100644
--- a/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScript.java
+++ b/tools/wsdlto/frontend/javascript/src/main/java/org/apache/cxf/tools/wsdlto/javascript/WSDLToJavaScript.java
@@ -38,7 +38,7 @@ public class WSDLToJavaScript {
     public WSDLToJavaScript() {
         args = new String[0];
     }
-    public WSDLToJavaScript(String pargs[]) {
+    public WSDLToJavaScript(String[] pargs) {
         args = pargs;
     }
 
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWS21Container.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWS21Container.java
index 7e9b609..d843036 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWS21Container.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWS21Container.java
@@ -45,7 +45,7 @@ public class JAXWS21Container extends JAXWSContainer {
             env.put(ToolConstants.CFG_XJC_ARGS, o);
         } else {
             String[] xjcArgs = (String[])o;
-            String tmp[] = new String[xjcArgs.length + 2];
+            String[] tmp = new String[xjcArgs.length + 2];
             System.arraycopy(xjcArgs, 0, tmp, 0, xjcArgs.length);
             tmp[xjcArgs.length] = "-target";
             tmp[xjcArgs.length + 1] = "2.1";
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSContainer.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSContainer.java
index b53873f..71cdeea 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSContainer.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSContainer.java
@@ -90,7 +90,7 @@ public class JAXWSContainer extends WSDLToJavaContainer {
     }
 
     private void cleanArrays(ToolContext env, String key) {
-        String s[] = env.getArray(key);
+        String[] s = env.getArray(key);
         if (s != null) {
             List<String> n = new ArrayList<>();
             for (String s2 : s) {
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
index 57402d4..4b84781 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/OperationProcessor.java
@@ -178,7 +178,7 @@ public class OperationProcessor  extends AbstractProcessor {
     }
 
     private boolean checkEnableMime(boolean enableMime, JavaMethod method) {
-        String o[] = context.getArray(ToolConstants.CFG_MIMEMETHODS);
+        String[] o = context.getArray(ToolConstants.CFG_MIMEMETHODS);
         if (checkArray(o, method.getName())) {
             return true;
         }
@@ -186,7 +186,7 @@ public class OperationProcessor  extends AbstractProcessor {
     }
 
     private boolean checkEnableAsync(boolean enableAsync, JavaMethod method) {
-        String o[] = context.getArray(ToolConstants.CFG_ASYNCMETHODS);
+        String[] o = context.getArray(ToolConstants.CFG_ASYNCMETHODS);
         if (checkArray(o, method.getName())) {
             return true;
         }
@@ -194,7 +194,7 @@ public class OperationProcessor  extends AbstractProcessor {
     }
 
     private boolean checkEnableWrapper(boolean enableWrapper, JavaMethod method) {
-        String o[] = context.getArray(ToolConstants.CFG_BAREMETHODS);
+        String[] o = context.getArray(ToolConstants.CFG_BAREMETHODS);
         if (checkArray(o, method.getName())) {
             return false;
         }
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java
index 86deeab..36a5435 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/processor/internal/PortTypeProcessor.java
@@ -110,7 +110,7 @@ public class PortTypeProcessor extends AbstractProcessor {
             interfaceInfo.setProperty("JavaInterface", intf);
 
             if (context.containsKey(ToolConstants.CFG_SEI_SUPER)) {
-                String supers[] = context.getArray(ToolConstants.CFG_SEI_SUPER);
+                String[] supers = context.getArray(ToolConstants.CFG_SEI_SUPER);
                 for (String s : supers) {
                     intf.addSuperInterface(s);
                 }
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
index f15ffee..c1ec9f8 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/validator/WrapperStyleNameCollisionValidator.java
@@ -81,7 +81,7 @@ public class WrapperStyleNameCollisionValidator extends ServiceValidator {
         return false;
     }
     private boolean checkBare(ToolContext context, String opName) {
-        String o[] = context.getArray(ToolConstants.CFG_BAREMETHODS);
+        String[] o = context.getArray(ToolConstants.CFG_BAREMETHODS);
         return checkArray(o, opName);
     }
     private boolean isValidOperation(OperationInfo operation) {