diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/CitrusEndpoints.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/CitrusEndpoints.java
index 6096ea0adc..6ca19ecaf8 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/CitrusEndpoints.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/CitrusEndpoints.java
@@ -37,7 +37,6 @@
 import org.citrusframework.endpoint.direct.DirectEndpoints;
 
 /**
- * @author Christoph Deppisch
  * @since 3.0
  */
 public abstract class CitrusEndpoints {
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/camel/CamelEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/camel/CamelEndpointCatalog.java
index 82ba8b90a3..1c35bac074 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/camel/CamelEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/camel/CamelEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.camel.endpoint.CamelEndpoints;
 import org.citrusframework.camel.endpoint.CamelSyncEndpointBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/channel/MessageChannelEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/channel/MessageChannelEndpointCatalog.java
index 2e909457a6..b659a702e6 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/channel/MessageChannelEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/channel/MessageChannelEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.channel.ChannelSyncEndpointBuilder;
 import org.citrusframework.channel.endpoint.builder.MessageChannelEndpoints;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageChannelEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/docker/DockerEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/docker/DockerEndpointCatalog.java
index 1a5776c189..72e6a9e6a6 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/docker/DockerEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/docker/DockerEndpointCatalog.java
@@ -19,9 +19,6 @@
 import org.citrusframework.docker.client.DockerClientBuilder;
 import org.citrusframework.docker.endpoint.builder.DockerEndpoints;
 
-/**
- * @author Christoph Deppisch
- */
 public class DockerEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ftp/FtpEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ftp/FtpEndpointCatalog.java
index 358d948788..5a6be7ccba 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ftp/FtpEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ftp/FtpEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.ftp.endpoint.builder.FtpEndpoints;
 import org.citrusframework.ftp.server.FtpServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class FtpEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ftp/ScpEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ftp/ScpEndpointCatalog.java
index 99533c5c52..577cfe15c1 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ftp/ScpEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ftp/ScpEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.ftp.endpoint.builder.ScpEndpoints;
 import org.citrusframework.ftp.server.SftpServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class ScpEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ftp/SftpEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ftp/SftpEndpointCatalog.java
index b8f2463678..7fa484bca8 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ftp/SftpEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ftp/SftpEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.ftp.endpoint.builder.SftpEndpoints;
 import org.citrusframework.ftp.server.SftpServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class SftpEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/http/HttpEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/http/HttpEndpointCatalog.java
index 9d4817289b..034ff126f3 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/http/HttpEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/http/HttpEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.http.endpoint.builder.HttpEndpoints;
 import org.citrusframework.http.server.HttpServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/jms/JmsEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/jms/JmsEndpointCatalog.java
index 10e9ccefce..1efa2eb2d7 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/jms/JmsEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/jms/JmsEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.jms.endpoint.JmsEndpoints;
 import org.citrusframework.jms.endpoint.JmsSyncEndpointBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/jmx/JmxEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/jmx/JmxEndpointCatalog.java
index 2d2cab0f72..1a2ff391fc 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/jmx/JmxEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/jmx/JmxEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.jmx.endpoint.builder.JmxEndpoints;
 import org.citrusframework.jmx.server.JmxServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmxEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/kafka/KafkaEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/kafka/KafkaEndpointCatalog.java
index f668fdfe2b..72122e7b38 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/kafka/KafkaEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/kafka/KafkaEndpointCatalog.java
@@ -19,9 +19,6 @@
 import org.citrusframework.kafka.endpoint.KafkaEndpointBuilder;
 import org.citrusframework.kafka.endpoint.builder.KafkaEndpoints;
 
-/**
- * @author Christoph Deppisch
- */
 public class KafkaEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/kubernetes/KubernetesEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/kubernetes/KubernetesEndpointCatalog.java
index dcd8762b89..3376f6bfa7 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/kubernetes/KubernetesEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/kubernetes/KubernetesEndpointCatalog.java
@@ -19,9 +19,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClientBuilder;
 import org.citrusframework.kubernetes.endpoint.builder.KubernetesEndpoints;
 
-/**
- * @author Christoph Deppisch
- */
 public class KubernetesEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/mail/MailEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/mail/MailEndpointCatalog.java
index aac96fd8f5..b2f9c8af9c 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/mail/MailEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/mail/MailEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.mail.endpoint.builder.MailEndpoints;
 import org.citrusframework.mail.server.MailServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class MailEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/rmi/RmiEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/rmi/RmiEndpointCatalog.java
index 56e51ba87d..db26999955 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/rmi/RmiEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/rmi/RmiEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.rmi.endpoint.builder.RmiEndpoints;
 import org.citrusframework.rmi.server.RmiServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class RmiEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/selenium/SeleniumEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/selenium/SeleniumEndpointCatalog.java
index 3120fa97ed..add3c24d44 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/selenium/SeleniumEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/selenium/SeleniumEndpointCatalog.java
@@ -19,9 +19,6 @@
 import org.citrusframework.selenium.endpoint.SeleniumBrowserBuilder;
 import org.citrusframework.selenium.endpoint.builder.SeleniumEndpoints;
 
-/**
- * @author Christoph Deppisch
- */
 public class SeleniumEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ssh/SshEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ssh/SshEndpointCatalog.java
index 7d833b927b..c6f8151594 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ssh/SshEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ssh/SshEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.ssh.endpoint.builder.SshEndpoints;
 import org.citrusframework.ssh.server.SshServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class SshEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/vertx/VertxEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/vertx/VertxEndpointCatalog.java
index 7ab6c1c14f..47f70b93d1 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/vertx/VertxEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/vertx/VertxEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.vertx.endpoint.VertxSyncEndpointBuilder;
 import org.citrusframework.vertx.endpoint.builder.VertxEndpoints;
 
-/**
- * @author Christoph Deppisch
- */
 public class VertxEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/websocket/WebSocketEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/websocket/WebSocketEndpointCatalog.java
index 4c42f84447..353c537398 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/websocket/WebSocketEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/websocket/WebSocketEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.websocket.endpoint.builder.WebSocketEndpoints;
 import org.citrusframework.websocket.server.WebSocketServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebSocketEndpointCatalog {
 
     /**
diff --git a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ws/WebServiceEndpointCatalog.java b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ws/WebServiceEndpointCatalog.java
index a12fddba39..e6b95d534e 100644
--- a/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ws/WebServiceEndpointCatalog.java
+++ b/catalog/citrus-endpoint-catalog/src/main/java/org/citrusframework/dsl/endpoint/ws/WebServiceEndpointCatalog.java
@@ -20,9 +20,6 @@
 import org.citrusframework.ws.endpoint.builder.WebServiceEndpoints;
 import org.citrusframework.ws.server.WebServiceServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebServiceEndpointCatalog {
 
     /**
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/actions/DockerExecuteAction.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/actions/DockerExecuteAction.java
index b2f8930558..96711d03d8 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/actions/DockerExecuteAction.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/actions/DockerExecuteAction.java
@@ -39,7 +39,6 @@
 /**
  * Executes docker command with given docker client implementation. Possible command result is stored within command object.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class DockerExecuteAction extends AbstractTestAction {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/client/DockerClient.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/client/DockerClient.java
index 1e4969d262..26a6eb0669 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/client/DockerClient.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/client/DockerClient.java
@@ -35,7 +35,6 @@
 /**
  * Docker client uses Java docker client implementation for executing docker commands.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class DockerClient extends AbstractEndpoint implements Producer, ReplyConsumer {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/client/DockerClientBuilder.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/client/DockerClientBuilder.java
index d2ed960858..9466305af8 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/client/DockerClientBuilder.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/client/DockerClientBuilder.java
@@ -20,7 +20,6 @@
 import com.github.dockerjava.core.DefaultDockerClientConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class DockerClientBuilder extends AbstractEndpointBuilder<DockerClient> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/client/DockerEndpointConfiguration.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/client/DockerEndpointConfiguration.java
index ee30c98a1c..a493e6eb2d 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/client/DockerEndpointConfiguration.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/client/DockerEndpointConfiguration.java
@@ -25,7 +25,6 @@
 import com.github.dockerjava.okhttp.OkDockerHttpClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class DockerEndpointConfiguration extends AbstractPollableEndpointConfiguration {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/AbstractDockerCommand.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/AbstractDockerCommand.java
index 166225d35e..c1a3776f25 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/AbstractDockerCommand.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/AbstractDockerCommand.java
@@ -26,7 +26,6 @@
 import org.citrusframework.util.ReflectionHelper;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public abstract class AbstractDockerCommand<R> implements DockerCommand<R> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/AbstractDockerCommandBuilder.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/AbstractDockerCommandBuilder.java
index 330aa0c329..6b2ca8e2ee 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/AbstractDockerCommandBuilder.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/AbstractDockerCommandBuilder.java
@@ -23,9 +23,6 @@
 import org.citrusframework.validation.context.ValidationContext;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractDockerCommandBuilder<R, T extends AbstractDockerCommand<R>, S extends AbstractDockerCommandBuilder<R, T, S>> implements TestActionBuilder<DockerExecuteAction> {
 
     protected final S self;
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/CommandResultCallback.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/CommandResultCallback.java
index a1c979bac9..cfd07cc24f 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/CommandResultCallback.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/CommandResultCallback.java
@@ -19,7 +19,6 @@
 import org.citrusframework.context.TestContext;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public interface CommandResultCallback<R> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerCreate.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerCreate.java
index 5c5c260d3a..47e3bdbec0 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerCreate.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerCreate.java
@@ -37,7 +37,6 @@
 import static java.lang.Integer.parseInt;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class ContainerCreate extends AbstractDockerCommand<CreateContainerResponse> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerInspect.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerInspect.java
index 7a4a13ab0a..fe0382a0ad 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerInspect.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerInspect.java
@@ -25,7 +25,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class ContainerInspect extends AbstractDockerCommand<InspectContainerResponse> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerRemove.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerRemove.java
index bdc07c5a5f..c0e4c5ae81 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerRemove.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerRemove.java
@@ -22,7 +22,6 @@
 import com.github.dockerjava.api.model.ResponseItem;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class ContainerRemove extends AbstractDockerCommand<ResponseItem> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStart.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStart.java
index 7029d34c27..d65da1295e 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStart.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStart.java
@@ -23,7 +23,6 @@
 import com.github.dockerjava.api.model.ResponseItem;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class ContainerStart extends AbstractDockerCommand<ResponseItem> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStop.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStop.java
index 300655bf5a..c871c93ec4 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStop.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerStop.java
@@ -23,7 +23,6 @@
 import com.github.dockerjava.api.model.ResponseItem;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class ContainerStop extends AbstractDockerCommand<ResponseItem> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerWait.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerWait.java
index 9e9bca9c0a..9116532105 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerWait.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ContainerWait.java
@@ -25,7 +25,6 @@
 import com.github.dockerjava.api.model.WaitResponse;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class ContainerWait extends AbstractDockerCommand<WaitResponse> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/DockerCommand.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/DockerCommand.java
index d0ae02b9d4..7f5d7f114d 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/DockerCommand.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/DockerCommand.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public interface DockerCommand<R> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImageBuild.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImageBuild.java
index 2601169330..40683449d2 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImageBuild.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImageBuild.java
@@ -29,7 +29,6 @@
 import org.citrusframework.util.FileUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class ImageBuild extends AbstractDockerCommand<BuildResponseItem> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImageInspect.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImageInspect.java
index 1315758c31..08d4c356cf 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImageInspect.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImageInspect.java
@@ -25,7 +25,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class ImageInspect extends AbstractDockerCommand<InspectImageResponse> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImagePull.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImagePull.java
index b35b2f2dd4..3d2d6ce631 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImagePull.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImagePull.java
@@ -25,7 +25,6 @@
 import com.github.dockerjava.api.model.PullResponseItem;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class ImagePull extends AbstractDockerCommand<PullResponseItem> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImageRemove.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImageRemove.java
index 2eedfa5430..330e9dbcb4 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImageRemove.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/ImageRemove.java
@@ -23,7 +23,6 @@
 import com.github.dockerjava.api.model.ResponseItem;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class ImageRemove extends AbstractDockerCommand<ResponseItem> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/Info.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/Info.java
index c71f90e60e..8face5fcc7 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/Info.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/Info.java
@@ -23,7 +23,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class Info extends AbstractDockerCommand<com.github.dockerjava.api.model.Info> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/Ping.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/Ping.java
index 95b0a43d1d..07f7b2b764 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/Ping.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/Ping.java
@@ -23,7 +23,6 @@
 import com.github.dockerjava.api.model.ResponseItem;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class Ping extends AbstractDockerCommand<ResponseItem> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/Version.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/Version.java
index 4d48a88f2d..63e55257f5 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/Version.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/command/Version.java
@@ -24,7 +24,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class Version extends AbstractDockerCommand<com.github.dockerjava.api.model.Version> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/annotation/DockerClientConfig.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/annotation/DockerClientConfig.java
index d800af20ba..95c07af95f 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/annotation/DockerClientConfig.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/annotation/DockerClientConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/annotation/DockerClientConfigParser.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/annotation/DockerClientConfigParser.java
index 13e8c72a0e..ced7ea7687 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/annotation/DockerClientConfigParser.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/annotation/DockerClientConfigParser.java
@@ -23,7 +23,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class DockerClientConfigParser implements AnnotationConfigParser<DockerClientConfig, DockerClient> {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/handler/CitrusDockerConfigNamespaceHandler.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/handler/CitrusDockerConfigNamespaceHandler.java
index 67434f18de..27ef84872c 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/handler/CitrusDockerConfigNamespaceHandler.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/handler/CitrusDockerConfigNamespaceHandler.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class CitrusDockerConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/handler/CitrusDockerTestcaseNamespaceHandler.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/handler/CitrusDockerTestcaseNamespaceHandler.java
index e25b456177..29b1276deb 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/handler/CitrusDockerTestcaseNamespaceHandler.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/handler/CitrusDockerTestcaseNamespaceHandler.java
@@ -21,7 +21,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class CitrusDockerTestcaseNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/xml/DockerClientParser.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/xml/DockerClientParser.java
index 479ed90460..63860582da 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/xml/DockerClientParser.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/xml/DockerClientParser.java
@@ -29,7 +29,6 @@
 /**
  * Bean definition parser for docker client instance.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class DockerClientParser extends AbstractEndpointParser {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/xml/DockerExecuteActionParser.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/xml/DockerExecuteActionParser.java
index a0bc7cda5d..2d369964ca 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/xml/DockerExecuteActionParser.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/config/xml/DockerExecuteActionParser.java
@@ -39,7 +39,6 @@
 /**
  * Bean definition parser for docker client action in test case.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class DockerExecuteActionParser implements BeanDefinitionParser {
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/endpoint/builder/DockerEndpoints.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/endpoint/builder/DockerEndpoints.java
index edf50ce0bf..52eee183b3 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/endpoint/builder/DockerEndpoints.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/endpoint/builder/DockerEndpoints.java
@@ -19,9 +19,6 @@
 import org.citrusframework.docker.client.DockerClientBuilder;
 import org.citrusframework.endpoint.builder.ClientServerEndpointBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class DockerEndpoints extends ClientServerEndpointBuilder<DockerClientBuilder, DockerClientBuilder> {
     /**
      * Private constructor setting the client and server builder implementation.
diff --git a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/message/DockerMessageHeaders.java b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/message/DockerMessageHeaders.java
index b969175cad..48d35b1c55 100644
--- a/connectors/citrus-docker/src/main/java/org/citrusframework/docker/message/DockerMessageHeaders.java
+++ b/connectors/citrus-docker/src/main/java/org/citrusframework/docker/message/DockerMessageHeaders.java
@@ -19,7 +19,6 @@
 import org.citrusframework.message.MessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class DockerMessageHeaders {
diff --git a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/UnitTestSupport.java b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/UnitTestSupport.java
index 76214c84b8..25e8f3627b 100644
--- a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/UnitTestSupport.java
+++ b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/UnitTestSupport.java
@@ -20,9 +20,6 @@
 import org.citrusframework.context.TestContextFactory;
 import org.testng.annotations.BeforeMethod;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport {
 
     protected TestContextFactory testContextFactory;
diff --git a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/actions/dsl/DockerTestActionBuilderTest.java b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/actions/dsl/DockerTestActionBuilderTest.java
index 4855a0053c..a701294f72 100644
--- a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/actions/dsl/DockerTestActionBuilderTest.java
+++ b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/actions/dsl/DockerTestActionBuilderTest.java
@@ -42,7 +42,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class DockerTestActionBuilderTest extends UnitTestSupport {
diff --git a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/config/annotation/DockerClientConfigParserTest.java b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/config/annotation/DockerClientConfigParserTest.java
index e0b5cf1b0d..fe45060b4d 100644
--- a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/config/annotation/DockerClientConfigParserTest.java
+++ b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/config/annotation/DockerClientConfigParserTest.java
@@ -31,9 +31,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DockerClientConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "dockerClient1")
diff --git a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/config/xml/DockerClientParserTest.java b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/config/xml/DockerClientParserTest.java
index 566899747a..70ee858129 100644
--- a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/config/xml/DockerClientParserTest.java
+++ b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/config/xml/DockerClientParserTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DockerClientParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/endpoint/builder/DockerEndpointsTest.java b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/endpoint/builder/DockerEndpointsTest.java
index 08c45cd245..3399ce8e65 100644
--- a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/endpoint/builder/DockerEndpointsTest.java
+++ b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/endpoint/builder/DockerEndpointsTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DockerEndpointsTest {
 
     @Test
diff --git a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/integration/AbstractDockerIT.java b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/integration/AbstractDockerIT.java
index 5720817291..bb6b1cd9f9 100644
--- a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/integration/AbstractDockerIT.java
+++ b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/integration/AbstractDockerIT.java
@@ -31,7 +31,6 @@
 import org.testng.annotations.BeforeSuite;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class AbstractDockerIT extends TestNGCitrusSpringSupport {
diff --git a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/integration/DockerExecuteIT.java b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/integration/DockerExecuteIT.java
index db34b2c5bd..9d17a1e136 100644
--- a/connectors/citrus-docker/src/test/java/org/citrusframework/docker/integration/DockerExecuteIT.java
+++ b/connectors/citrus-docker/src/test/java/org/citrusframework/docker/integration/DockerExecuteIT.java
@@ -23,7 +23,6 @@
 /**
  * Only execute integration tests if Docker is available on host system.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 @Test
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/KubernetesExecuteAction.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/KubernetesExecuteAction.java
index cd4f7c2e06..a39ff2ad98 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/KubernetesExecuteAction.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/actions/KubernetesExecuteAction.java
@@ -52,7 +52,6 @@
 /**
  * Executes kubernetes command with given kubernetes client implementation. Possible command result is stored within command object.
  *
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KubernetesExecuteAction extends AbstractTestAction {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/client/KubernetesClient.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/client/KubernetesClient.java
index e5a3eba82a..45f60be9e3 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/client/KubernetesClient.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/client/KubernetesClient.java
@@ -33,7 +33,6 @@
 /**
  * Kubernetes client uses Java kubernetes client implementation for executing kubernetes commands.
  *
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KubernetesClient extends AbstractEndpoint implements Producer, ReplyConsumer {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/client/KubernetesClientBuilder.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/client/KubernetesClientBuilder.java
index 08f9bc71c7..30c10f1c45 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/client/KubernetesClientBuilder.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/client/KubernetesClientBuilder.java
@@ -22,7 +22,6 @@
 import org.citrusframework.kubernetes.message.KubernetesMessageConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KubernetesClientBuilder extends AbstractEndpointBuilder<KubernetesClient> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractClientCommand.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractClientCommand.java
index 736cc4bc25..92fb4e3129 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractClientCommand.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractClientCommand.java
@@ -26,7 +26,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public abstract class AbstractClientCommand<T extends HasMetadata, O, L extends KubernetesResourceList<T>, R extends Resource<T>, C extends KubernetesCommand<T, O>> extends AbstractKubernetesCommand<T, O, C> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractCreateCommand.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractCreateCommand.java
index 509ebdda58..2ae0ed0b99 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractCreateCommand.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractCreateCommand.java
@@ -30,7 +30,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public abstract class AbstractCreateCommand<T extends HasMetadata, L extends KubernetesResourceList<T>, R extends io.fabric8.kubernetes.client.dsl.Resource<T>, C extends KubernetesCommand<T, T>>
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractDeleteCommand.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractDeleteCommand.java
index 8a900e5112..f1fbf2116f 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractDeleteCommand.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractDeleteCommand.java
@@ -27,7 +27,6 @@
 import org.citrusframework.kubernetes.message.KubernetesMessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public abstract class AbstractDeleteCommand<T extends HasMetadata, L extends KubernetesResourceList<T>, R extends Resource<T>, C extends KubernetesCommand<T, DeleteResult>> extends AbstractClientCommand<T, DeleteResult, L, R, C> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractGetCommand.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractGetCommand.java
index 3f294878a5..d5b9b4b052 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractGetCommand.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractGetCommand.java
@@ -23,7 +23,6 @@
 import org.citrusframework.context.TestContext;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public abstract class AbstractGetCommand<T extends HasMetadata, L extends KubernetesResourceList<T>, R extends Resource<T>, C extends KubernetesCommand<T, T>> extends AbstractClientCommand<T, T, L, R, C> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractKubernetesCommand.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractKubernetesCommand.java
index d3e62a932c..08ab81de46 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractKubernetesCommand.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractKubernetesCommand.java
@@ -28,7 +28,6 @@
 import org.citrusframework.kubernetes.message.KubernetesMessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public abstract class AbstractKubernetesCommand<T extends HasMetadata, O, C extends KubernetesCommand<T, O>> implements KubernetesCommand<T, O> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractListCommand.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractListCommand.java
index 1172da4a37..af2e8db4a6 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractListCommand.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractListCommand.java
@@ -24,7 +24,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public abstract class AbstractListCommand<T extends HasMetadata, L extends KubernetesResourceList<T>, R extends Resource<T>, C extends KubernetesCommand<T, ListResult<T>>> extends AbstractClientCommand<T, ListResult<T>, L, R, C> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractWatchCommand.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractWatchCommand.java
index ff93744668..718920eb80 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractWatchCommand.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/AbstractWatchCommand.java
@@ -35,7 +35,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public abstract class AbstractWatchCommand<T extends HasMetadata, L extends KubernetesResourceList<T>, R extends Resource<T>, C extends KubernetesCommand<T, T>> extends AbstractClientCommand<T, T, L, R, C> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CommandResult.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CommandResult.java
index 1d5e0c49ca..3deea20ad3 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CommandResult.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CommandResult.java
@@ -21,7 +21,6 @@
 import io.fabric8.kubernetes.client.KubernetesClientException;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CommandResultCallback.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CommandResultCallback.java
index 9c62494d37..3980953f3c 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CommandResultCallback.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CommandResultCallback.java
@@ -19,7 +19,6 @@
 import org.citrusframework.context.TestContext;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public interface CommandResultCallback<T> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CreatePod.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CreatePod.java
index 538ae05b74..42aabc17a6 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CreatePod.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CreatePod.java
@@ -31,7 +31,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class CreatePod extends AbstractCreateCommand<Pod, PodList, PodResource, CreatePod> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CreateService.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CreateService.java
index 7501777498..9896c1fb7e 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CreateService.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/CreateService.java
@@ -30,7 +30,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class CreateService extends AbstractCreateCommand<Service, ServiceList, ServiceResource<Service>, CreateService> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeletePod.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeletePod.java
index 5b6b1e0eea..9395edeeae 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeletePod.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeletePod.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class DeletePod extends AbstractDeleteCommand<Pod, PodList, PodResource, DeletePod> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeleteResult.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeleteResult.java
index f296bd0de6..4a2a4426cb 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeleteResult.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeleteResult.java
@@ -23,7 +23,6 @@
 
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeleteService.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeleteService.java
index fbea5e652d..8b2b003d15 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeleteService.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/DeleteService.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class DeleteService extends AbstractDeleteCommand<Service, ServiceList, ServiceResource<Service>, DeleteService> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/GetPod.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/GetPod.java
index b8d20e19d0..81d7b27867 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/GetPod.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/GetPod.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class GetPod extends AbstractGetCommand<Pod, PodList, PodResource, GetPod> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/GetService.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/GetService.java
index dd93e83ea0..aa9e34d000 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/GetService.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/GetService.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class GetService extends AbstractGetCommand<Service, ServiceList, ServiceResource<Service>, GetService> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/Info.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/Info.java
index 3ef42137b8..433194b366 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/Info.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/Info.java
@@ -21,7 +21,6 @@
 import io.fabric8.kubernetes.client.Version;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class Info extends AbstractKubernetesCommand<InfoResult, InfoResult, Info> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/InfoResult.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/InfoResult.java
index 0a57b95a84..e3c30a7e5c 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/InfoResult.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/InfoResult.java
@@ -22,7 +22,6 @@
 import jakarta.validation.constraints.NotNull;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/KubernetesCommand.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/KubernetesCommand.java
index 491a939e2b..2ce9556cd6 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/KubernetesCommand.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/KubernetesCommand.java
@@ -27,7 +27,6 @@
  * Type parameter:
  * <T> the Kubernetes resource that this command operates with (e.g. Pod, Service, Secret, ...)
  * <O> the command output that may be validated (e.g. Pod, PodList, InfoResult, ...)
- * @author Christoph Deppisch
  * @since 2.7
  */
 public interface KubernetesCommand<T extends HasMetadata, O> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListEndpoints.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListEndpoints.java
index fb05672393..4f6875965c 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListEndpoints.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListEndpoints.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class ListEndpoints extends AbstractListCommand<Endpoints, EndpointsList, Resource<Endpoints>, ListEndpoints> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListEvents.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListEvents.java
index baa3168bc2..b7acc5610d 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListEvents.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListEvents.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class ListEvents extends AbstractListCommand<Event, EventList, Resource<Event>, ListEvents> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListNamespaces.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListNamespaces.java
index ebd3a5574e..f36561c2ca 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListNamespaces.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListNamespaces.java
@@ -22,7 +22,6 @@
 import io.fabric8.kubernetes.client.dsl.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class ListNamespaces extends AbstractListCommand<Namespace, NamespaceList, Resource<Namespace>, ListNamespaces> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListNodes.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListNodes.java
index 10316c6045..c8351c3fb3 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListNodes.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListNodes.java
@@ -22,7 +22,6 @@
 import io.fabric8.kubernetes.client.dsl.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class ListNodes extends AbstractListCommand<Node, NodeList, Resource<Node>, ListNodes> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListPods.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListPods.java
index 05da172406..3e83c1f923 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListPods.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListPods.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class ListPods extends AbstractListCommand<Pod, PodList, PodResource, ListPods> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListReplicationControllers.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListReplicationControllers.java
index 23d0cf5084..e752365d8b 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListReplicationControllers.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListReplicationControllers.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class ListReplicationControllers extends AbstractListCommand<ReplicationController, ReplicationControllerList, RollableScalableResource<ReplicationController>, ListReplicationControllers> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListResult.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListResult.java
index b1928cfb44..373a247582 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListResult.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListResult.java
@@ -27,7 +27,6 @@
 
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListServices.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListServices.java
index c7ee604198..2bb55d49df 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListServices.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/ListServices.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class ListServices extends AbstractListCommand<Service, ServiceList, ServiceResource<Service>, ListServices> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchEventResult.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchEventResult.java
index 0c5fdf7f37..43ead14b83 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchEventResult.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchEventResult.java
@@ -22,7 +22,6 @@
 import io.fabric8.kubernetes.client.WatcherException;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class WatchEventResult<R extends HasMetadata> extends CommandResult<R> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchNamespaces.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchNamespaces.java
index 23c0fed77d..1e729cfe8e 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchNamespaces.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchNamespaces.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class WatchNamespaces extends AbstractWatchCommand<Namespace, NamespaceList, Resource<Namespace>, WatchNamespaces> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchNodes.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchNodes.java
index 15bda111a7..335ded1a7c 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchNodes.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchNodes.java
@@ -22,7 +22,6 @@
 import io.fabric8.kubernetes.client.dsl.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class WatchNodes extends AbstractWatchCommand<Node, NodeList, Resource<Node>, WatchNodes> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchPods.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchPods.java
index adc1efc5f4..2e9e5ca6ab 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchPods.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchPods.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class WatchPods extends AbstractWatchCommand<Pod, PodList, PodResource, WatchPods> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchReplicationControllers.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchReplicationControllers.java
index f66b9f319d..c3db866543 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchReplicationControllers.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchReplicationControllers.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class WatchReplicationControllers extends AbstractWatchCommand<ReplicationController, ReplicationControllerList, RollableScalableResource<ReplicationController>, WatchReplicationControllers> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchServices.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchServices.java
index 5668c04f9c..08502ad71d 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchServices.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/command/WatchServices.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class WatchServices extends AbstractWatchCommand<Service, ServiceList, ServiceResource<Service>, WatchServices> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/annotation/KubernetesClientConfig.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/annotation/KubernetesClientConfig.java
index cafdcabbc0..5653e9e7f9 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/annotation/KubernetesClientConfig.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/annotation/KubernetesClientConfig.java
@@ -24,7 +24,6 @@
 import java.lang.annotation.Target;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/annotation/KubernetesClientConfigParser.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/annotation/KubernetesClientConfigParser.java
index 5e3c8a2481..3c5895a96b 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/annotation/KubernetesClientConfigParser.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/annotation/KubernetesClientConfigParser.java
@@ -27,7 +27,6 @@
 import static org.citrusframework.util.StringUtils.hasText;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KubernetesClientConfigParser implements AnnotationConfigParser<KubernetesClientConfig, KubernetesClient> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/handler/CitrusKubernetesConfigNamespaceHandler.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/handler/CitrusKubernetesConfigNamespaceHandler.java
index 1326923232..2c161f138f 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/handler/CitrusKubernetesConfigNamespaceHandler.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/handler/CitrusKubernetesConfigNamespaceHandler.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class CitrusKubernetesConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/handler/CitrusKubernetesTestcaseNamespaceHandler.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/handler/CitrusKubernetesTestcaseNamespaceHandler.java
index f62c102a48..366cd06a75 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/handler/CitrusKubernetesTestcaseNamespaceHandler.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/handler/CitrusKubernetesTestcaseNamespaceHandler.java
@@ -21,7 +21,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class CitrusKubernetesTestcaseNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/CreatePodActionParser.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/CreatePodActionParser.java
index 48610d4eb7..804a74e61c 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/CreatePodActionParser.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/CreatePodActionParser.java
@@ -22,7 +22,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class CreatePodActionParser extends KubernetesExecuteActionParser<CreatePod> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/CreateServiceActionParser.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/CreateServiceActionParser.java
index a1d5059a55..60aa4f93c8 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/CreateServiceActionParser.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/CreateServiceActionParser.java
@@ -22,7 +22,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class CreateServiceActionParser extends KubernetesExecuteActionParser<CreateService> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/KubernetesClientParser.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/KubernetesClientParser.java
index 8ce105bdd5..a51d55a163 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/KubernetesClientParser.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/KubernetesClientParser.java
@@ -34,7 +34,6 @@
 /**
  * Bean definition parser for kubernetes client instance.
  *
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KubernetesClientParser extends AbstractEndpointParser {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/KubernetesExecuteActionParser.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/KubernetesExecuteActionParser.java
index 1b028455e3..c40f113fca 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/KubernetesExecuteActionParser.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/config/xml/KubernetesExecuteActionParser.java
@@ -48,7 +48,6 @@
 /**
  * Bean definition parser for kubernetes client action in test case.
  *
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KubernetesExecuteActionParser<T extends KubernetesCommand<?, ?>> implements BeanDefinitionParser {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/endpoint/KubernetesEndpointComponent.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/endpoint/KubernetesEndpointComponent.java
index c32f65f3f3..8f9c0902d8 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/endpoint/KubernetesEndpointComponent.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/endpoint/KubernetesEndpointComponent.java
@@ -24,7 +24,6 @@
 import org.citrusframework.kubernetes.client.KubernetesClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KubernetesEndpointComponent extends AbstractEndpointComponent {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/endpoint/KubernetesEndpointConfiguration.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/endpoint/KubernetesEndpointConfiguration.java
index 7625254b36..0675f848c7 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/endpoint/KubernetesEndpointConfiguration.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/endpoint/KubernetesEndpointConfiguration.java
@@ -24,7 +24,6 @@
 import io.fabric8.kubernetes.client.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KubernetesEndpointConfiguration extends AbstractPollableEndpointConfiguration {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/endpoint/builder/KubernetesEndpoints.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/endpoint/builder/KubernetesEndpoints.java
index 37db89fb38..c359c3bbf5 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/endpoint/builder/KubernetesEndpoints.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/endpoint/builder/KubernetesEndpoints.java
@@ -19,9 +19,6 @@
 import org.citrusframework.endpoint.builder.ClientServerEndpointBuilder;
 import org.citrusframework.kubernetes.client.KubernetesClientBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class KubernetesEndpoints extends ClientServerEndpointBuilder<KubernetesClientBuilder, KubernetesClientBuilder> {
     /**
      * Private constructor setting the client and server builder implementation.
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/message/KubernetesMessage.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/message/KubernetesMessage.java
index b6157ee642..3d51f56e47 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/message/KubernetesMessage.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/message/KubernetesMessage.java
@@ -30,7 +30,6 @@
 import org.citrusframework.message.DefaultMessage;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KubernetesMessage extends DefaultMessage {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/message/KubernetesMessageConverter.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/message/KubernetesMessageConverter.java
index 6d12c62ea5..c458ff4444 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/message/KubernetesMessageConverter.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/message/KubernetesMessageConverter.java
@@ -32,7 +32,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KubernetesMessageConverter implements MessageConverter<KubernetesCommand<?, ?>, KubernetesCommand<?, ?>, KubernetesEndpointConfiguration> {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/message/KubernetesMessageHeaders.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/message/KubernetesMessageHeaders.java
index 69da29f2bd..bf0b7e852d 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/message/KubernetesMessageHeaders.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/message/KubernetesMessageHeaders.java
@@ -19,7 +19,6 @@
 import org.citrusframework.message.MessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KubernetesMessageHeaders {
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/model/KubernetesRequest.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/model/KubernetesRequest.java
index a36d36a1b3..31c6c03fe3 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/model/KubernetesRequest.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/model/KubernetesRequest.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
diff --git a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/model/KubernetesResponse.java b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/model/KubernetesResponse.java
index 8f7e6b6243..ff09cdcbcc 100644
--- a/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/model/KubernetesResponse.java
+++ b/connectors/citrus-kubernetes/src/main/java/org/citrusframework/kubernetes/model/KubernetesResponse.java
@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 @JsonInclude(JsonInclude.Include.NON_NULL)
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/UnitTestSupport.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/UnitTestSupport.java
index 8e780a148a..309ccb9b79 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/UnitTestSupport.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/UnitTestSupport.java
@@ -20,9 +20,6 @@
 import org.citrusframework.context.TestContextFactory;
 import org.testng.annotations.BeforeMethod;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport {
 
     protected TestContextFactory testContextFactory;
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/actions/dsl/KubernetesTestActionBuilderTest.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/actions/dsl/KubernetesTestActionBuilderTest.java
index a5435bd823..97cc30e4eb 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/actions/dsl/KubernetesTestActionBuilderTest.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/actions/dsl/KubernetesTestActionBuilderTest.java
@@ -62,7 +62,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KubernetesTestActionBuilderTest extends UnitTestSupport {
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/annotation/KubernetesBadClientConfigParserTest.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/annotation/KubernetesBadClientConfigParserTest.java
index a58d3ba5d8..c42761315e 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/annotation/KubernetesBadClientConfigParserTest.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/annotation/KubernetesBadClientConfigParserTest.java
@@ -33,9 +33,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.expectThrows;
 
-/**
- * @author Valentin Soldo
- */
 public class KubernetesBadClientConfigParserTest extends AbstractTestNGUnitTest {
 
     // Endpoint badly configured with missing password
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/annotation/KubernetesClientConfigParserTest.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/annotation/KubernetesClientConfigParserTest.java
index cc2b30f3ab..b10e0a8745 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/annotation/KubernetesClientConfigParserTest.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/annotation/KubernetesClientConfigParserTest.java
@@ -42,9 +42,6 @@
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Christoph Deppisch
- */
 public class KubernetesClientConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "k8sClient1")
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/xml/KubernetesBadClientParserTest.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/xml/KubernetesBadClientParserTest.java
index faa0f74763..245d753c37 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/xml/KubernetesBadClientParserTest.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/xml/KubernetesBadClientParserTest.java
@@ -25,9 +25,6 @@
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.expectThrows;
 
-/**
- * @author Valentin Soldo
- */
 public class KubernetesBadClientParserTest extends AbstractBeanDefinitionParserTest {
 
     @Override
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/xml/KubernetesClientParserTest.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/xml/KubernetesClientParserTest.java
index b283b21e8a..e7fbec9666 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/xml/KubernetesClientParserTest.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/config/xml/KubernetesClientParserTest.java
@@ -27,9 +27,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
-/**
- * @author Christoph Deppisch
- */
 public class KubernetesClientParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/endpoint/KubernetesEndpointComponentTest.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/endpoint/KubernetesEndpointComponentTest.java
index 9a0710bbdd..eddf174d7a 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/endpoint/KubernetesEndpointComponentTest.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/endpoint/KubernetesEndpointComponentTest.java
@@ -29,7 +29,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KubernetesEndpointComponentTest {
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/endpoint/builder/KubernetesEndpointsTest.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/endpoint/builder/KubernetesEndpointsTest.java
index 91bdfbd1cc..3111e65723 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/endpoint/builder/KubernetesEndpointsTest.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/endpoint/builder/KubernetesEndpointsTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class KubernetesEndpointsTest {
 
     @Test
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/AbstractKubernetesIT.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/AbstractKubernetesIT.java
index 8b988e4417..cc87b7ba72 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/AbstractKubernetesIT.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/AbstractKubernetesIT.java
@@ -20,7 +20,6 @@
 import org.springframework.test.context.ContextConfiguration;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 @ContextConfiguration(classes = KubernetesServiceConfiguration.class)
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesCreateIT.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesCreateIT.java
index 67718cf1ba..05b691b642 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesCreateIT.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesCreateIT.java
@@ -23,7 +23,6 @@
 /**
  * Only execute integration tests if Kubernetes is available on host system.
  *
- * @author Christoph Deppisch
  * @since 2.7
  */
 @Test
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesExecuteIT.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesExecuteIT.java
index 696ebad56f..72da5ba6c4 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesExecuteIT.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesExecuteIT.java
@@ -23,7 +23,6 @@
 /**
  * Only execute integration tests if Kubernetes is available on host system.
  *
- * @author Christoph Deppisch
  * @since 2.7
  */
 @Test
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesSendReceiveIT.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesSendReceiveIT.java
index 23d41caa97..3e7d050628 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesSendReceiveIT.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesSendReceiveIT.java
@@ -23,7 +23,6 @@
 /**
  * Only execute integration tests if Kubernetes is available on host system.
  *
- * @author Christoph Deppisch
  * @since 2.7
  */
 @Test
diff --git a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesServiceConfiguration.java b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesServiceConfiguration.java
index cfec671748..d19bce5f53 100644
--- a/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesServiceConfiguration.java
+++ b/connectors/citrus-kubernetes/src/test/java/org/citrusframework/kubernetes/integration/KubernetesServiceConfiguration.java
@@ -31,9 +31,6 @@
 
 import static org.citrusframework.kubernetes.actions.KubernetesExecuteAction.Builder.kubernetes;
 
-/**
- * @author Christoph Deppisch
- */
 @Configuration
 public class KubernetesServiceConfiguration {
 
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/OpenApiResourceLoader.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/OpenApiResourceLoader.java
index ed9b41c556..e2427165b2 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/OpenApiResourceLoader.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/OpenApiResourceLoader.java
@@ -40,7 +40,6 @@
 
 /**
  * Loads Open API specifications from different locations like file resource or web resource.
- * @author Christoph Deppisch
  */
 public final class OpenApiResourceLoader {
 
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/OpenApiTestDataGenerator.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/OpenApiTestDataGenerator.java
index c240fe80c2..c5aadd01e2 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/OpenApiTestDataGenerator.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/OpenApiTestDataGenerator.java
@@ -31,7 +31,6 @@
  * with generated random test data according to specification and creates inbound payloads with proper validation expressions to
  * enforce the specification rules.
  *
- * @author Christoph Deppisch
  */
 public class OpenApiTestDataGenerator {
 
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiActionBuilder.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiActionBuilder.java
index 1328b036ff..c17613738a 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiActionBuilder.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiActionBuilder.java
@@ -31,7 +31,6 @@
  * Action executes client and server operations using given OpenApi specification.
  * Action creates proper request and response data from given specification rules.
  *
- * @author Christoph Deppisch
  * @since 4.1
  */
 public class OpenApiActionBuilder extends AbstractReferenceResolverAwareTestActionBuilder<TestAction> {
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiClientActionBuilder.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiClientActionBuilder.java
index 5c7b615272..a80cd953ba 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiClientActionBuilder.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiClientActionBuilder.java
@@ -27,7 +27,6 @@
 /**
  * Action executes http client operations such as sending requests and receiving responses.
  *
- * @author Christoph Deppisch
  * @since 4.1
  */
 public class OpenApiClientActionBuilder extends AbstractReferenceResolverAwareTestActionBuilder<TestAction> {
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiClientRequestActionBuilder.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiClientRequestActionBuilder.java
index d646202c4d..a9574f5310 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiClientRequestActionBuilder.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiClientRequestActionBuilder.java
@@ -41,7 +41,6 @@
 import org.springframework.http.HttpMethod;
 
 /**
- * @author Christoph Deppisch
  * @since 4.1
  */
 public class OpenApiClientRequestActionBuilder extends HttpClientRequestActionBuilder {
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiClientResponseActionBuilder.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiClientResponseActionBuilder.java
index 1e235868af..49b8a21c3a 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiClientResponseActionBuilder.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiClientResponseActionBuilder.java
@@ -39,7 +39,6 @@
 import org.springframework.http.HttpStatus;
 
 /**
- * @author Christoph Deppisch
  * @since 4.1
  */
 public class OpenApiClientResponseActionBuilder extends HttpClientResponseActionBuilder {
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiServerActionBuilder.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiServerActionBuilder.java
index 2db556ff30..b1feee6faf 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiServerActionBuilder.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiServerActionBuilder.java
@@ -27,7 +27,6 @@
 /**
  * Action executes http server operations such as receiving requests and sending response messages.
  *
- * @author Christoph Deppisch
  * @since 4.1
  */
 public class OpenApiServerActionBuilder extends AbstractReferenceResolverAwareTestActionBuilder<TestAction> {
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiServerRequestActionBuilder.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiServerRequestActionBuilder.java
index 97b1f3ec06..30c7a0b17a 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiServerRequestActionBuilder.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiServerRequestActionBuilder.java
@@ -41,7 +41,6 @@
 import org.springframework.http.HttpMethod;
 
 /**
- * @author Christoph Deppisch
  * @since 4.1
  */
 public class OpenApiServerRequestActionBuilder extends HttpServerRequestActionBuilder {
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiServerResponseActionBuilder.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiServerResponseActionBuilder.java
index 2c4a67c100..8a77e21e73 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiServerResponseActionBuilder.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/actions/OpenApiServerResponseActionBuilder.java
@@ -39,7 +39,6 @@
 import org.springframework.http.HttpStatus;
 
 /**
- * @author Christoph Deppisch
  * @since 4.1
  */
 public class OpenApiServerResponseActionBuilder extends HttpServerResponseActionBuilder {
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/model/OasModelHelper.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/model/OasModelHelper.java
index e74259c828..4f4bd6b8bf 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/model/OasModelHelper.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/model/OasModelHelper.java
@@ -39,9 +39,6 @@
 import org.citrusframework.openapi.model.v2.Oas20ModelHelper;
 import org.citrusframework.openapi.model.v3.Oas30ModelHelper;
 
-/**
- * @author Christoph Deppisch
- */
 public final class OasModelHelper {
 
     private OasModelHelper() {
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/model/v2/Oas20ModelHelper.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/model/v2/Oas20ModelHelper.java
index 36d9596fd4..a1a5055146 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/model/v2/Oas20ModelHelper.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/model/v2/Oas20ModelHelper.java
@@ -32,9 +32,6 @@
 import io.apicurio.datamodels.openapi.v2.models.Oas20Schema;
 import io.apicurio.datamodels.openapi.v2.models.Oas20SchemaDefinition;
 
-/**
- * @author Christoph Deppisch
- */
 public final class Oas20ModelHelper {
 
     private Oas20ModelHelper() {
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/model/v3/Oas30ModelHelper.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/model/v3/Oas30ModelHelper.java
index 39bdd2486e..fec97b4c3b 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/model/v3/Oas30ModelHelper.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/model/v3/Oas30ModelHelper.java
@@ -40,9 +40,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public final class Oas30ModelHelper {
 
     /** Logger */
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/xml/OpenApi.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/xml/OpenApi.java
index dfd837655a..f7a12adc9d 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/xml/OpenApi.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/xml/OpenApi.java
@@ -46,9 +46,6 @@
 import org.citrusframework.xml.actions.Receive;
 import org.citrusframework.xml.actions.Send;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "openapi")
 public class OpenApi implements TestActionBuilder<TestAction>, ReferenceResolverAware {
 
diff --git a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/yaml/OpenApi.java b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/yaml/OpenApi.java
index 59f92bd9ff..4958fddc26 100644
--- a/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/yaml/OpenApi.java
+++ b/connectors/citrus-openapi/src/main/java/org/citrusframework/openapi/yaml/OpenApi.java
@@ -40,9 +40,6 @@
 import org.citrusframework.yaml.actions.Send;
 import org.citrusframework.yaml.actions.Message;
 
-/**
- * @author Christoph Deppisch
- */
 public class OpenApi implements TestActionBuilder<TestAction>, ReferenceResolverAware {
 
     private TestActionBuilder<?> builder;
diff --git a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/actions/OpenApiActionBuilderTest.java b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/actions/OpenApiActionBuilderTest.java
index 4c2d40db4f..0ea28e7683 100644
--- a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/actions/OpenApiActionBuilderTest.java
+++ b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/actions/OpenApiActionBuilderTest.java
@@ -26,9 +26,6 @@
 
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Christoph Deppisch
- */
 public class OpenApiActionBuilderTest {
 
     private OpenApiActionBuilder fixture;
diff --git a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/groovy/AbstractGroovyActionDslTest.java b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/groovy/AbstractGroovyActionDslTest.java
index 9cc3bdd2a8..b1c9bc7ad9 100644
--- a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/groovy/AbstractGroovyActionDslTest.java
+++ b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/groovy/AbstractGroovyActionDslTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractGroovyActionDslTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/groovy/OpenApiClientTest.java b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/groovy/OpenApiClientTest.java
index 83e9f20076..b65e3f9ed7 100644
--- a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/groovy/OpenApiClientTest.java
+++ b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/groovy/OpenApiClientTest.java
@@ -59,9 +59,6 @@
 
 import static org.citrusframework.http.endpoint.builder.HttpEndpoints.http;
 
-/**
- * @author Christoph Deppisch
- */
 public class OpenApiClientTest extends AbstractGroovyActionDslTest {
 
     @BindToRegistry
diff --git a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/groovy/OpenApiServerTest.java b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/groovy/OpenApiServerTest.java
index c5326f1259..151687da4d 100644
--- a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/groovy/OpenApiServerTest.java
+++ b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/groovy/OpenApiServerTest.java
@@ -48,9 +48,6 @@
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 import static org.citrusframework.http.endpoint.builder.HttpEndpoints.http;
 
-/**
- * @author Christoph Deppisch
- */
 public class OpenApiServerTest extends AbstractGroovyActionDslTest {
 
     @BindToRegistry
diff --git a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/integration/OpenApiClientIT.java b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/integration/OpenApiClientIT.java
index ffa4e9dcdf..2c7e8b8f49 100644
--- a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/integration/OpenApiClientIT.java
+++ b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/integration/OpenApiClientIT.java
@@ -32,9 +32,6 @@
 import static org.citrusframework.http.actions.HttpActionBuilder.http;
 import static org.citrusframework.openapi.actions.OpenApiActionBuilder.openapi;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class OpenApiClientIT extends TestNGCitrusSpringSupport {
 
diff --git a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/integration/OpenApiServerIT.java b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/integration/OpenApiServerIT.java
index 216445a5d3..0d2c7bcc05 100644
--- a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/integration/OpenApiServerIT.java
+++ b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/integration/OpenApiServerIT.java
@@ -32,9 +32,6 @@
 import static org.citrusframework.http.actions.HttpActionBuilder.http;
 import static org.citrusframework.openapi.actions.OpenApiActionBuilder.openapi;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class OpenApiServerIT extends TestNGCitrusSpringSupport {
 
diff --git a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/xml/AbstractXmlActionTest.java b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/xml/AbstractXmlActionTest.java
index 76520ce909..6d5fe30b8c 100644
--- a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/xml/AbstractXmlActionTest.java
+++ b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/xml/AbstractXmlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractXmlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/xml/OpenApiClientTest.java b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/xml/OpenApiClientTest.java
index dcb704ebf6..101e604c6e 100644
--- a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/xml/OpenApiClientTest.java
+++ b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/xml/OpenApiClientTest.java
@@ -62,9 +62,6 @@
 
 import static org.citrusframework.http.endpoint.builder.HttpEndpoints.http;
 
-/**
- * @author Christoph Deppisch
- */
 public class OpenApiClientTest extends AbstractXmlActionTest {
 
     @BindToRegistry
diff --git a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/xml/OpenApiServerTest.java b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/xml/OpenApiServerTest.java
index b90685f1e4..4f49613c96 100644
--- a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/xml/OpenApiServerTest.java
+++ b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/xml/OpenApiServerTest.java
@@ -48,9 +48,6 @@
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 import static org.citrusframework.http.endpoint.builder.HttpEndpoints.http;
 
-/**
- * @author Christoph Deppisch
- */
 public class OpenApiServerTest extends AbstractXmlActionTest {
 
     @BindToRegistry
diff --git a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/yaml/AbstractYamlActionTest.java b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/yaml/AbstractYamlActionTest.java
index 39e2a1ccc2..6958c83ddc 100644
--- a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/yaml/AbstractYamlActionTest.java
+++ b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/yaml/AbstractYamlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractYamlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/yaml/OpenApiClientTest.java b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/yaml/OpenApiClientTest.java
index a6c383d93a..0b09fa9c52 100644
--- a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/yaml/OpenApiClientTest.java
+++ b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/yaml/OpenApiClientTest.java
@@ -60,9 +60,6 @@
 
 import static org.citrusframework.http.endpoint.builder.HttpEndpoints.http;
 
-/**
- * @author Christoph Deppisch
- */
 public class OpenApiClientTest extends AbstractYamlActionTest {
 
     @BindToRegistry
diff --git a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/yaml/OpenApiServerTest.java b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/yaml/OpenApiServerTest.java
index 02291ad91d..d8dac9eb1d 100644
--- a/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/yaml/OpenApiServerTest.java
+++ b/connectors/citrus-openapi/src/test/java/org/citrusframework/openapi/yaml/OpenApiServerTest.java
@@ -48,9 +48,6 @@
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 import static org.citrusframework.http.endpoint.builder.HttpEndpoints.http;
 
-/**
- * @author Christoph Deppisch
- */
 public class OpenApiServerTest extends AbstractYamlActionTest {
 
     @BindToRegistry
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/AbstractSeleniumAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/AbstractSeleniumAction.java
index b4835f67cb..accad36361 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/AbstractSeleniumAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/AbstractSeleniumAction.java
@@ -26,7 +26,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public abstract class AbstractSeleniumAction extends AbstractTestAction implements SeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/AlertAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/AlertAction.java
index 73d0782d09..0fc2c7fca3 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/AlertAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/AlertAction.java
@@ -31,7 +31,6 @@
  * Access current alert dialog. In case no alert is opened action fails.
  * Action supports optional alert text validation.
  *
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class AlertAction extends AbstractSeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/CheckInputAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/CheckInputAction.java
index 5b785a144e..5ae16569bd 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/CheckInputAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/CheckInputAction.java
@@ -23,7 +23,6 @@
 /**
  * Sets value on checkbox form input element.
  *
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class CheckInputAction extends FindElementAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/ClearBrowserCacheAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/ClearBrowserCacheAction.java
index a4e0bae198..0919018d61 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/ClearBrowserCacheAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/ClearBrowserCacheAction.java
@@ -20,7 +20,6 @@
 import org.citrusframework.selenium.endpoint.SeleniumBrowser;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class ClearBrowserCacheAction extends AbstractSeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/ClickAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/ClickAction.java
index b1edad7c41..b717867761 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/ClickAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/ClickAction.java
@@ -23,7 +23,6 @@
 /**
  * Click some element on current page.
  *
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class ClickAction extends FindElementAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/CloseWindowAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/CloseWindowAction.java
index a4289c6986..7ac13652e2 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/CloseWindowAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/CloseWindowAction.java
@@ -28,7 +28,6 @@
 /**
  * Close opened window by name.
  *
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class CloseWindowAction extends AbstractSeleniumAction implements SeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/DropDownSelectAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/DropDownSelectAction.java
index c26a8af6a8..2debe8776f 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/DropDownSelectAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/DropDownSelectAction.java
@@ -33,7 +33,6 @@
 /**
  * Selects dropdown option(s) on form input.
  *
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class DropDownSelectAction extends FindElementAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/FillFormAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/FillFormAction.java
index f4016f0f52..eae9bc8059 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/FillFormAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/FillFormAction.java
@@ -29,7 +29,6 @@
  * Sets field values with set input action that supports both input and select form controls.
  * Supports to submit the form after all fields are set.
  *
- * @author Christoph Deppisch
  */
 public class FillFormAction extends AbstractSeleniumAction {
 
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/FindElementAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/FindElementAction.java
index 78abc1bef7..ee88206cfe 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/FindElementAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/FindElementAction.java
@@ -33,7 +33,6 @@
  * Finds element in DOM tree on current page and validates its properties and settings.
  * Test action fails in case no element is found or the validation expectations are not met.
  *
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class FindElementAction extends AbstractSeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/GetStoredFileAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/GetStoredFileAction.java
index 730561fd4b..1599d481f9 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/GetStoredFileAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/GetStoredFileAction.java
@@ -21,7 +21,6 @@
 import org.citrusframework.selenium.endpoint.SeleniumHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class GetStoredFileAction extends AbstractSeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/HoverAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/HoverAction.java
index 722254a077..721b9b2a11 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/HoverAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/HoverAction.java
@@ -22,7 +22,6 @@
 import org.openqa.selenium.interactions.Actions;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class HoverAction extends FindElementAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/JavaScriptAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/JavaScriptAction.java
index 913561e788..dd6f2370fc 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/JavaScriptAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/JavaScriptAction.java
@@ -33,7 +33,6 @@
 /**
  * Executes javascript code on current page and validates errors.
  *
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class JavaScriptAction extends AbstractSeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/MakeScreenshotAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/MakeScreenshotAction.java
index 0c653c29e4..0c236b5c48 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/MakeScreenshotAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/MakeScreenshotAction.java
@@ -33,7 +33,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class MakeScreenshotAction extends AbstractSeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/NavigateAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/NavigateAction.java
index fffa24281d..64a3f68ec0 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/NavigateAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/NavigateAction.java
@@ -31,7 +31,6 @@
  * Navigates to new page either by using new absolute page URL or relative page path.
  * Also supports history forward and back navigation as well as page refresh.
  *
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class NavigateAction extends AbstractSeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/OpenWindowAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/OpenWindowAction.java
index 335346fa52..1492a36e6e 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/OpenWindowAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/OpenWindowAction.java
@@ -28,7 +28,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class OpenWindowAction extends AbstractSeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/PageAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/PageAction.java
index 63a0a83e51..a6b53f1618 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/PageAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/PageAction.java
@@ -32,7 +32,6 @@
 /**
  * Initialize new page object and run optional validation. Page action is a method on page object that is called via reflection.
  *
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class PageAction extends AbstractSeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SeleniumAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SeleniumAction.java
index b491ba1287..ff6e75a583 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SeleniumAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SeleniumAction.java
@@ -21,7 +21,6 @@
 
 /**
  * Basic Selenium action interface marks Selenium related test actions.
- * @author Christoph Deppisch
  * @since 2.7
  */
 public interface SeleniumAction extends TestAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SeleniumActionBuilder.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SeleniumActionBuilder.java
index b5465171a3..dcd580ab59 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SeleniumActionBuilder.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SeleniumActionBuilder.java
@@ -30,7 +30,6 @@
 /**
  * Action builds selenium related actions.
  *
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumActionBuilder implements TestActionBuilder.DelegatingTestActionBuilder<SeleniumAction> {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SetInputAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SetInputAction.java
index 03aec4cbf8..17b46da05f 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SetInputAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SetInputAction.java
@@ -24,7 +24,6 @@
 /**
  * Sets new text value for form input element.
  *
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class SetInputAction extends FindElementAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/StartBrowserAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/StartBrowserAction.java
index 49ed0bfe0a..f6d5dc1be3 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/StartBrowserAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/StartBrowserAction.java
@@ -24,7 +24,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class StartBrowserAction extends AbstractSeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/StopBrowserAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/StopBrowserAction.java
index f1161444f1..2ff983c7ca 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/StopBrowserAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/StopBrowserAction.java
@@ -23,7 +23,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class StopBrowserAction extends AbstractSeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/StoreFileAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/StoreFileAction.java
index ce555dda8d..d3cfa295df 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/StoreFileAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/StoreFileAction.java
@@ -20,7 +20,6 @@
 import org.citrusframework.selenium.endpoint.SeleniumBrowser;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class StoreFileAction extends AbstractSeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SwitchWindowAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SwitchWindowAction.java
index 9f8b543519..4aa263fd11 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SwitchWindowAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/SwitchWindowAction.java
@@ -26,7 +26,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SwitchWindowAction extends AbstractSeleniumAction implements SeleniumAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/WaitUntilAction.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/WaitUntilAction.java
index aad977580d..86834dc913 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/WaitUntilAction.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/actions/WaitUntilAction.java
@@ -28,7 +28,6 @@
 /**
  * Waits until element is visible or hidden.
  *
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class WaitUntilAction extends FindElementAction {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfig.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfig.java
index a05a7ddccc..353e6f0238 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfig.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParser.java
index 3593dc5473..1428d0c4a5 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParser.java
@@ -26,7 +26,6 @@
 import org.openqa.selenium.support.events.WebDriverListener;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumBrowserConfigParser implements AnnotationConfigParser<SeleniumBrowserConfig, SeleniumBrowser> {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/handler/SeleniumConfigNamespaceHandler.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/handler/SeleniumConfigNamespaceHandler.java
index cfc3df3ed3..e657737207 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/handler/SeleniumConfigNamespaceHandler.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/handler/SeleniumConfigNamespaceHandler.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/handler/SeleniumTestcaseNamespaceHandler.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/handler/SeleniumTestcaseNamespaceHandler.java
index 6f64e47c50..f26469d1e1 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/handler/SeleniumTestcaseNamespaceHandler.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/handler/SeleniumTestcaseNamespaceHandler.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumTestcaseNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/AbstractBrowserActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/AbstractBrowserActionParser.java
index 99a4b03beb..bc96ec7ad3 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/AbstractBrowserActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/AbstractBrowserActionParser.java
@@ -30,7 +30,6 @@
 /**
  * Bean definition parser for selenium client action in test case.
  *
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public abstract class AbstractBrowserActionParser implements BeanDefinitionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/AlertActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/AlertActionParser.java
index 81e4bfaca0..f52f80e389 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/AlertActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/AlertActionParser.java
@@ -24,7 +24,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class AlertActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/CheckInputActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/CheckInputActionParser.java
index cf1c6d5cb8..0aba413daf 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/CheckInputActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/CheckInputActionParser.java
@@ -23,7 +23,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class CheckInputActionParser extends FindElementActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/ClearBrowserCacheActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/ClearBrowserCacheActionParser.java
index 7abbf4e777..b36cbda06f 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/ClearBrowserCacheActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/ClearBrowserCacheActionParser.java
@@ -22,7 +22,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class ClearBrowserCacheActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/ClickActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/ClickActionParser.java
index baa0e8f676..4288934cff 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/ClickActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/ClickActionParser.java
@@ -22,7 +22,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class ClickActionParser extends FindElementActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/CloseWindowActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/CloseWindowActionParser.java
index 108bb61550..f5372992fe 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/CloseWindowActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/CloseWindowActionParser.java
@@ -23,7 +23,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class CloseWindowActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/DropDownSelectActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/DropDownSelectActionParser.java
index 66cb6b8463..84d0d6e3e3 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/DropDownSelectActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/DropDownSelectActionParser.java
@@ -28,7 +28,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class DropDownSelectActionParser extends FindElementActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/FindElementActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/FindElementActionParser.java
index 0df4dace23..353284829e 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/FindElementActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/FindElementActionParser.java
@@ -29,7 +29,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class FindElementActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/GetStoredFileActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/GetStoredFileActionParser.java
index 397ebfc0de..2878813d2c 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/GetStoredFileActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/GetStoredFileActionParser.java
@@ -23,7 +23,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class GetStoredFileActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/HoverActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/HoverActionParser.java
index e3062cf55b..30ebc5b7cc 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/HoverActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/HoverActionParser.java
@@ -22,7 +22,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class HoverActionParser extends FindElementActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/JavaScriptActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/JavaScriptActionParser.java
index 745eaed3d6..5e083bb60b 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/JavaScriptActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/JavaScriptActionParser.java
@@ -28,7 +28,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class JavaScriptActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/MakeScreenshotActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/MakeScreenshotActionParser.java
index b76e09dd40..0753eadfbb 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/MakeScreenshotActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/MakeScreenshotActionParser.java
@@ -23,7 +23,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class MakeScreenshotActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/NavigateActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/NavigateActionParser.java
index 3bccd059e9..b46baabc3e 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/NavigateActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/NavigateActionParser.java
@@ -23,7 +23,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class NavigateActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/OpenWindowActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/OpenWindowActionParser.java
index 837506f778..dd307b99c6 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/OpenWindowActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/OpenWindowActionParser.java
@@ -23,7 +23,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class OpenWindowActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/PageActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/PageActionParser.java
index 5fade0b36f..37c4dd60ae 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/PageActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/PageActionParser.java
@@ -29,7 +29,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class PageActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParser.java
index 1c72ec2100..18bca9a11c 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParser.java
@@ -29,7 +29,6 @@
 /**
  * Bean definition parser for selenium browser instance.
  *
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumBrowserParser extends AbstractEndpointParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SetInputActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SetInputActionParser.java
index 1b3ea174f7..cdc2ca1899 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SetInputActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SetInputActionParser.java
@@ -23,7 +23,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class SetInputActionParser extends FindElementActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/StartBrowserActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/StartBrowserActionParser.java
index fd5a9aa015..ea2dff56e1 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/StartBrowserActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/StartBrowserActionParser.java
@@ -22,7 +22,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class StartBrowserActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/StopBrowserActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/StopBrowserActionParser.java
index bb650447e7..97960484cb 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/StopBrowserActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/StopBrowserActionParser.java
@@ -22,7 +22,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class StopBrowserActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/StoreFileActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/StoreFileActionParser.java
index 8ea576ac5a..0ef7e7475c 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/StoreFileActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/StoreFileActionParser.java
@@ -23,7 +23,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class StoreFileActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SwitchWindowActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SwitchWindowActionParser.java
index 9113e98729..22f82bdafd 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SwitchWindowActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/SwitchWindowActionParser.java
@@ -23,7 +23,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class SwitchWindowActionParser extends AbstractBrowserActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/WaitUntilActionParser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/WaitUntilActionParser.java
index c771810e83..81f1871bdf 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/WaitUntilActionParser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/config/xml/WaitUntilActionParser.java
@@ -23,7 +23,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class WaitUntilActionParser extends FindElementActionParser {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowser.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowser.java
index 818a4233fc..b92e17b0a6 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowser.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowser.java
@@ -66,7 +66,6 @@
 /**
  * Selenium browser provides access to web driver and initializes Selenium environment from endpoint configuration.
  *
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumBrowser extends AbstractEndpoint implements Producer {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowserBuilder.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowserBuilder.java
index 38614547bd..5a8b2448fc 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowserBuilder.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowserBuilder.java
@@ -24,7 +24,6 @@
 import org.openqa.selenium.support.events.WebDriverListener;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumBrowserBuilder extends AbstractEndpointBuilder<SeleniumBrowser> {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowserConfiguration.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowserConfiguration.java
index 73bef39fe1..350b74e560 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowserConfiguration.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumBrowserConfiguration.java
@@ -26,7 +26,6 @@
 import org.openqa.selenium.support.events.WebDriverListener;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumBrowserConfiguration extends AbstractEndpointConfiguration {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumEndpointComponent.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumEndpointComponent.java
index 4c31ff114f..28ddaa5afa 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumEndpointComponent.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumEndpointComponent.java
@@ -24,7 +24,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumEndpointComponent extends AbstractEndpointComponent {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumHeaders.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumHeaders.java
index da63b5a531..6543214ac1 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumHeaders.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/SeleniumHeaders.java
@@ -17,7 +17,6 @@
 package org.citrusframework.selenium.endpoint;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumHeaders {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/builder/SeleniumEndpoints.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/builder/SeleniumEndpoints.java
index 826df7a757..376c9be1a2 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/builder/SeleniumEndpoints.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/endpoint/builder/SeleniumEndpoints.java
@@ -22,7 +22,6 @@
 /**
  * Selenium browser endpoint builder wrapper.
  *
- * @author Christoph Deppisch
  * @since 2.7
  */
 public final class SeleniumEndpoints extends AbstractEndpointBuilder<SeleniumBrowserBuilder> {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/model/PageValidator.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/model/PageValidator.java
index ac6e1d5861..21a37e85c2 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/model/PageValidator.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/model/PageValidator.java
@@ -20,7 +20,6 @@
 import org.citrusframework.selenium.endpoint.SeleniumBrowser;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public interface PageValidator<T extends WebPage> {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/model/WebPage.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/model/WebPage.java
index 4543a75acf..ce58bafaaa 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/model/WebPage.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/model/WebPage.java
@@ -17,7 +17,6 @@
 package org.citrusframework.selenium.model;
 
 /**
- * @author Tamer Erdogan, Christoph Deppisch
  * @since 2.7
  */
 public interface WebPage {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/util/BrowserUtils.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/util/BrowserUtils.java
index 723365f144..012351334a 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/util/BrowserUtils.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/util/BrowserUtils.java
@@ -17,7 +17,6 @@
 package org.citrusframework.selenium.util;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class BrowserUtils {
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/xml/Selenium.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/xml/Selenium.java
index 2becc07b18..ed50bb87ff 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/xml/Selenium.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/xml/Selenium.java
@@ -30,9 +30,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "selenium")
 public class Selenium implements TestActionBuilder<TestAction>, ReferenceResolverAware {
 
diff --git a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/yaml/Selenium.java b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/yaml/Selenium.java
index 98ea2cbccd..fa9a785729 100644
--- a/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/yaml/Selenium.java
+++ b/connectors/citrus-selenium/src/main/java/org/citrusframework/selenium/yaml/Selenium.java
@@ -26,9 +26,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 public class Selenium implements TestActionBuilder<SeleniumAction>, ReferenceResolverAware {
 
     private AbstractSeleniumAction.Builder<?, ?> builder;
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/UnitTestSupport.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/UnitTestSupport.java
index dca919d44f..6c1a51484e 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/UnitTestSupport.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/UnitTestSupport.java
@@ -20,9 +20,6 @@
 import org.citrusframework.context.TestContextFactory;
 import org.testng.annotations.BeforeMethod;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport {
 
     protected TestContextFactory testContextFactory;
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/AlertActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/AlertActionTest.java
index e6ac754cb1..87dd81607d 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/AlertActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/AlertActionTest.java
@@ -32,7 +32,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class AlertActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/CheckInputActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/CheckInputActionTest.java
index 6de22e6c41..a0308a6ba8 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/CheckInputActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/CheckInputActionTest.java
@@ -26,7 +26,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class CheckInputActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/ClearBrowserCacheActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/ClearBrowserCacheActionTest.java
index 8c445372a9..3903eab508 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/ClearBrowserCacheActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/ClearBrowserCacheActionTest.java
@@ -26,7 +26,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class ClearBrowserCacheActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/ClickActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/ClickActionTest.java
index 19d03e1bed..a677ccb3b9 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/ClickActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/ClickActionTest.java
@@ -29,7 +29,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class ClickActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/CloseWindowActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/CloseWindowActionTest.java
index ae12aee3e8..7652304b81 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/CloseWindowActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/CloseWindowActionTest.java
@@ -35,7 +35,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class CloseWindowActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/DropDownSelectActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/DropDownSelectActionTest.java
index 0fa7518512..046e40b3ab 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/DropDownSelectActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/DropDownSelectActionTest.java
@@ -31,7 +31,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class DropDownSelectActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/FillFormActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/FillFormActionTest.java
index e0db246af3..df6d3cea87 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/FillFormActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/FillFormActionTest.java
@@ -29,9 +29,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class FillFormActionTest extends AbstractTestNGUnitTest {
 
     private final SeleniumBrowser seleniumBrowser = new SeleniumBrowser();
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/FindElementActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/FindElementActionTest.java
index 41ee8a9c69..43478228f8 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/FindElementActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/FindElementActionTest.java
@@ -34,7 +34,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class FindElementActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/GetStoredFileActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/GetStoredFileActionTest.java
index 37002d11f4..c95eb4abbe 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/GetStoredFileActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/GetStoredFileActionTest.java
@@ -29,7 +29,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class GetStoredFileActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/HoverActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/HoverActionTest.java
index 9f90e0d679..2745d7a876 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/HoverActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/HoverActionTest.java
@@ -32,7 +32,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class HoverActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/JavaScriptActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/JavaScriptActionTest.java
index 8a34be7a9f..5ec6b5f86d 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/JavaScriptActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/JavaScriptActionTest.java
@@ -35,7 +35,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class JavaScriptActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/MakeScreenshotActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/MakeScreenshotActionTest.java
index 34f83778d0..87692e6bdb 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/MakeScreenshotActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/MakeScreenshotActionTest.java
@@ -34,7 +34,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class MakeScreenshotActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/NavigateActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/NavigateActionTest.java
index 70c48adfca..9b0f76fa6e 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/NavigateActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/NavigateActionTest.java
@@ -31,7 +31,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class NavigateActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/OpenWindowActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/OpenWindowActionTest.java
index 9c05d21e19..7671f70ea2 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/OpenWindowActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/OpenWindowActionTest.java
@@ -37,7 +37,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class OpenWindowActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/PageActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/PageActionTest.java
index 7525f7c550..e110c69862 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/PageActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/PageActionTest.java
@@ -39,7 +39,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class PageActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/SetInputActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/SetInputActionTest.java
index 501e18554a..91290094c8 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/SetInputActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/SetInputActionTest.java
@@ -33,7 +33,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SetInputActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/StartBrowserActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/StartBrowserActionTest.java
index 93ab068103..2b800e0d21 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/StartBrowserActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/StartBrowserActionTest.java
@@ -33,7 +33,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class StartBrowserActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/StopBrowserActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/StopBrowserActionTest.java
index e9ca328e06..4af807e044 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/StopBrowserActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/StopBrowserActionTest.java
@@ -30,7 +30,6 @@
 import static org.mockito.Mockito.verify;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class StopBrowserActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/StoreFileActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/StoreFileActionTest.java
index 8141675a2e..307937b30f 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/StoreFileActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/StoreFileActionTest.java
@@ -27,7 +27,6 @@
 import static org.mockito.Mockito.reset;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class StoreFileActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/SwitchWindowActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/SwitchWindowActionTest.java
index be9c70d32b..8a2da96a97 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/SwitchWindowActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/SwitchWindowActionTest.java
@@ -37,7 +37,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SwitchWindowActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/WaitUntilActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/WaitUntilActionTest.java
index fcc97f62de..98cc6c77a3 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/WaitUntilActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/WaitUntilActionTest.java
@@ -33,7 +33,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class WaitUntilActionTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/dsl/SeleniumTestActionBuilderTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/dsl/SeleniumTestActionBuilderTest.java
index b80f55d8ab..785231edd3 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/dsl/SeleniumTestActionBuilderTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/actions/dsl/SeleniumTestActionBuilderTest.java
@@ -51,7 +51,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumTestActionBuilderTest extends UnitTestSupport {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParserTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParserTest.java
index b327126b83..96204bee68 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParserTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/annotation/SeleniumBrowserConfigParserTest.java
@@ -43,7 +43,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumBrowserConfigParserTest extends AbstractTestNGUnitTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/xml/SeleniumActionsParserTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/xml/SeleniumActionsParserTest.java
index a72e7cb290..e39298a3e2 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/xml/SeleniumActionsParserTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/xml/SeleniumActionsParserTest.java
@@ -23,7 +23,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumActionsParserTest extends AbstractActionParserTest<AbstractSeleniumAction> {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParserTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParserTest.java
index 9500e76543..906c9e5597 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParserTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/config/xml/SeleniumBrowserParserTest.java
@@ -25,7 +25,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumBrowserParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/endpoint/SeleniumEndpointComponentTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/endpoint/SeleniumEndpointComponentTest.java
index 4992a72f3f..9a4c71780d 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/endpoint/SeleniumEndpointComponentTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/endpoint/SeleniumEndpointComponentTest.java
@@ -36,7 +36,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumEndpointComponentTest {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/endpoint/builder/SeleniumEndpointsTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/endpoint/builder/SeleniumEndpointsTest.java
index a80df18907..6bc7c3e28a 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/endpoint/builder/SeleniumEndpointsTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/endpoint/builder/SeleniumEndpointsTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SeleniumEndpointsTest {
 
     @Test
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/groovy/AbstractGroovyActionDslTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/groovy/AbstractGroovyActionDslTest.java
index 2bc06fc503..d1c42c3975 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/groovy/AbstractGroovyActionDslTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/groovy/AbstractGroovyActionDslTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractGroovyActionDslTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/groovy/SeleniumTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/groovy/SeleniumTest.java
index b8487ce6f7..98c27ef8f6 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/groovy/SeleniumTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/groovy/SeleniumTest.java
@@ -43,9 +43,6 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SeleniumTest extends AbstractGroovyActionDslTest {
 
     @Mock
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/integration/SeleniumIT.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/integration/SeleniumIT.java
index 76e1875aa9..27c1025447 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/integration/SeleniumIT.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/integration/SeleniumIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class SeleniumIT extends TestNGCitrusSpringSupport {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/pages/UserFormPage.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/pages/UserFormPage.java
index 786a5e55dc..93b7f2fa42 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/pages/UserFormPage.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/pages/UserFormPage.java
@@ -26,7 +26,6 @@
 import org.openqa.selenium.support.FindBy;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class UserFormPage implements WebPage, PageValidator<UserFormPage> {
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/xml/AbstractXmlActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/xml/AbstractXmlActionTest.java
index b821b2ba1f..f0e290c435 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/xml/AbstractXmlActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/xml/AbstractXmlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractXmlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/xml/SeleniumTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/xml/SeleniumTest.java
index 47ad2bde23..233a1a51cc 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/xml/SeleniumTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/xml/SeleniumTest.java
@@ -44,9 +44,6 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SeleniumTest extends AbstractXmlActionTest {
 
     @Mock
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/yaml/AbstractYamlActionTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/yaml/AbstractYamlActionTest.java
index ee492de5b7..01e669f8c4 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/yaml/AbstractYamlActionTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/yaml/AbstractYamlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractYamlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/yaml/SeleniumTest.java b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/yaml/SeleniumTest.java
index 921327416c..0ac28bf0e3 100644
--- a/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/yaml/SeleniumTest.java
+++ b/connectors/citrus-selenium/src/test/java/org/citrusframework/selenium/yaml/SeleniumTest.java
@@ -44,9 +44,6 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SeleniumTest extends AbstractYamlActionTest {
 
     @Mock
diff --git a/connectors/citrus-sql/src/main/java/org/citrusframework/actions/AbstractDatabaseConnectingTestAction.java b/connectors/citrus-sql/src/main/java/org/citrusframework/actions/AbstractDatabaseConnectingTestAction.java
index f7aea3b79a..4135ed113b 100644
--- a/connectors/citrus-sql/src/main/java/org/citrusframework/actions/AbstractDatabaseConnectingTestAction.java
+++ b/connectors/citrus-sql/src/main/java/org/citrusframework/actions/AbstractDatabaseConnectingTestAction.java
@@ -40,7 +40,6 @@
  * Abstract base class for database connection test actions. Extends {@link JdbcDaoSupport} providing
  * access to a {@link javax.sql.DataSource}.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractDatabaseConnectingTestAction extends JdbcDaoSupport implements TestAction, Named, Described, TestActorAware {
 
diff --git a/connectors/citrus-sql/src/main/java/org/citrusframework/actions/ExecutePLSQLAction.java b/connectors/citrus-sql/src/main/java/org/citrusframework/actions/ExecutePLSQLAction.java
index f6f860a8ab..9aaed571a1 100644
--- a/connectors/citrus-sql/src/main/java/org/citrusframework/actions/ExecutePLSQLAction.java
+++ b/connectors/citrus-sql/src/main/java/org/citrusframework/actions/ExecutePLSQLAction.java
@@ -36,7 +36,6 @@
  * Class executes PLSQL statements either declared inline as PLSQL statements or given by an
  * external file resource.
  *
- * @author Christoph Deppisch
  * @since 2008
  */
 public class ExecutePLSQLAction extends AbstractDatabaseConnectingTestAction {
diff --git a/connectors/citrus-sql/src/main/java/org/citrusframework/actions/ExecuteSQLAction.java b/connectors/citrus-sql/src/main/java/org/citrusframework/actions/ExecuteSQLAction.java
index 7be63402d6..26c1ce0577 100644
--- a/connectors/citrus-sql/src/main/java/org/citrusframework/actions/ExecuteSQLAction.java
+++ b/connectors/citrus-sql/src/main/java/org/citrusframework/actions/ExecuteSQLAction.java
@@ -30,7 +30,6 @@
  *
  * When executing SQL query statements (SELECT) see {@link ExecuteSQLQueryAction}.
  *
- * @author Christoph Deppisch, Jan Szczepanski
  * @since 2006
  */
 public class ExecuteSQLAction extends AbstractDatabaseConnectingTestAction {
diff --git a/connectors/citrus-sql/src/main/java/org/citrusframework/actions/ExecuteSQLQueryAction.java b/connectors/citrus-sql/src/main/java/org/citrusframework/actions/ExecuteSQLQueryAction.java
index 19f39035f8..60db1b76f2 100644
--- a/connectors/citrus-sql/src/main/java/org/citrusframework/actions/ExecuteSQLQueryAction.java
+++ b/connectors/citrus-sql/src/main/java/org/citrusframework/actions/ExecuteSQLQueryAction.java
@@ -53,7 +53,6 @@
  * The class enables you to query data result sets from a
  * database. Validation will happen on column basis inside the result set.
  *
- * @author Christoph Deppisch, Jan Zahalka
  * @since 2008
  */
 public class ExecuteSQLQueryAction extends AbstractDatabaseConnectingTestAction {
diff --git a/connectors/citrus-sql/src/main/java/org/citrusframework/config/xml/AbstractDatabaseConnectingTestActionFactoryBean.java b/connectors/citrus-sql/src/main/java/org/citrusframework/config/xml/AbstractDatabaseConnectingTestActionFactoryBean.java
index 820942a54d..49ad0f7a3b 100644
--- a/connectors/citrus-sql/src/main/java/org/citrusframework/config/xml/AbstractDatabaseConnectingTestActionFactoryBean.java
+++ b/connectors/citrus-sql/src/main/java/org/citrusframework/config/xml/AbstractDatabaseConnectingTestActionFactoryBean.java
@@ -23,9 +23,6 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.PlatformTransactionManager;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractDatabaseConnectingTestActionFactoryBean<T extends AbstractDatabaseConnectingTestAction, B extends AbstractDatabaseConnectingTestAction.Builder<T, B>> extends AbstractTestActionFactoryBean<T, B> {
 
     /**
diff --git a/connectors/citrus-sql/src/main/java/org/citrusframework/config/xml/ExecutePLSQLActionParser.java b/connectors/citrus-sql/src/main/java/org/citrusframework/config/xml/ExecutePLSQLActionParser.java
index d7883a0013..f33790ab05 100644
--- a/connectors/citrus-sql/src/main/java/org/citrusframework/config/xml/ExecutePLSQLActionParser.java
+++ b/connectors/citrus-sql/src/main/java/org/citrusframework/config/xml/ExecutePLSQLActionParser.java
@@ -28,7 +28,6 @@
 /**
  * Bean definition parser for plsql action in test case.
  *
- * @author Christoph Deppisch
  */
 public class ExecutePLSQLActionParser implements BeanDefinitionParser {
 
diff --git a/connectors/citrus-sql/src/main/java/org/citrusframework/config/xml/SQLActionParser.java b/connectors/citrus-sql/src/main/java/org/citrusframework/config/xml/SQLActionParser.java
index fcf47e31c6..a92578df9b 100644
--- a/connectors/citrus-sql/src/main/java/org/citrusframework/config/xml/SQLActionParser.java
+++ b/connectors/citrus-sql/src/main/java/org/citrusframework/config/xml/SQLActionParser.java
@@ -39,7 +39,6 @@
 /**
  * Bean definition parser for sql action in test case.
  *
- * @author Christoph Deppisch
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public class SQLActionParser implements BeanDefinitionParser {
diff --git a/connectors/citrus-sql/src/main/java/org/citrusframework/util/SqlUtils.java b/connectors/citrus-sql/src/main/java/org/citrusframework/util/SqlUtils.java
index ac00a9c016..1fb90f0aa4 100644
--- a/connectors/citrus-sql/src/main/java/org/citrusframework/util/SqlUtils.java
+++ b/connectors/citrus-sql/src/main/java/org/citrusframework/util/SqlUtils.java
@@ -28,7 +28,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public abstract class SqlUtils {
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/UnitTestSupport.java b/connectors/citrus-sql/src/test/java/org/citrusframework/UnitTestSupport.java
index 16297ee33f..c9628214cb 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/UnitTestSupport.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/UnitTestSupport.java
@@ -19,9 +19,6 @@
 import org.citrusframework.context.TestContextFactory;
 import org.citrusframework.testng.AbstractTestNGUnitTest;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport extends AbstractTestNGUnitTest {
 
     @Override
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecutePLSQLActionTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecutePLSQLActionTest.java
index 8605da1284..08fea8230a 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecutePLSQLActionTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecutePLSQLActionTest.java
@@ -32,9 +32,6 @@
 import static org.mockito.Mockito.verify;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class ExecutePLSQLActionTest extends AbstractTestNGUnitTest {
 
     private ExecutePLSQLAction.Builder executePLSQLActionBuilder;
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecuteSQLActionTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecuteSQLActionTest.java
index 64837f5112..fd237b4f1e 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecuteSQLActionTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecuteSQLActionTest.java
@@ -35,9 +35,6 @@
 import static org.mockito.Mockito.verify;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class ExecuteSQLActionTest extends AbstractTestNGUnitTest {
 
     private static final String DB_STMT_1 = "DELETE * FROM ERRORS WHERE STATUS='resolved'";
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecuteSQLQueryActionTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecuteSQLQueryActionTest.java
index 2f96874358..4ac3a381d6 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecuteSQLQueryActionTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/ExecuteSQLQueryActionTest.java
@@ -49,9 +49,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ExecuteSQLQueryActionTest extends UnitTestSupport {
 
     private static final String DB_STMT_1 = "select ORDERTYPE, STATUS from orders where ID = 5";
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/TestActionBuilderLookupTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/TestActionBuilderLookupTest.java
index 9681b2eb3e..e131b16539 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/TestActionBuilderLookupTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/TestActionBuilderLookupTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestActionBuilderLookupTest {
 
     @Test
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/dsl/ExecutePLSQLTestActionBuilderTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/dsl/ExecutePLSQLTestActionBuilderTest.java
index 87820b6f25..f60aa60d93 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/dsl/ExecutePLSQLTestActionBuilderTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/dsl/ExecutePLSQLTestActionBuilderTest.java
@@ -36,7 +36,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class ExecutePLSQLTestActionBuilderTest extends UnitTestSupport {
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/dsl/ExecuteSQLQueryTestActionBuilderTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/dsl/ExecuteSQLQueryTestActionBuilderTest.java
index c86f5fbe9d..15cab4fcfc 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/dsl/ExecuteSQLQueryTestActionBuilderTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/dsl/ExecuteSQLQueryTestActionBuilderTest.java
@@ -39,7 +39,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class ExecuteSQLQueryTestActionBuilderTest extends UnitTestSupport {
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/dsl/ExecuteSQLTestActionBuilderTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/dsl/ExecuteSQLTestActionBuilderTest.java
index 03df7d6e76..1b5517c7be 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/actions/dsl/ExecuteSQLTestActionBuilderTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/actions/dsl/ExecuteSQLTestActionBuilderTest.java
@@ -34,7 +34,6 @@
 import static org.mockito.Mockito.verify;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class ExecuteSQLTestActionBuilderTest extends UnitTestSupport {
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/config/xml/ExecutePLSQLActionParserTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/config/xml/ExecutePLSQLActionParserTest.java
index 806930914c..45251e65b8 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/config/xml/ExecutePLSQLActionParserTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/config/xml/ExecutePLSQLActionParserTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ExecutePLSQLActionParserTest extends AbstractActionParserTest<ExecutePLSQLAction> {
 
     @Test
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/config/xml/ExecuteSQLActionParserTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/config/xml/ExecuteSQLActionParserTest.java
index 56a0da9672..db6ac55c80 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/config/xml/ExecuteSQLActionParserTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/config/xml/ExecuteSQLActionParserTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ExecuteSQLActionParserTest extends AbstractActionParserTest<ExecuteSQLAction> {
 
     @Test
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/config/xml/ExecuteSQLQueryActionParserTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/config/xml/ExecuteSQLQueryActionParserTest.java
index 31ce770f47..6c4b71c704 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/config/xml/ExecuteSQLQueryActionParserTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/config/xml/ExecuteSQLQueryActionParserTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ExecuteSQLQueryActionParserTest extends AbstractActionParserTest<ExecuteSQLQueryAction> {
 
     @Test
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecutePLSQLIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecutePLSQLIT.java
index ee502c5482..d48e4aa44c 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecutePLSQLIT.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecutePLSQLIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class ExecutePLSQLIT extends TestNGCitrusSpringSupport {
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecutePLSQLJavaIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecutePLSQLJavaIT.java
index 1e0087c3e8..39d341e9a4 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecutePLSQLJavaIT.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecutePLSQLJavaIT.java
@@ -26,9 +26,6 @@
 
 import static org.citrusframework.actions.ExecutePLSQLAction.Builder.plsql;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class ExecutePLSQLJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLIT.java
index 5384d9f573..9ebeb23853 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLIT.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class ExecuteSQLIT extends TestNGCitrusSpringSupport {
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLJavaIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLJavaIT.java
index f87d8868db..826c68fbd8 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLJavaIT.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLJavaIT.java
@@ -27,9 +27,6 @@
 import static org.citrusframework.actions.ExecuteSQLAction.Builder.sql;
 import static org.citrusframework.actions.ExecuteSQLQueryAction.Builder.query;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class ExecuteSQLJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLTransactionIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLTransactionIT.java
index 2399b791dc..a1ebe74088 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLTransactionIT.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/ExecuteSQLTransactionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class ExecuteSQLTransactionIT extends TestNGCitrusSpringSupport {
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/FinallyBlockIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/FinallyBlockIT.java
index a72684e5bb..a9d63546af 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/FinallyBlockIT.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/FinallyBlockIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class FinallyBlockIT extends TestNGCitrusSpringSupport {
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/FinallyBlockJavaIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/FinallyBlockJavaIT.java
index e3f9d7c5d1..26f049bf25 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/FinallyBlockJavaIT.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/FinallyBlockJavaIT.java
@@ -29,9 +29,6 @@
 import static org.citrusframework.actions.ExecuteSQLQueryAction.Builder.query;
 import static org.citrusframework.container.FinallySequence.Builder.doFinally;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class FinallyBlockJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/QueryDatabaseRetriesIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/QueryDatabaseRetriesIT.java
index 56b9dd9b95..2ed4628393 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/QueryDatabaseRetriesIT.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/QueryDatabaseRetriesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class QueryDatabaseRetriesIT extends TestNGCitrusSpringSupport {
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/QueryDatabaseRetriesJavaIT.java b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/QueryDatabaseRetriesJavaIT.java
index bad8a14f84..380c709433 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/QueryDatabaseRetriesJavaIT.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/integration/actions/QueryDatabaseRetriesJavaIT.java
@@ -31,9 +31,6 @@
 import static org.citrusframework.container.RepeatOnErrorUntilTrue.Builder.repeatOnError;
 import static org.citrusframework.container.Sequence.Builder.sequential;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class QueryDatabaseRetriesJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/groovy/AbstractGroovyActionDslTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/groovy/AbstractGroovyActionDslTest.java
index 98ba4532d0..84da90b6fc 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/groovy/AbstractGroovyActionDslTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/groovy/AbstractGroovyActionDslTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractGroovyActionDslTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/groovy/PlsqlTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/groovy/PlsqlTest.java
index cb00702360..2cd1bcf725 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/groovy/PlsqlTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/groovy/PlsqlTest.java
@@ -28,9 +28,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class PlsqlTest extends AbstractGroovyActionDslTest {
 
     @BindToRegistry
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/groovy/SqlTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/groovy/SqlTest.java
index 67d4f783ec..1adc944b81 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/groovy/SqlTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/groovy/SqlTest.java
@@ -31,9 +31,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SqlTest extends AbstractGroovyActionDslTest {
 
     @BindToRegistry
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/xml/AbstractXmlActionTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/xml/AbstractXmlActionTest.java
index b35d4141a6..f66509a034 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/xml/AbstractXmlActionTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/xml/AbstractXmlActionTest.java
@@ -36,9 +36,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractXmlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/xml/PlsqlTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/xml/PlsqlTest.java
index 28f0cc2a1e..8433669d7a 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/xml/PlsqlTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/xml/PlsqlTest.java
@@ -28,9 +28,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class PlsqlTest extends AbstractXmlActionTest {
 
     @BindToRegistry
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/xml/SqlTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/xml/SqlTest.java
index 47dcac9dbe..c86804e58b 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/xml/SqlTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/xml/SqlTest.java
@@ -32,9 +32,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SqlTest extends AbstractXmlActionTest {
 
     @BindToRegistry
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/yaml/AbstractYamlActionTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/yaml/AbstractYamlActionTest.java
index 7b635e5ae9..f44fad4687 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/yaml/AbstractYamlActionTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/yaml/AbstractYamlActionTest.java
@@ -36,9 +36,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractYamlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/yaml/PlsqlTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/yaml/PlsqlTest.java
index d3860df0f6..a9e0b73ab8 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/yaml/PlsqlTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/yaml/PlsqlTest.java
@@ -28,9 +28,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class PlsqlTest extends AbstractYamlActionTest {
 
     @BindToRegistry
diff --git a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/yaml/SqlTest.java b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/yaml/SqlTest.java
index 7da4d1f606..962a380c0a 100644
--- a/connectors/citrus-sql/src/test/java/org/citrusframework/sql/yaml/SqlTest.java
+++ b/connectors/citrus-sql/src/test/java/org/citrusframework/sql/yaml/SqlTest.java
@@ -32,9 +32,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SqlTest extends AbstractYamlActionTest {
 
     @BindToRegistry
diff --git a/core/citrus-api/src/main/java/org/citrusframework/CitrusSettings.java b/core/citrus-api/src/main/java/org/citrusframework/CitrusSettings.java
index 3ed0808ef9..94445abcf3 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/CitrusSettings.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/CitrusSettings.java
@@ -40,9 +40,6 @@
 import static org.citrusframework.common.TestLoader.SPRING;
 import static org.citrusframework.common.TestLoader.YAML;
 
-/**
- * @author Christoph Deppisch
- */
 public final class CitrusSettings {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/CitrusVersion.java b/core/citrus-api/src/main/java/org/citrusframework/CitrusVersion.java
index 08a1bc263b..83468a3eb1 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/CitrusVersion.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/CitrusVersion.java
@@ -23,9 +23,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public final class CitrusVersion {
 
     /** Logger */
diff --git a/core/citrus-api/src/main/java/org/citrusframework/Completable.java b/core/citrus-api/src/main/java/org/citrusframework/Completable.java
index a32899392e..686f12439e 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/Completable.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/Completable.java
@@ -23,7 +23,6 @@
  * working before closing the test case. Asynchronous test action execution may implement this interface in order to publish the completed state of
  * forked processes.
  *
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public interface Completable {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/GherkinTestActionRunner.java b/core/citrus-api/src/main/java/org/citrusframework/GherkinTestActionRunner.java
index 38913c2682..2380a5350c 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/GherkinTestActionRunner.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/GherkinTestActionRunner.java
@@ -18,7 +18,6 @@
 
 /**
  * Runner adds default alias methods using Gherkin behavior driven development style (GIVEN, WHEN, THEN).
- * @author Christoph Deppisch
  */
 public interface GherkinTestActionRunner extends TestActionRunner {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/Scoped.java b/core/citrus-api/src/main/java/org/citrusframework/Scoped.java
index d89b709e65..cfade3e178 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/Scoped.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/Scoped.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework;
 
-/**
- * @author Christoph Deppisch
- */
 public interface Scoped {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestAction.java b/core/citrus-api/src/main/java/org/citrusframework/TestAction.java
index dd9860fc74..9d2ab1cb69 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestAction.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestAction.java
@@ -21,7 +21,6 @@
 /**
  * Interface for all test actions.
  *
- * @author Christoph Deppisch
  * @since 2006
  */
 @FunctionalInterface
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestActionBuilder.java b/core/citrus-api/src/main/java/org/citrusframework/TestActionBuilder.java
index 23f6f3b784..b6b7db67bf 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestActionBuilder.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestActionBuilder.java
@@ -26,7 +26,6 @@
 
 /**
  * Test action builder.
- * @author Christoph Deppisch
  * @since 2.3
  */
 @FunctionalInterface
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestActionContainerBuilder.java b/core/citrus-api/src/main/java/org/citrusframework/TestActionContainerBuilder.java
index a4c8df532a..c14e2fc266 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestActionContainerBuilder.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestActionContainerBuilder.java
@@ -21,7 +21,6 @@
 import org.citrusframework.container.TestActionContainer;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public interface TestActionContainerBuilder<T extends TestActionContainer, S extends TestActionContainerBuilder<T, S>> extends TestActionBuilder<T> {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestActionRunner.java b/core/citrus-api/src/main/java/org/citrusframework/TestActionRunner.java
index 4a02f28594..b8987625d2 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestActionRunner.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestActionRunner.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework;
 
-/**
- * @author Christoph Deppisch
- */
 public interface TestActionRunner {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestActor.java b/core/citrus-api/src/main/java/org/citrusframework/TestActor.java
index 8769426e89..ddea0bc250 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestActor.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestActor.java
@@ -21,7 +21,6 @@
  * very easily. This enables a fast switch in end-to-end testing when a simulated application suddenly is real and we have to disable
  * the simulated communication parts in a test.
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public class TestActor {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestActorAware.java b/core/citrus-api/src/main/java/org/citrusframework/TestActorAware.java
index 666ee8d003..9d24eb3307 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestActorAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestActorAware.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework;
 
-/**
- * @author Christoph Deppisch
- */
 public interface TestActorAware {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestBehavior.java b/core/citrus-api/src/main/java/org/citrusframework/TestBehavior.java
index eca266099e..7af3ea6965 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestBehavior.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestBehavior.java
@@ -18,7 +18,6 @@
 
 /**
  * Behavior applies logic to given test action runner.
- * @author Christoph Deppisch
  */
 @FunctionalInterface
 public interface TestBehavior {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestCase.java b/core/citrus-api/src/main/java/org/citrusframework/TestCase.java
index 1f7ae60da5..d54e6cad12 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestCase.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestCase.java
@@ -27,7 +27,6 @@
 /**
  * Test case executing a list of {@link TestAction} in sequence.
  *
- * @author Christoph Deppisch
  * @since 2006
  */
 @SuppressWarnings({"unused", "JavaDoc"})
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestCaseBuilder.java b/core/citrus-api/src/main/java/org/citrusframework/TestCaseBuilder.java
index a0e6823aca..ec3030ecd6 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestCaseBuilder.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestCaseBuilder.java
@@ -18,9 +18,6 @@
 
 import java.util.Date;
 
-/**
- * @author Christoph Deppisch
- */
 public interface TestCaseBuilder {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestCaseMetaInfo.java b/core/citrus-api/src/main/java/org/citrusframework/TestCaseMetaInfo.java
index d89ac6810b..bfbb110f8d 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestCaseMetaInfo.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestCaseMetaInfo.java
@@ -21,7 +21,6 @@
 /**
  * Test case meta information.
  *
- * @author Christoph Deppisch
  */
 public class TestCaseMetaInfo {
     /** Author of testcase */
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestCaseRunner.java b/core/citrus-api/src/main/java/org/citrusframework/TestCaseRunner.java
index 95b6089dfa..9f565a4c9f 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestCaseRunner.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestCaseRunner.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework;
 
-/**
- * @author Christoph Deppisch
- */
 public interface TestCaseRunner extends TestCaseBuilder, GherkinTestActionRunner {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestClass.java b/core/citrus-api/src/main/java/org/citrusframework/TestClass.java
index 25a6d86175..16213a4a46 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestClass.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestClass.java
@@ -19,7 +19,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class TestClass extends TestSource {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestGroupAware.java b/core/citrus-api/src/main/java/org/citrusframework/TestGroupAware.java
index e1acf6f5ea..a2b921050b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestGroupAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestGroupAware.java
@@ -18,7 +18,6 @@
 
 /**
  * Interface marks test case to support group bindings. These are used to enable/disable tests based on group settings.
- * @author Christoph Deppisch
  */
 public interface TestGroupAware {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestParameterAware.java b/core/citrus-api/src/main/java/org/citrusframework/TestParameterAware.java
index dc6709f798..a9a59fa2ec 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestParameterAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestParameterAware.java
@@ -20,7 +20,6 @@
 
 /**
  * Interface marks test case to support test parameters.
- * @author Christoph Deppisch
  */
 public interface TestParameterAware {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestResult.java b/core/citrus-api/src/main/java/org/citrusframework/TestResult.java
index beeb39aa79..0d69384a99 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestResult.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestResult.java
@@ -33,7 +33,6 @@
 /**
  * Class representing test results (failed, successful, skipped)
  *
- * @author Christoph Deppisch
  */
 public final class TestResult {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/TestSource.java b/core/citrus-api/src/main/java/org/citrusframework/TestSource.java
index fb57fd808c..5a4df17308 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/TestSource.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/TestSource.java
@@ -17,7 +17,6 @@
 package org.citrusframework;
 
 /**
- * @author Christoph Deppisch
  * @since 4.0
  */
 public class TestSource {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusConfiguration.java b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusConfiguration.java
index f3d159f945..39b8781b68 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusConfiguration.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusConfiguration.java
@@ -22,9 +22,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * @author Christoph Deppisch
- */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Target({ ElementType.TYPE })
diff --git a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpoint.java b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpoint.java
index 11d92bc399..2f7f3e7dbd 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpoint.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpoint.java
@@ -20,7 +20,6 @@
 
 /**
  * Marks field or parameter for endpoint injection.
- * @author Christoph Deppisch
  * @since 2.3
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpointAnnotations.java b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpointAnnotations.java
index 0741006e3e..c14fc50dde 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpointAnnotations.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpointAnnotations.java
@@ -31,7 +31,6 @@
 /**
  * Dependency injection support for {@link CitrusEndpoint} endpoint annotations.
  *
- * @author Christoph Deppisch
  */
 public abstract class CitrusEndpointAnnotations {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpointConfig.java b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpointConfig.java
index 63f9b50e6a..d81694473b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpointConfig.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpointConfig.java
@@ -19,7 +19,6 @@
 import java.lang.annotation.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpointProperty.java b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpointProperty.java
index d197dcd5e7..be2b1b7e3c 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpointProperty.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusEndpointProperty.java
@@ -19,7 +19,6 @@
 import java.lang.annotation.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusFramework.java b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusFramework.java
index e4b1631377..79a1ae5ae8 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusFramework.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusFramework.java
@@ -22,7 +22,6 @@
  * Citrus test framework annotation marking a field or method parameter for object injection. Framework instance is injected
  * as value of annotated field or parameter in Java DSL test cases.
  *
- * @author Christoph Deppisch
  * @since 2.2
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusResource.java b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusResource.java
index 4fde0a819c..a12f094c16 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusResource.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusResource.java
@@ -21,7 +21,6 @@
 /**
  *
  *
- * @author Christoph Deppisch
  * @since 2.3
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusTest.java b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusTest.java
index 27defcb3c3..ee02240dbc 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusTest.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusTest.java
@@ -25,7 +25,6 @@
  * Citrus test case annotation used in Java DSL test cases to execute several tests within one single
  * test builder class. Each method annotated with this annotation will result in a separate test execution.
  *
- * @author Christoph Deppisch
  * @since 1.3.1
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusTestSource.java b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusTestSource.java
index 3d5ead4ec7..4479443164 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusTestSource.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/annotations/CitrusTestSource.java
@@ -25,7 +25,6 @@
  * Citrus test case annotation used for Groovy test case definition inside a unit test class.
  * Each method annotated with this annotation will result in a separate test execution.
  *
- * @author Christoph Deppisch
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
diff --git a/core/citrus-api/src/main/java/org/citrusframework/builder/PathExpressionAdapter.java b/core/citrus-api/src/main/java/org/citrusframework/builder/PathExpressionAdapter.java
index d269dae869..a16d783667 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/builder/PathExpressionAdapter.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/builder/PathExpressionAdapter.java
@@ -20,8 +20,5 @@
 import org.citrusframework.validation.ValidationContextAdapter;
 import org.citrusframework.variable.VariableExtractorAdapter;
 
-/**
- * @author Christoph Deppisch
- */
 public interface PathExpressionAdapter extends MessageProcessorAdapter, VariableExtractorAdapter, ValidationContextAdapter {
 }
diff --git a/core/citrus-api/src/main/java/org/citrusframework/builder/WithExpressions.java b/core/citrus-api/src/main/java/org/citrusframework/builder/WithExpressions.java
index 01039daa3d..a6c1b4521e 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/builder/WithExpressions.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/builder/WithExpressions.java
@@ -18,9 +18,6 @@
 
 import java.util.Map;
 
-/**
- * @author Christoph Deppisch
- */
 public interface WithExpressions<B> {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/common/Described.java b/core/citrus-api/src/main/java/org/citrusframework/common/Described.java
index 7f46866fed..9ebdf3e52e 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/common/Described.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/common/Described.java
@@ -18,9 +18,6 @@
 
 import org.citrusframework.TestAction;
 
-/**
- * @author Christoph Deppisch
- */
 public interface Described {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/common/InitializingPhase.java b/core/citrus-api/src/main/java/org/citrusframework/common/InitializingPhase.java
index 3f6657832b..039b533e27 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/common/InitializingPhase.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/common/InitializingPhase.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.common;
 
-/**
- * @author Christoph Deppisch
- */
 @FunctionalInterface
 public interface InitializingPhase {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/common/Named.java b/core/citrus-api/src/main/java/org/citrusframework/common/Named.java
index 42ed8896b2..d07aa55261 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/common/Named.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/common/Named.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.common;
 
-/**
- * @author Christoph Deppisch
- */
 public interface Named {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/common/ShutdownPhase.java b/core/citrus-api/src/main/java/org/citrusframework/common/ShutdownPhase.java
index 70595b4edf..14e1e3ad37 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/common/ShutdownPhase.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/common/ShutdownPhase.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.common;
 
-/**
- * @author Christoph Deppisch
- */
 @FunctionalInterface
 public interface ShutdownPhase {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/common/TestLoader.java b/core/citrus-api/src/main/java/org/citrusframework/common/TestLoader.java
index 98986ee123..96899c096d 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/common/TestLoader.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/common/TestLoader.java
@@ -28,7 +28,6 @@
 
 /**
  * Test loader interface.
- * @author Christoph Deppisch
  * @since 2.1
  */
 public interface TestLoader {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/common/TestSourceAware.java b/core/citrus-api/src/main/java/org/citrusframework/common/TestSourceAware.java
index 77873271f6..084dc16163 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/common/TestSourceAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/common/TestSourceAware.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.common;
 
-/**
- * @author Christoph Deppisch
- */
 @FunctionalInterface
 public interface TestSourceAware {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/condition/Condition.java b/core/citrus-api/src/main/java/org/citrusframework/condition/Condition.java
index 374e5282cf..a1226c65cf 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/condition/Condition.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/condition/Condition.java
@@ -21,7 +21,6 @@
 /**
  * Tests whether a condition is satisfied.
  *
- * @author Martin Maher
  * @since 2.4
  */
 public interface Condition {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/config/annotation/AnnotationConfigParser.java b/core/citrus-api/src/main/java/org/citrusframework/config/annotation/AnnotationConfigParser.java
index 3bad2473bc..f497441f8b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/config/annotation/AnnotationConfigParser.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/config/annotation/AnnotationConfigParser.java
@@ -30,7 +30,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public interface AnnotationConfigParser<A extends Annotation, T extends Endpoint> {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/container/AfterSuite.java b/core/citrus-api/src/main/java/org/citrusframework/container/AfterSuite.java
index 61e3c58f55..e9bb30cd29 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/container/AfterSuite.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/container/AfterSuite.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.container;
 
-/**
- * @author Christoph Deppisch
- */
 public interface AfterSuite extends TestActionContainer {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/container/AfterTest.java b/core/citrus-api/src/main/java/org/citrusframework/container/AfterTest.java
index 7955de5db5..f1acf49671 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/container/AfterTest.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/container/AfterTest.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.container;
 
-/**
- * @author Christoph Deppisch
- */
 public interface AfterTest extends TestActionContainer {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/container/BeforeSuite.java b/core/citrus-api/src/main/java/org/citrusframework/container/BeforeSuite.java
index 4f317d703c..d1f6f803f4 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/container/BeforeSuite.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/container/BeforeSuite.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.container;
 
-/**
- * @author Christoph Deppisch
- */
 public interface BeforeSuite extends TestActionContainer {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/container/BeforeTest.java b/core/citrus-api/src/main/java/org/citrusframework/container/BeforeTest.java
index dc2cc39d8c..ecda198f9a 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/container/BeforeTest.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/container/BeforeTest.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.container;
 
-/**
- * @author Christoph Deppisch
- */
 public interface BeforeTest extends TestActionContainer {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/container/StopTimer.java b/core/citrus-api/src/main/java/org/citrusframework/container/StopTimer.java
index 10f61028bb..51f698afa3 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/container/StopTimer.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/container/StopTimer.java
@@ -18,7 +18,6 @@
 
 /**
  * Interface for stopping a timer.
- * @author Martin Maher
  * @since 2.5
  */
 public interface StopTimer {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/container/TestActionContainer.java b/core/citrus-api/src/main/java/org/citrusframework/container/TestActionContainer.java
index d04ec30482..028ced1060 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/container/TestActionContainer.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/container/TestActionContainer.java
@@ -24,7 +24,6 @@
  * Container interface describing all test action containers that hold several embedded test actions
  * to execute.
  *
- * @author Christoph Deppisch
  */
 public interface TestActionContainer extends TestAction {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/context/resolver/TypeAliasResolver.java b/core/citrus-api/src/main/java/org/citrusframework/context/resolver/TypeAliasResolver.java
index 5e76fb4b9f..24ca0dc75d 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/context/resolver/TypeAliasResolver.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/context/resolver/TypeAliasResolver.java
@@ -30,7 +30,6 @@
  * Type resolver able to adapt an alias type to a given source type. Used in {@link org.citrusframework.spi.ReferenceResolver} to
  * auto resolve types that can act as an alias interchangeably to a given type.
  *
- * @author Christoph Deppisch
  */
 public interface TypeAliasResolver<S, A> {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/endpoint/AbstractEndpointConfiguration.java b/core/citrus-api/src/main/java/org/citrusframework/endpoint/AbstractEndpointConfiguration.java
index 3c6f5d6f0a..866e70256d 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/endpoint/AbstractEndpointConfiguration.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/endpoint/AbstractEndpointConfiguration.java
@@ -18,7 +18,6 @@
 
 /**
  * Abstract endpoint configuration provides basic properties such as message listeners.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public abstract class AbstractEndpointConfiguration implements EndpointConfiguration {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/endpoint/DefaultEndpointFactory.java b/core/citrus-api/src/main/java/org/citrusframework/endpoint/DefaultEndpointFactory.java
index cc2df9f4b1..daedca5ba0 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/endpoint/DefaultEndpointFactory.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/endpoint/DefaultEndpointFactory.java
@@ -39,7 +39,6 @@
  * Default endpoint components are listed in property file reference where key is the component name and value is the fully qualified class name
  * of the implementing endpoint component class.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class DefaultEndpointFactory implements EndpointFactory {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/endpoint/Endpoint.java b/core/citrus-api/src/main/java/org/citrusframework/endpoint/Endpoint.java
index 65c6340626..e664f796dc 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/endpoint/Endpoint.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/endpoint/Endpoint.java
@@ -23,7 +23,6 @@
 
 /**
  * Endpoint interface defines basic send and receive operations on a message endpoint.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public interface Endpoint extends Named {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointAdapter.java b/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointAdapter.java
index fe3808747d..fab7d985ca 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointAdapter.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointAdapter.java
@@ -23,7 +23,6 @@
  * Clients can receive request messages from endpoint and provide proper response messages that will be used as
  * adapter response.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public interface EndpointAdapter {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointBuilder.java b/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointBuilder.java
index 1a823b0c72..18ce48691c 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointBuilder.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointBuilder.java
@@ -37,7 +37,6 @@
  * Endpoint builder interface. All endpoint builder implementations do implement this interface
  * in order to build endpoints using a fluent Java API.
  *
- * @author Christoph Deppisch
  * @since 2.5
  */
 public interface EndpointBuilder<T extends Endpoint> {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointComponent.java b/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointComponent.java
index b93146a1fb..7ea4e2c07a 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointComponent.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointComponent.java
@@ -30,7 +30,6 @@
  * endpoint uri values. Creates endpoint instance by parsing the dynamic endpoint uri with special properties and parameters. Creates proper endpoint
  * configuration instance on the fly.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public interface EndpointComponent {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointConfiguration.java b/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointConfiguration.java
index e50a2e5bc3..529b99cfb5 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointConfiguration.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointConfiguration.java
@@ -17,7 +17,6 @@
 package org.citrusframework.endpoint;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public interface EndpointConfiguration {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointFactory.java b/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointFactory.java
index 564143127e..99f318f9c2 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointFactory.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointFactory.java
@@ -28,7 +28,6 @@
  * If Spring application context is given searches for matching endpoint component bean and delegates to component for
  * endpoint creation.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public interface EndpointFactory {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointUriBuilder.java b/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointUriBuilder.java
index 978afffb4f..eb354d0656 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointUriBuilder.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/endpoint/EndpointUriBuilder.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.endpoint;
 
-/**
- * @author Christoph Deppisch
- */
 @FunctionalInterface
 public interface EndpointUriBuilder {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/endpoint/PollableEndpointConfiguration.java b/core/citrus-api/src/main/java/org/citrusframework/endpoint/PollableEndpointConfiguration.java
index d468769994..6a520991f9 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/endpoint/PollableEndpointConfiguration.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/endpoint/PollableEndpointConfiguration.java
@@ -19,7 +19,6 @@
 /**
  * Extends endpoint configuration by adding polling interval settings.
  *
- * @author Christoph Deppisch
  * @since 2.1
  */
 public interface PollableEndpointConfiguration extends EndpointConfiguration {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/endpoint/adapter/mapping/EndpointAdapterMappingStrategy.java b/core/citrus-api/src/main/java/org/citrusframework/endpoint/adapter/mapping/EndpointAdapterMappingStrategy.java
index c1ac534a29..72d879d631 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/endpoint/adapter/mapping/EndpointAdapterMappingStrategy.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/endpoint/adapter/mapping/EndpointAdapterMappingStrategy.java
@@ -21,7 +21,6 @@
 /**
  * Strategy finds proper endpoint adapter instance for given mapping key.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public interface EndpointAdapterMappingStrategy {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/endpoint/adapter/mapping/MappingKeyExtractor.java b/core/citrus-api/src/main/java/org/citrusframework/endpoint/adapter/mapping/MappingKeyExtractor.java
index 057fe2d2dd..e57c237cf9 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/endpoint/adapter/mapping/MappingKeyExtractor.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/endpoint/adapter/mapping/MappingKeyExtractor.java
@@ -23,7 +23,6 @@
  * is supposed to read mapping name predicate from request (e.g. via XPath, header value, etc.). Dispatching endpoint adapters
  * may then dispatch message processing according to this mapping name.
  *
- * @author Christoph Deppisch
  */
 public interface MappingKeyExtractor {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/endpoint/resolver/EndpointUriResolver.java b/core/citrus-api/src/main/java/org/citrusframework/endpoint/resolver/EndpointUriResolver.java
index b1fe19f53e..62aa9bff73 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/endpoint/resolver/EndpointUriResolver.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/endpoint/resolver/EndpointUriResolver.java
@@ -23,7 +23,6 @@
  * Resolves endpoint uri so we can send messages to dynamic endpoints. Resolver works on request message and
  * chooses the target message endpoint according to message headers or payload.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public interface EndpointUriResolver {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/ActionTimeoutException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/ActionTimeoutException.java
index 5cbdb2303c..678e899e05 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/ActionTimeoutException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/ActionTimeoutException.java
@@ -20,7 +20,6 @@
  * Throw this exception in case you did not receive a message on a destination in time.
  * Used in message receivers to state that expected message did not arrive.
  *
- * @author Christoph Deppisch
  */
 public class ActionTimeoutException extends CitrusRuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/CitrusRuntimeException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/CitrusRuntimeException.java
index 90d3487c58..f69dbe9a74 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/CitrusRuntimeException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/CitrusRuntimeException.java
@@ -25,7 +25,6 @@
 /**
  * Basic custom runtime exception for all errors in Citrus
  *
- * @author Christoph Deppisch
  */
 public class CitrusRuntimeException extends RuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/InvalidFunctionUsageException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/InvalidFunctionUsageException.java
index dd87753097..9b21bb923e 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/InvalidFunctionUsageException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/InvalidFunctionUsageException.java
@@ -19,7 +19,6 @@
 /**
  * Use this exception in case a function is called with invalid parameters.
  * 
- * @author Christoph Deppisch
  */
 public class InvalidFunctionUsageException extends CitrusRuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/MessageTimeoutException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/MessageTimeoutException.java
index c7dca8007f..b897593164 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/MessageTimeoutException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/MessageTimeoutException.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.exceptions;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageTimeoutException extends ActionTimeoutException {
 
     protected final String endpoint;
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/MissingExpectedMessageException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/MissingExpectedMessageException.java
index 00a3ba5d09..35491e6fd8 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/MissingExpectedMessageException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/MissingExpectedMessageException.java
@@ -20,7 +20,6 @@
  * This exception is thrown when a message receiving action
  * does not specify any expected content.
  *
- * @author Christoph Deppisch
  */
 public class MissingExpectedMessageException extends CitrusRuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchFunctionException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchFunctionException.java
index fe789785a8..c80f23906f 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchFunctionException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchFunctionException.java
@@ -19,7 +19,6 @@
 /**
  * Unknown functions cause this exception.
  *
- * @author Christoph Deppisch
  */
 public class NoSuchFunctionException extends CitrusRuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchFunctionLibraryException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchFunctionLibraryException.java
index 06b19b867c..766fc317bf 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchFunctionLibraryException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchFunctionLibraryException.java
@@ -19,7 +19,6 @@
 /**
  * In case no function library exists for a given prefix this exception is thrown.
  *
- * @author Christoph Deppisch
  */
 public class NoSuchFunctionLibraryException extends CitrusRuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchMessageValidatorException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchMessageValidatorException.java
index 17ff6b6820..3e16cbe234 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchMessageValidatorException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchMessageValidatorException.java
@@ -19,7 +19,6 @@
 /**
  * In case no message validator exists for a given prefix this exception is thrown.
  *
- * @author Christoph Deppisch
  */
 public class NoSuchMessageValidatorException extends CitrusRuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchValidationMatcherException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchValidationMatcherException.java
index cbb1cfe07b..0e266027e2 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchValidationMatcherException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchValidationMatcherException.java
@@ -19,7 +19,6 @@
 /**
  * Unknown validation matchers cause this exception.
  *
- * @author Christoph Deppisch
  */
 public class NoSuchValidationMatcherException extends CitrusRuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchValidationMatcherLibraryException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchValidationMatcherLibraryException.java
index 2daa3a7bd6..f5465b203c 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchValidationMatcherLibraryException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchValidationMatcherLibraryException.java
@@ -19,7 +19,6 @@
 /**
  * In case no function library exists for a given prefix this exception is thrown.
  *
- * @author Christoph Deppisch
  */
 public class NoSuchValidationMatcherLibraryException extends CitrusRuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchVariableException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchVariableException.java
index 6f23141644..d7e94921a0 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchVariableException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/NoSuchVariableException.java
@@ -19,7 +19,6 @@
 /**
  * Throw this exception in case an unknown variable is read from test context.
  *
- * @author Christoph Deppisch
  * @since 2009
  *
  */
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/ParallelContainerException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/ParallelContainerException.java
index 61dfb66d4e..72b00b3b2b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/ParallelContainerException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/ParallelContainerException.java
@@ -23,7 +23,6 @@
  * The exception receives a list of exceptions and provides detailed to string method for
  * overview of failed exceptions.
  *
- * @author Christoph Deppisch
  */
 public class ParallelContainerException extends CitrusRuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/ReplyMessageTimeoutException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/ReplyMessageTimeoutException.java
index 78922c3b7d..c7d89b2be8 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/ReplyMessageTimeoutException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/ReplyMessageTimeoutException.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.exceptions;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReplyMessageTimeoutException extends MessageTimeoutException {
 
     private static final long serialVersionUID = 1L;
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/TestCaseFailedException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/TestCaseFailedException.java
index 21082b957d..b34583d7f7 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/TestCaseFailedException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/TestCaseFailedException.java
@@ -22,7 +22,6 @@
  * Base exception marking failure of test case. Used to force failure of TestNG and JUnit
  * test case.
  *
- * @author Christoph Deppisch
  */
 public class TestCaseFailedException extends CitrusRuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/TestEngineFailedException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/TestEngineFailedException.java
index 2124f3d5f3..6f550b5c78 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/TestEngineFailedException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/TestEngineFailedException.java
@@ -19,7 +19,6 @@
 /**
  * Custom RuntimeException thrown if test run failed, because some tests were not successful.
  *
- * @author Christoph Deppisch
  * @since 2007
  *
  */
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/UnknownElementException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/UnknownElementException.java
index 36384662f9..41df62a4ae 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/UnknownElementException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/UnknownElementException.java
@@ -19,7 +19,6 @@
 /**
  * Thrown in case an element is not found. Usually used in during validation.
  *
- * @author Christoph Deppisch
  */
 public class UnknownElementException extends CitrusRuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/ValidationException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/ValidationException.java
index 39d1857b63..becd05fa4d 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/ValidationException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/ValidationException.java
@@ -20,7 +20,6 @@
  * This exception marks errors during validation in Citrus. Basically this exception is thrown
  * during message validation, exception assertion, SOAP fault and attachment validation and so on.
  *
- * @author Christoph Deppisch
  */
 public class ValidationException extends CitrusRuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/exceptions/VariableNullValueException.java b/core/citrus-api/src/main/java/org/citrusframework/exceptions/VariableNullValueException.java
index bf4fb967fe..220d15fb25 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/exceptions/VariableNullValueException.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/exceptions/VariableNullValueException.java
@@ -19,7 +19,6 @@
 /**
  * Variable value evaluates to null.
  *
- * @author Christoph Deppisch
  */
 public class VariableNullValueException extends CitrusRuntimeException {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/functions/Function.java b/core/citrus-api/src/main/java/org/citrusframework/functions/Function.java
index bb2aec6969..bba58d286c 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/functions/Function.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/functions/Function.java
@@ -28,7 +28,6 @@
 /**
  * General function interface.
  *
- * @author Christoph Deppisch
  */
 public interface Function {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionLibrary.java b/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionLibrary.java
index 11c3bcbe7c..4330c43eb1 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionLibrary.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionLibrary.java
@@ -25,7 +25,6 @@
  * Library holding a set of functions. Each library defines a function prefix as namespace, so
  * there will be no naming conflicts when using multiple libraries at a time.
  *
- * @author Christoph Deppisch
  */
 public class FunctionLibrary {
     /** Map of functions in this library */
diff --git a/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionParameterHelper.java b/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionParameterHelper.java
index e3fca3be81..c1b8decdce 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionParameterHelper.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionParameterHelper.java
@@ -23,7 +23,6 @@
 /**
  * Helper class parsing a parameter string and converting the tokens to a parameter list.
  *
- * @author Christoph Deppisch
  */
 public final class FunctionParameterHelper {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionRegistry.java b/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionRegistry.java
index 78a3df6d37..923464c833 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionRegistry.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionRegistry.java
@@ -25,7 +25,6 @@
 /**
  * Function registry holding all available function libraries.
  *
- * @author Christoph Deppisch
  */
 public class FunctionRegistry {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionUtils.java b/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionUtils.java
index 484ffa9145..c733467670 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionUtils.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/functions/FunctionUtils.java
@@ -25,7 +25,6 @@
 /**
  * Utility class for functions.
  *
- * @author Christoph Deppisch
  */
 public final class FunctionUtils {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/log/LogMessageModifier.java b/core/citrus-api/src/main/java/org/citrusframework/log/LogMessageModifier.java
index 10c9b3311d..329436d601 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/log/LogMessageModifier.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/log/LogMessageModifier.java
@@ -28,7 +28,6 @@
 /**
  * Special modifier adds message related modifications on logger output on headers and body.
  *
- * @author Christoph Deppisch
  */
 @FunctionalInterface
 public interface LogMessageModifier extends LogModifier {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/log/LogModifier.java b/core/citrus-api/src/main/java/org/citrusframework/log/LogModifier.java
index e40c026cd4..ac36b75e1b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/log/LogModifier.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/log/LogModifier.java
@@ -20,7 +20,6 @@
  * Modifier masks output that gets printed to an output stream. Usually used
  * to mask sensitive data like passwords and secrets when printed to the logger output.
  *
- * @author Christoph Deppisch
  */
 @FunctionalInterface
 public interface LogModifier {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/main/TestEngine.java b/core/citrus-api/src/main/java/org/citrusframework/main/TestEngine.java
index 23145ea7f4..0a65db111b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/main/TestEngine.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/main/TestEngine.java
@@ -22,7 +22,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public interface TestEngine {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/main/TestRunConfiguration.java b/core/citrus-api/src/main/java/org/citrusframework/main/TestRunConfiguration.java
index 6cc14afb73..905611445a 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/main/TestRunConfiguration.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/main/TestRunConfiguration.java
@@ -25,7 +25,6 @@
 import org.citrusframework.TestSource;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class TestRunConfiguration {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/main/scan/TestScanner.java b/core/citrus-api/src/main/java/org/citrusframework/main/scan/TestScanner.java
index 1e6ffa9262..e70ebd0ff8 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/main/scan/TestScanner.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/main/scan/TestScanner.java
@@ -21,7 +21,6 @@
 import org.citrusframework.TestClass;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public interface TestScanner {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/AbstractMessageProcessor.java b/core/citrus-api/src/main/java/org/citrusframework/message/AbstractMessageProcessor.java
index e2f4180cca..2370937d67 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/AbstractMessageProcessor.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/AbstractMessageProcessor.java
@@ -24,7 +24,6 @@
  * Abstract message processor is message direction aware and automatically applies message type selector.
  * Subclasses can modify payload and/or headers of the processed message.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractMessageProcessor implements MessageProcessor, MessageDirectionAware, MessageTypeSelector {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/DefaultMessageStore.java b/core/citrus-api/src/main/java/org/citrusframework/message/DefaultMessageStore.java
index 1d02d83621..7947ad8ef3 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/DefaultMessageStore.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/DefaultMessageStore.java
@@ -22,7 +22,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class DefaultMessageStore extends ConcurrentHashMap<String, Message> implements MessageStore {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/ErrorHandlingStrategy.java b/core/citrus-api/src/main/java/org/citrusframework/message/ErrorHandlingStrategy.java
index 1581c5b3b6..c87eef7f89 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/ErrorHandlingStrategy.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/ErrorHandlingStrategy.java
@@ -20,7 +20,6 @@
  * Enumeration representing the different error handling strategies in synchronous communication
  * with client server interaction where the client receives an error message as response.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public enum ErrorHandlingStrategy {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/Message.java b/core/citrus-api/src/main/java/org/citrusframework/message/Message.java
index 6c87b27137..33567abe0d 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/Message.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/Message.java
@@ -25,7 +25,6 @@
 import org.citrusframework.log.LogMessageModifier;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public interface Message extends Serializable {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageBuilder.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageBuilder.java
index 35927e3371..c35cb0e0bd 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageBuilder.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageBuilder.java
@@ -21,7 +21,6 @@
 /**
  * Interface for classes being able to build control messages for validation.
  *
- * @author Christoph Deppisch
  */
 @FunctionalInterface
 public interface MessageBuilder {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageConverter.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageConverter.java
index 3c4f7209d6..853eab956b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageConverter.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageConverter.java
@@ -23,7 +23,6 @@
  * Message converter interface describes methods for converting a external message type T to the internal message
  * representation and vice versa.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public interface MessageConverter<I, O, C extends EndpointConfiguration> {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageCorrelator.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageCorrelator.java
index e6cec5b78d..2e634aa3f2 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageCorrelator.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageCorrelator.java
@@ -20,7 +20,6 @@
  * Message correlator interface for synchronous reply messages. Correlator uses
  * a specific header entry in messages in order to construct a unique message correlation key.
  *
- * @author Christoph Deppisch
  */
 public interface MessageCorrelator {
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageDirection.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageDirection.java
index 3500088065..e73a7a6a7b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageDirection.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageDirection.java
@@ -19,7 +19,6 @@
 /**
  * Indicates message direction inbound, outbound or unbounded.
  *
- * @author Christoph Deppisch
  * @since 2.7
  */
 public enum MessageDirection {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageDirectionAware.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageDirectionAware.java
index e136d35dcd..054bd5555c 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageDirectionAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageDirectionAware.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.message;
 
-/**
- * @author Christoph Deppisch
- */
 public interface MessageDirectionAware {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderBuilder.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderBuilder.java
index 9fb1a79a09..0218105595 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderBuilder.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderBuilder.java
@@ -20,9 +20,6 @@
 
 import org.citrusframework.context.TestContext;
 
-/**
- * @author Christoph Deppisch
- */
 @FunctionalInterface
 public interface MessageHeaderBuilder {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderDataBuilder.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderDataBuilder.java
index edf1a3dae7..fa5f68c481 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderDataBuilder.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderDataBuilder.java
@@ -21,9 +21,6 @@
 
 import org.citrusframework.context.TestContext;
 
-/**
- * @author Christoph Deppisch
- */
 @FunctionalInterface
 public interface MessageHeaderDataBuilder extends MessageHeaderBuilder {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderType.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderType.java
index 5b2909108d..db6f87ce80 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderType.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderType.java
@@ -22,7 +22,6 @@
  * Enumeration for supported message header types. Header values are able to define a type. In this case they
  * are typed header values. Message sender/receiver will try to set typed header values according to this.
  *
- * @author Christoph Deppisch
  */
 public enum MessageHeaderType {
     INTEGER("integer", Integer.class),
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderUtils.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderUtils.java
index a5de5f7c73..46e4121d03 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderUtils.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaderUtils.java
@@ -19,7 +19,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public final class MessageHeaderUtils {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaders.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaders.java
index ac1ee9a963..919ec562c0 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaders.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageHeaders.java
@@ -19,7 +19,6 @@
 /**
  * Citrus specific message headers.
  *
- * @author Christoph Deppisch
  */
 public final class MessageHeaders {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessagePayloadBuilder.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessagePayloadBuilder.java
index 2b308764f0..fddc6aa5e2 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessagePayloadBuilder.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessagePayloadBuilder.java
@@ -18,9 +18,6 @@
 
 import org.citrusframework.context.TestContext;
 
-/**
- * @author Christoph Deppisch
- */
 @FunctionalInterface
 public interface MessagePayloadBuilder {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageProcessor.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageProcessor.java
index 283bfe882e..59d9e2430c 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageProcessor.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageProcessor.java
@@ -27,7 +27,6 @@
 
 /**
  * Processor performs operations on the given message. The processor is able to change message content such as payload and headers.
- * @author Christoph Deppisch
  */
 @FunctionalInterface
 public interface MessageProcessor extends MessageTransformer {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageProcessors.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageProcessors.java
index a2127f5c84..3eefdc4d20 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageProcessors.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageProcessors.java
@@ -26,7 +26,6 @@
 /**
  * List of global message construction processors that modify message payload and message headers. User just has to add
  * processor implementation as bean to the Spring application context.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class MessageProcessors {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageQueue.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageQueue.java
index 9e6872624f..3186c13ace 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageQueue.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageQueue.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.message;
 
-/**
- * @author Christoph Deppisch
- */
 public interface MessageQueue {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageSelector.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageSelector.java
index 3d5cff7a06..5a14220140 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageSelector.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageSelector.java
@@ -25,9 +25,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 @FunctionalInterface
 public interface MessageSelector {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageStore.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageStore.java
index f56c007034..fb70248db1 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageStore.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageStore.java
@@ -20,7 +20,6 @@
 import org.citrusframework.endpoint.Endpoint;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public interface MessageStore {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageTransformer.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageTransformer.java
index 6f80b7f2f0..687eed7a59 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageTransformer.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageTransformer.java
@@ -20,7 +20,6 @@
 
 /**
  * Transformer is able to completely change a given message.
- * @author Christoph Deppisch
  */
 @FunctionalInterface
 public interface MessageTransformer {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageType.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageType.java
index 3172db5cc6..b9f7b9c1ef 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageType.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageType.java
@@ -19,7 +19,6 @@
 /**
  * Enumeration for message protocol types used in test cases.
  *
- * @author Christoph Deppisch
  */
 public enum MessageType {
     UNSPECIFIED,
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageTypeAware.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageTypeAware.java
index 74d8702201..b6c5304276 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageTypeAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageTypeAware.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.message;
 
-/**
- * @author Christoph Deppisch
- */
 public interface MessageTypeAware {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/MessageTypeSelector.java b/core/citrus-api/src/main/java/org/citrusframework/message/MessageTypeSelector.java
index c4c3174652..4e53b38949 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/MessageTypeSelector.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/MessageTypeSelector.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.message;
 
-/**
- * @author Christoph Deppisch
- */
 public interface MessageTypeSelector {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/ScriptPayloadBuilder.java b/core/citrus-api/src/main/java/org/citrusframework/message/ScriptPayloadBuilder.java
index d04274c07d..a5601fa874 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/ScriptPayloadBuilder.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/ScriptPayloadBuilder.java
@@ -24,9 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public interface ScriptPayloadBuilder extends MessagePayloadBuilder {
 
     /** Logger */
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/WithHeaderBuilder.java b/core/citrus-api/src/main/java/org/citrusframework/message/WithHeaderBuilder.java
index 4e00609675..57ecad9d1b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/WithHeaderBuilder.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/WithHeaderBuilder.java
@@ -18,9 +18,6 @@
 
 import java.util.List;
 
-/**
- * @author Christoph Deppisch
- */
 public interface WithHeaderBuilder {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/WithPayloadBuilder.java b/core/citrus-api/src/main/java/org/citrusframework/message/WithPayloadBuilder.java
index d8160cd620..db1170e1df 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/WithPayloadBuilder.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/WithPayloadBuilder.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.message;
 
-/**
- * @author Christoph Deppisch
- */
 public interface WithPayloadBuilder {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/correlation/CorrelationManager.java b/core/citrus-api/src/main/java/org/citrusframework/message/correlation/CorrelationManager.java
index 9e35de43e3..d757a797aa 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/correlation/CorrelationManager.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/correlation/CorrelationManager.java
@@ -23,7 +23,6 @@
  * some time later with same correlation key. This mechanism is used in synchronous communication where
  * request and response messages are stored for correlating consumer and producer components.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public interface CorrelationManager<T> {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/message/correlation/ObjectStore.java b/core/citrus-api/src/main/java/org/citrusframework/message/correlation/ObjectStore.java
index cf19e44c71..77f873d310 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/message/correlation/ObjectStore.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/message/correlation/ObjectStore.java
@@ -19,7 +19,6 @@
 /**
  * Interface defines add and remove object methods for storing data.
  *
- * @author Christoph Deppisch
  * @since 2.1
  */
 public interface ObjectStore<T> {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/messaging/AbstractMessageConsumer.java b/core/citrus-api/src/main/java/org/citrusframework/messaging/AbstractMessageConsumer.java
index 9adb637f03..7cc460c2cb 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/messaging/AbstractMessageConsumer.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/messaging/AbstractMessageConsumer.java
@@ -21,7 +21,6 @@
 import org.citrusframework.message.Message;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public abstract class AbstractMessageConsumer implements Consumer {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/messaging/AbstractSelectiveMessageConsumer.java b/core/citrus-api/src/main/java/org/citrusframework/messaging/AbstractSelectiveMessageConsumer.java
index 3cdc7e29f0..2c556672c6 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/messaging/AbstractSelectiveMessageConsumer.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/messaging/AbstractSelectiveMessageConsumer.java
@@ -21,7 +21,6 @@
 import org.citrusframework.message.Message;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public abstract class AbstractSelectiveMessageConsumer extends AbstractMessageConsumer implements SelectiveConsumer {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/messaging/Consumer.java b/core/citrus-api/src/main/java/org/citrusframework/messaging/Consumer.java
index 73ba8abc27..949548a5aa 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/messaging/Consumer.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/messaging/Consumer.java
@@ -20,7 +20,6 @@
 import org.citrusframework.message.Message;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public interface Consumer {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/messaging/Producer.java b/core/citrus-api/src/main/java/org/citrusframework/messaging/Producer.java
index ef6cde59a1..3f4cbd8836 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/messaging/Producer.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/messaging/Producer.java
@@ -20,7 +20,6 @@
 import org.citrusframework.message.Message;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public interface Producer {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/messaging/ReplyConsumer.java b/core/citrus-api/src/main/java/org/citrusframework/messaging/ReplyConsumer.java
index 6689ad020e..d49fe03f2a 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/messaging/ReplyConsumer.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/messaging/ReplyConsumer.java
@@ -19,7 +19,6 @@
 /**
  * Consumer that explicitly receives reply messages synchronously.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public interface ReplyConsumer extends SelectiveConsumer {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/messaging/ReplyProducer.java b/core/citrus-api/src/main/java/org/citrusframework/messaging/ReplyProducer.java
index cd1ce80406..68dbe0f40e 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/messaging/ReplyProducer.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/messaging/ReplyProducer.java
@@ -17,7 +17,6 @@
 package org.citrusframework.messaging;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public interface ReplyProducer extends Producer {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/messaging/SelectiveConsumer.java b/core/citrus-api/src/main/java/org/citrusframework/messaging/SelectiveConsumer.java
index c8ddbf9a6e..455490432a 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/messaging/SelectiveConsumer.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/messaging/SelectiveConsumer.java
@@ -23,7 +23,6 @@
  * Consumer implementation able to select messages available on a message destination. Selection is done via one to many
  * selection key-value pairs usually on the message header.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public interface SelectiveConsumer extends Consumer {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/FailureStackElement.java b/core/citrus-api/src/main/java/org/citrusframework/report/FailureStackElement.java
index 8c117bbbca..e915a4816f 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/FailureStackElement.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/FailureStackElement.java
@@ -20,7 +20,6 @@
  * Failure stack element provides access to the detailed failure stack message and
  * the location in the test case XML where error happened.
  *
- * @author Christoph Deppisch
  */
 public class FailureStackElement {
     /** The name of the failed action */
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/MessageListener.java b/core/citrus-api/src/main/java/org/citrusframework/report/MessageListener.java
index da7afd570e..f43d2b434a 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/MessageListener.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/MessageListener.java
@@ -19,9 +19,6 @@
 import org.citrusframework.context.TestContext;
 import org.citrusframework.message.Message;
 
-/**
- * @author Christoph Deppisch
- */
 public interface MessageListener {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/MessageListenerAware.java b/core/citrus-api/src/main/java/org/citrusframework/report/MessageListenerAware.java
index a5d42b8cbf..7c06578998 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/MessageListenerAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/MessageListenerAware.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.report;
 
-/**
- * @author Christoph Deppisch
- */
 public interface MessageListenerAware {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/MessageListeners.java b/core/citrus-api/src/main/java/org/citrusframework/report/MessageListeners.java
index 1a1147f0ed..0c3461fb42 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/MessageListeners.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/MessageListeners.java
@@ -23,9 +23,6 @@
 import org.citrusframework.context.TestContext;
 import org.citrusframework.message.Message;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageListeners implements MessageListenerAware {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListener.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListener.java
index 66edc4be5a..ebff422dd5 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListener.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListener.java
@@ -22,7 +22,6 @@
 /**
  * Listener invoked on test action execution with success and failure.
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public interface TestActionListener {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListenerAware.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListenerAware.java
index b39fd8dafe..c8c616cbbd 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListenerAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListenerAware.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.report;
 
-/**
- * @author Christoph Deppisch
- */
 public interface TestActionListenerAware {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListeners.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListeners.java
index 91b59da583..655e71db3c 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListeners.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListeners.java
@@ -27,7 +27,6 @@
  * Class broadcasting test action events to all available test action listeners
  * injected by Spring's IoC container.
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public class TestActionListeners implements TestActionListenerAware {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListenersAware.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListenersAware.java
index eaffd90ab3..ce6fa4c2fb 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListenersAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestActionListenersAware.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.report;
 
-/**
- * @author Christoph Deppisch
- */
 public interface TestActionListenersAware {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestListener.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestListener.java
index 7574bb9278..7a688128db 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestListener.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestListener.java
@@ -21,7 +21,6 @@
 /**
  * Test listener interface. Listeners invoked on test start, finish, failure, skip, success.
  *
- * @author Christoph Deppisch
  */
 public interface TestListener {
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestListenerAware.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestListenerAware.java
index 57a9b6c416..0a019dda27 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestListenerAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestListenerAware.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.report;
 
-/**
- * @author Christoph Deppisch
- */
 public interface TestListenerAware {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestListeners.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestListeners.java
index 5ec249f5aa..2f9bcbf51e 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestListeners.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestListeners.java
@@ -25,7 +25,6 @@
  * Class that spreads test events to all available test listeners
  * injected by Spring's IoC container.
  *
- * @author Christoph Deppisch
  */
 public class TestListeners implements TestListenerAware {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestReporter.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestReporter.java
index 894cd90a94..9feca760a8 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestReporter.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestReporter.java
@@ -20,7 +20,6 @@
 /**
  * Interface for test reporters.
  *
- * @author Christoph Deppisch
  */
 public interface TestReporter {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestReporterAware.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestReporterAware.java
index 9d1280cb59..aba1527f4b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestReporterAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestReporterAware.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.report;
 
-/**
- * @author Christoph Deppisch
- */
 public interface TestReporterAware {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestReporterSettings.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestReporterSettings.java
index 6b64ef2901..62de765d1b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestReporterSettings.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestReporterSettings.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.report;
 
-/**
- * @author Christoph Deppisch
- */
 public final class TestReporterSettings {
 
     private TestReporterSettings() {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestReporters.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestReporters.java
index 551e5f66fe..d1c5c45d91 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestReporters.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestReporters.java
@@ -24,9 +24,6 @@
 import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.nonNull;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestReporters implements TestListener, TestSuiteListener, TestReporterAware {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestResults.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestResults.java
index f5142ed7b0..63ccd33e68 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestResults.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestResults.java
@@ -33,7 +33,6 @@
 /**
  * Multiple {@link org.citrusframework.TestResult} instances combined to a {@link TestResults}.
  *
- * @author Christoph Deppisch
  */
 public class TestResults {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestSuiteListener.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestSuiteListener.java
index 4a3d1b353a..c2132d4b1b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestSuiteListener.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestSuiteListener.java
@@ -18,7 +18,6 @@
 
 /**
  * Listener for events regarding a test suite (start, finish, failure, success)
- * @author Christoph Deppisch
  */
 public interface TestSuiteListener {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestSuiteListenerAware.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestSuiteListenerAware.java
index 3d036681aa..b0d805df35 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestSuiteListenerAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestSuiteListenerAware.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.report;
 
-/**
- * @author Christoph Deppisch
- */
 public interface TestSuiteListenerAware {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/report/TestSuiteListeners.java b/core/citrus-api/src/main/java/org/citrusframework/report/TestSuiteListeners.java
index 25e9126bb0..8901d3510f 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/report/TestSuiteListeners.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/report/TestSuiteListeners.java
@@ -24,7 +24,6 @@
  * Class managing a list of injected test suite listeners. Each event is spread to all
  * managed listeners.
  *
- * @author Christoph Deppisch
  */
 public class TestSuiteListeners implements TestSuiteListenerAware {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/script/ScriptTypes.java b/core/citrus-api/src/main/java/org/citrusframework/script/ScriptTypes.java
index bec831f009..54b652fc6e 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/script/ScriptTypes.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/script/ScriptTypes.java
@@ -21,7 +21,6 @@
  * use enumeration here because people out there need to have the opportunity to add new script types
  * in test cases without having to change the enumeration.
  *
- * @author Christoph Deppisch
  */
 public abstract class ScriptTypes {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/server/Server.java b/core/citrus-api/src/main/java/org/citrusframework/server/Server.java
index 945de45aac..d0a7180f00 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/server/Server.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/server/Server.java
@@ -23,7 +23,6 @@
  * Server representation in Citrus is a runnable instance accepting client
  * connections.
  *
- * @author Christoph Deppisch
  * @since 2007
  *
  */
diff --git a/core/citrus-api/src/main/java/org/citrusframework/spi/BindToRegistry.java b/core/citrus-api/src/main/java/org/citrusframework/spi/BindToRegistry.java
index d1f133f491..7e274637b2 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/spi/BindToRegistry.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/spi/BindToRegistry.java
@@ -28,7 +28,6 @@
  * Object is bound with given name. In case no explicit name is given the registry will auto compute the name from given
  * Class name, method name or field name.
  *
- * @author Christoph Deppisch
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/core/citrus-api/src/main/java/org/citrusframework/spi/ReferenceRegistry.java b/core/citrus-api/src/main/java/org/citrusframework/spi/ReferenceRegistry.java
index b984c2b2de..77bec42b87 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/spi/ReferenceRegistry.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/spi/ReferenceRegistry.java
@@ -20,7 +20,6 @@
  * Bind objects to registry for later reference. Objects declared in registry can be injected in various ways (e.g. annotations).
  * Usually used in combination with {@link org.citrusframework.spi.ReferenceResolver}.
  *
- * @author Christoph Deppisch
  */
 @FunctionalInterface
 public interface ReferenceRegistry {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/spi/ReferenceResolver.java b/core/citrus-api/src/main/java/org/citrusframework/spi/ReferenceResolver.java
index a8d31520ab..49e8236972 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/spi/ReferenceResolver.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/spi/ReferenceResolver.java
@@ -21,7 +21,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public interface ReferenceResolver extends ReferenceRegistry {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/spi/ReferenceResolverAware.java b/core/citrus-api/src/main/java/org/citrusframework/spi/ReferenceResolverAware.java
index 1d4fafcf24..0e741bbde5 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/spi/ReferenceResolverAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/spi/ReferenceResolverAware.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.spi;
 
-/**
- * @author Christoph Deppisch
- */
 @FunctionalInterface
 public interface ReferenceResolverAware {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/spi/SimpleReferenceResolver.java b/core/citrus-api/src/main/java/org/citrusframework/spi/SimpleReferenceResolver.java
index bfc21102af..498acc0401 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/spi/SimpleReferenceResolver.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/spi/SimpleReferenceResolver.java
@@ -24,7 +24,6 @@
 
 /**
  * Simple object registry holding in memory key value store to bind and obtain object references by name.
- * @author Christoph Deppisch
  */
 public class SimpleReferenceResolver implements ReferenceResolver, ReferenceRegistry {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/spi/TypeResolver.java b/core/citrus-api/src/main/java/org/citrusframework/spi/TypeResolver.java
index 17580f4cab..7338476b5d 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/spi/TypeResolver.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/spi/TypeResolver.java
@@ -20,7 +20,6 @@
 
 /**
  * Resolves types by searching for classpath resource mapping files in order to resolve class references at runtime.
- * @author Christoph Deppisch
  */
 public interface TypeResolver {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/util/DefaultTypeConverter.java b/core/citrus-api/src/main/java/org/citrusframework/util/DefaultTypeConverter.java
index d9dab40547..6d3cc1138c 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/util/DefaultTypeConverter.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/util/DefaultTypeConverter.java
@@ -38,9 +38,6 @@
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Node;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultTypeConverter implements TypeConverter {
 
     /** Logger */
diff --git a/core/citrus-api/src/main/java/org/citrusframework/util/TypeConversionUtils.java b/core/citrus-api/src/main/java/org/citrusframework/util/TypeConversionUtils.java
index 5336487801..a876c10828 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/util/TypeConversionUtils.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/util/TypeConversionUtils.java
@@ -20,7 +20,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public abstract class TypeConversionUtils {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/util/TypeConverter.java b/core/citrus-api/src/main/java/org/citrusframework/util/TypeConverter.java
index 8523aa61c6..3e25a57157 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/util/TypeConverter.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/util/TypeConverter.java
@@ -24,9 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public interface TypeConverter {
 
     /** Logger */
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/AbstractMessageValidator.java b/core/citrus-api/src/main/java/org/citrusframework/validation/AbstractMessageValidator.java
index 1c4c7f0776..c3d9876982 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/AbstractMessageValidator.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/AbstractMessageValidator.java
@@ -27,7 +27,6 @@
  * Base abstract implementation for message validators. Calls method to finds a proper validation context
  * in the list of available validation contexts and performs validation.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractMessageValidator<T extends ValidationContext> implements MessageValidator<T> {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/DefaultEmptyMessageValidator.java b/core/citrus-api/src/main/java/org/citrusframework/validation/DefaultEmptyMessageValidator.java
index 137674440e..68eefb1506 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/DefaultEmptyMessageValidator.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/DefaultEmptyMessageValidator.java
@@ -29,7 +29,6 @@
  * Basic message validator is able to verify empty message payloads. Both received and control message must have
  * empty message payloads otherwise ths validator will raise some exception.
  *
- * @author Christoph Deppisch
  */
 public class DefaultEmptyMessageValidator extends DefaultMessageValidator {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/DefaultMessageValidator.java b/core/citrus-api/src/main/java/org/citrusframework/validation/DefaultMessageValidator.java
index e2f7fbf5cc..522e4d0377 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/DefaultMessageValidator.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/DefaultMessageValidator.java
@@ -23,7 +23,6 @@
  * Basic control message validator for all message types. Subclasses only have to add
  * specific logic for message payload validation. This validator is based on a control message.
  *
- * @author Christoph Deppisch
  */
 public class DefaultMessageValidator extends AbstractMessageValidator<ValidationContext> {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/DefaultTextEqualsMessageValidator.java b/core/citrus-api/src/main/java/org/citrusframework/validation/DefaultTextEqualsMessageValidator.java
index 61d4b21125..f733c20f7b 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/DefaultTextEqualsMessageValidator.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/DefaultTextEqualsMessageValidator.java
@@ -30,7 +30,6 @@
  * By default, the validator ignores leading and trailing whitespaces and normalizes the line endings before the validation.
  * Usually this validator implementation is used as a fallback option when no other matching validator implementation could be found.
  *
- * @author Christoph Deppisch
  */
 public class DefaultTextEqualsMessageValidator extends DefaultMessageValidator {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/GenericValidationProcessor.java b/core/citrus-api/src/main/java/org/citrusframework/validation/GenericValidationProcessor.java
index 230e8cff76..4b67848ea0 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/GenericValidationProcessor.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/GenericValidationProcessor.java
@@ -20,9 +20,6 @@
 
 import org.citrusframework.context.TestContext;
 
-/**
- * @author Christoph Deppisch
- */
 @FunctionalInterface
 public interface GenericValidationProcessor<T> {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/HeaderValidator.java b/core/citrus-api/src/main/java/org/citrusframework/validation/HeaderValidator.java
index ecf2f02c34..1adf884c9c 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/HeaderValidator.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/HeaderValidator.java
@@ -29,7 +29,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public interface HeaderValidator {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/MessageValidator.java b/core/citrus-api/src/main/java/org/citrusframework/validation/MessageValidator.java
index 36bdb68c9a..ca436bda24 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/MessageValidator.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/MessageValidator.java
@@ -36,7 +36,6 @@
  * control messages or validation scripts. These validation specific information is
  * stored in a validation context, which is passed to the validation method.
  *
- * @author Christoph Deppisch
  */
 public interface MessageValidator<T extends ValidationContext> {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/MessageValidatorRegistry.java b/core/citrus-api/src/main/java/org/citrusframework/validation/MessageValidatorRegistry.java
index e12b16c48c..7ba3d3abd4 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/MessageValidatorRegistry.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/MessageValidatorRegistry.java
@@ -39,7 +39,6 @@
  *
  * Registry tries to find a matching validator for the message.
  *
- * @author Christoph Deppisch
  */
 public class MessageValidatorRegistry {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/ValidationProcessor.java b/core/citrus-api/src/main/java/org/citrusframework/validation/ValidationProcessor.java
index e5317b1d88..2b6b291ab7 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/ValidationProcessor.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/ValidationProcessor.java
@@ -24,7 +24,6 @@
  * Callback called by receive message action for validation purpose. Implementations
  * to validate the received message with Java code.
  *
- * @author Christoph Deppisch
  */
 @FunctionalInterface
 public interface ValidationProcessor extends MessageProcessor {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/ValueMatcher.java b/core/citrus-api/src/main/java/org/citrusframework/validation/ValueMatcher.java
index 1a02cc1231..c95c793394 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/ValueMatcher.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/ValueMatcher.java
@@ -27,9 +27,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public interface ValueMatcher {
 
     /** Logger */
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/context/DefaultValidationContext.java b/core/citrus-api/src/main/java/org/citrusframework/validation/context/DefaultValidationContext.java
index 6b516ed57e..dfdff08a16 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/context/DefaultValidationContext.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/context/DefaultValidationContext.java
@@ -17,7 +17,6 @@
 package org.citrusframework.validation.context;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class DefaultValidationContext implements ValidationContext {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/context/HeaderValidationContext.java b/core/citrus-api/src/main/java/org/citrusframework/validation/context/HeaderValidationContext.java
index e445e677fc..3c23953ab4 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/context/HeaderValidationContext.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/context/HeaderValidationContext.java
@@ -22,7 +22,6 @@
 import org.citrusframework.validation.HeaderValidator;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class HeaderValidationContext implements ValidationContext {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/context/ValidationContext.java b/core/citrus-api/src/main/java/org/citrusframework/validation/context/ValidationContext.java
index f1f47f7a10..1772a8c4b6 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/context/ValidationContext.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/context/ValidationContext.java
@@ -20,7 +20,6 @@
 /**
  * Basic validation context holding validation specific information.
  *
- * @author Christoph Deppisch
  */
 public interface ValidationContext {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ControlExpressionParser.java b/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ControlExpressionParser.java
index 61c0cc9748..a44a25f8da 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ControlExpressionParser.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ControlExpressionParser.java
@@ -21,7 +21,6 @@
 /**
  * Control expression parser for extracting the individual control values from a control expression.
  *
- * @author Martin Maher
  * @since 2.5
  */
 public interface ControlExpressionParser {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/DefaultControlExpressionParser.java b/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/DefaultControlExpressionParser.java
index b7d2310de6..a967eea9ae 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/DefaultControlExpressionParser.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/DefaultControlExpressionParser.java
@@ -23,7 +23,6 @@
 
 /**
  * Default implementation of control expression parser.
- * @author Martin Maher
  * @since 2.5
  */
 public class DefaultControlExpressionParser implements ControlExpressionParser {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcher.java b/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcher.java
index 274a659ee2..19dcaecd85 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcher.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcher.java
@@ -29,7 +29,6 @@
 /**
  * General validation matcher interface.
  *
- * @author Christian Wied
  */
 @FunctionalInterface
 public interface ValidationMatcher {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherLibrary.java b/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherLibrary.java
index f4e66d7c98..ddb89a8805 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherLibrary.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherLibrary.java
@@ -25,7 +25,6 @@
  * Library holding a set of validation matchers. Each library defines a validation prefix as namespace, so
  * there will be no naming conflicts when using multiple libraries at a time.
  *
- * @author Christian Wied
  */
 public class ValidationMatcherLibrary {
     /** Map of validationMatchers in this library */
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherRegistry.java b/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherRegistry.java
index 3fa719d3b3..0801fd57ad 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherRegistry.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherRegistry.java
@@ -25,7 +25,6 @@
 /**
  * ValidationMatcher registry holding all available validation matcher libraries.
  *
- * @author Christian Wied
  */
 public class ValidationMatcherRegistry {
     /** list of libraries providing custom validation matchers */
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherUtils.java b/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherUtils.java
index 7042c6b2e2..cd07d2dc59 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherUtils.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherUtils.java
@@ -29,7 +29,6 @@
 /**
  * Utility class for validation matchers.
  *
- * @author Christian Wied
  */
 public final class ValidationMatcherUtils {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/validation/xml/XmlNamespaceAware.java b/core/citrus-api/src/main/java/org/citrusframework/validation/xml/XmlNamespaceAware.java
index 5ff1a798b4..4253bcd9b6 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/validation/xml/XmlNamespaceAware.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/validation/xml/XmlNamespaceAware.java
@@ -18,9 +18,6 @@
 
 import java.util.Map;
 
-/**
- * @author Christoph Deppisch
- */
 public interface XmlNamespaceAware {
 
     /**
diff --git a/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractor.java b/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractor.java
index 0783e558aa..d1fe6c8b8c 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractor.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractor.java
@@ -21,7 +21,6 @@
 /**
  * Class extracting values of segments of VariableExpressions.
  *
- * @author Thorsten Schlathoelter
  */
 public interface SegmentVariableExtractor {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractorRegistry.java b/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractorRegistry.java
index 095bee5e4c..b21f149618 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractorRegistry.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/variable/SegmentVariableExtractorRegistry.java
@@ -38,7 +38,6 @@
  * <p>
  * Registry provides all known {@link SegmentVariableExtractor}s.
  *
- * @author Thorsten Schlathoelter
  */
 public class SegmentVariableExtractorRegistry {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/variable/VariableExpressionIterator.java b/core/citrus-api/src/main/java/org/citrusframework/variable/VariableExpressionIterator.java
index a955c1a6c3..fe6b08b8b6 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/variable/VariableExpressionIterator.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/variable/VariableExpressionIterator.java
@@ -40,7 +40,6 @@
  *   <li>the first element of the <b>firstnames</b> property of the property retrieved in the previous step</li>
  * </ol>
  *
- * @author Thorsten Schlathoelter
  */
 public class VariableExpressionIterator implements Iterator<VariableSegment> {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/variable/VariableExtractor.java b/core/citrus-api/src/main/java/org/citrusframework/variable/VariableExtractor.java
index 874e823c14..67c3c50a68 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/variable/VariableExtractor.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/variable/VariableExtractor.java
@@ -32,7 +32,6 @@
  * Class extracting variables form messages. Implementing classes may read
  * message contents and save those to test variables.
  *
- * @author Christoph Deppisch
  */
 public interface VariableExtractor extends MessageProcessor {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/variable/VariableUtils.java b/core/citrus-api/src/main/java/org/citrusframework/variable/VariableUtils.java
index becc2143a1..55a2cb329c 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/variable/VariableUtils.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/variable/VariableUtils.java
@@ -28,7 +28,6 @@
 /**
  * Utility class manipulating test variables.
  *
- * @author Christoph Deppisch
  */
 public final class VariableUtils {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/variable/dictionary/DataDictionary.java b/core/citrus-api/src/main/java/org/citrusframework/variable/dictionary/DataDictionary.java
index 06e5c58ec6..29093b6e1a 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/variable/dictionary/DataDictionary.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/variable/dictionary/DataDictionary.java
@@ -28,7 +28,6 @@
  * in Spring application context so user just has to add dictionary implementation to application context.
  *
  * Dictionary takes part in message construction for inbound and outbound messages in Citrus.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public interface DataDictionary<T> extends MessageProcessor, MessageDirectionAware, Scoped, InitializingPhase {
diff --git a/core/citrus-api/src/main/java/org/citrusframework/xml/Marshaller.java b/core/citrus-api/src/main/java/org/citrusframework/xml/Marshaller.java
index 8f0f56e018..1cda91a274 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/xml/Marshaller.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/xml/Marshaller.java
@@ -18,9 +18,6 @@
 
 import javax.xml.transform.Result;
 
-/**
- * @author Christoph Deppisch
- */
 public interface Marshaller {
 
     void marshal(Object graph, Result result) throws Exception;
diff --git a/core/citrus-api/src/main/java/org/citrusframework/xml/StringSource.java b/core/citrus-api/src/main/java/org/citrusframework/xml/StringSource.java
index 10e389c57f..e080d10c29 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/xml/StringSource.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/xml/StringSource.java
@@ -29,7 +29,6 @@
  * A simple JAXB stream source representation of a static String content. Can be read many times and uses default encoding
  * set via Citrus settings.
  *
- * @author Christoph Deppisch
  */
 public class StringSource extends StreamSource {
 
diff --git a/core/citrus-api/src/main/java/org/citrusframework/xml/Unmarshaller.java b/core/citrus-api/src/main/java/org/citrusframework/xml/Unmarshaller.java
index ed4e22f4a4..cbbad3064f 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/xml/Unmarshaller.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/xml/Unmarshaller.java
@@ -18,9 +18,6 @@
 
 import javax.xml.transform.Source;
 
-/**
- * @author Christoph Deppisch
- */
 public interface Unmarshaller {
 
     Object unmarshal(Source source) throws Exception;
diff --git a/core/citrus-api/src/main/java/org/citrusframework/xml/namespace/NamespaceContextBuilder.java b/core/citrus-api/src/main/java/org/citrusframework/xml/namespace/NamespaceContextBuilder.java
index 9ffeb4485f..a4a7dae971 100644
--- a/core/citrus-api/src/main/java/org/citrusframework/xml/namespace/NamespaceContextBuilder.java
+++ b/core/citrus-api/src/main/java/org/citrusframework/xml/namespace/NamespaceContextBuilder.java
@@ -31,7 +31,6 @@
  * Namespace mappings are defined as key value pairs where key is definded as namespace prefix and value is the
  * actual namespace uri.
  *
- * @author Christoph Deppisch
  */
 public class NamespaceContextBuilder {
 
diff --git a/core/citrus-api/src/test/java/org/citrusframework/config/annotation/AnnotationConfigParserTest.java b/core/citrus-api/src/test/java/org/citrusframework/config/annotation/AnnotationConfigParserTest.java
index 4cabd91887..58cae790ae 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/config/annotation/AnnotationConfigParserTest.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/config/annotation/AnnotationConfigParserTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AnnotationConfigParserTest {
 
     @Test
diff --git a/core/citrus-api/src/test/java/org/citrusframework/endpoint/EndpointComponentTest.java b/core/citrus-api/src/test/java/org/citrusframework/endpoint/EndpointComponentTest.java
index 9b6dacb401..7c421f6306 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/endpoint/EndpointComponentTest.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/endpoint/EndpointComponentTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class EndpointComponentTest {
 
     @Test
diff --git a/core/citrus-api/src/test/java/org/citrusframework/log/LogMessageModifierTest.java b/core/citrus-api/src/test/java/org/citrusframework/log/LogMessageModifierTest.java
index 98572e76c9..92b592e94e 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/log/LogMessageModifierTest.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/log/LogMessageModifierTest.java
@@ -28,9 +28,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class LogMessageModifierTest {
 
     @Mock
diff --git a/core/citrus-api/src/test/java/org/citrusframework/spi/ResourcePathTypeResolverTest.java b/core/citrus-api/src/test/java/org/citrusframework/spi/ResourcePathTypeResolverTest.java
index 7182f3ddd3..edb47e730d 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/spi/ResourcePathTypeResolverTest.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/spi/ResourcePathTypeResolverTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ResourcePathTypeResolverTest {
 
     @Test
diff --git a/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/Bar.java b/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/Bar.java
index b036d061f5..73705d58c1 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/Bar.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/Bar.java
@@ -16,8 +16,5 @@
 
 package org.citrusframework.spi.mocks;
 
-/**
- * @author Christoph Deppisch
- */
 public class Bar {
 }
diff --git a/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/Foo.java b/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/Foo.java
index 0c81f9114e..96b0cbb040 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/Foo.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/Foo.java
@@ -16,8 +16,5 @@
 
 package org.citrusframework.spi.mocks;
 
-/**
- * @author Christoph Deppisch
- */
 public class Foo {
 }
diff --git a/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/FooWithParams.java b/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/FooWithParams.java
index cd14f16866..d1abb46082 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/FooWithParams.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/FooWithParams.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.spi.mocks;
 
-/**
- * @author Thorsten Schlathoelter
- */
 public class FooWithParams {
 
     public FooWithParams(int intParam, short shortParam,  double doubleParam, float floatParam,
diff --git a/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/SingletonFoo.java b/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/SingletonFoo.java
index 451ea40325..b20b7c6acc 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/SingletonFoo.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/spi/mocks/SingletonFoo.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.spi.mocks;
 
-/**
- * @author Thorsten Schlathoelter
- */
 public class SingletonFoo {
 
     public static final SingletonFoo INSTANCE = new SingletonFoo();
diff --git a/core/citrus-api/src/test/java/org/citrusframework/util/DefaultTypeConverterTest.java b/core/citrus-api/src/test/java/org/citrusframework/util/DefaultTypeConverterTest.java
index 4ceaf990d9..bae316f102 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/util/DefaultTypeConverterTest.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/util/DefaultTypeConverterTest.java
@@ -30,7 +30,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class DefaultTypeConverterTest {
diff --git a/core/citrus-api/src/test/java/org/citrusframework/util/TypeConverterTest.java b/core/citrus-api/src/test/java/org/citrusframework/util/TypeConverterTest.java
index 3c4260b16d..10826cdc38 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/util/TypeConverterTest.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/util/TypeConverterTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TypeConverterTest {
 
     @Test
diff --git a/core/citrus-api/src/test/java/org/citrusframework/validation/DefaultEmptyMessageValidatorTest.java b/core/citrus-api/src/test/java/org/citrusframework/validation/DefaultEmptyMessageValidatorTest.java
index 27ecd4f0ff..59afc056ac 100644
--- a/core/citrus-api/src/test/java/org/citrusframework/validation/DefaultEmptyMessageValidatorTest.java
+++ b/core/citrus-api/src/test/java/org/citrusframework/validation/DefaultEmptyMessageValidatorTest.java
@@ -27,9 +27,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultEmptyMessageValidatorTest {
 
     @Mock
diff --git a/core/citrus-base/src/main/java/org/citrusframework/AbstractExceptionContainerBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/AbstractExceptionContainerBuilder.java
index 6e89fe8264..c7e37b1614 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/AbstractExceptionContainerBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/AbstractExceptionContainerBuilder.java
@@ -18,9 +18,6 @@
 
 import org.citrusframework.container.AbstractActionContainer;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractExceptionContainerBuilder<T extends AbstractActionContainer, S extends AbstractExceptionContainerBuilder<T, S>> extends AbstractTestContainerBuilder<T, S> {
 
     /**
diff --git a/core/citrus-base/src/main/java/org/citrusframework/AbstractIteratingContainerBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/AbstractIteratingContainerBuilder.java
index 2694bbdc43..1e8e468eba 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/AbstractIteratingContainerBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/AbstractIteratingContainerBuilder.java
@@ -19,9 +19,6 @@
 import org.citrusframework.container.AbstractIteratingActionContainer;
 import org.citrusframework.container.IteratingConditionExpression;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractIteratingContainerBuilder<T extends AbstractIteratingActionContainer, S extends AbstractIteratingContainerBuilder<T, S>> extends AbstractTestContainerBuilder<T, S> {
 
     protected String condition;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/AbstractSuiteContainerBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/AbstractSuiteContainerBuilder.java
index e7fae18921..71e1da812d 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/AbstractSuiteContainerBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/AbstractSuiteContainerBuilder.java
@@ -26,7 +26,6 @@
 
 /**
  * Abstract container builder takes care on calling the container runner when actions are placed in the container.
- * @author Christoph Deppisch
  */
 public abstract class AbstractSuiteContainerBuilder<T extends AbstractSuiteActionContainer, S extends AbstractSuiteContainerBuilder<T, S>> extends AbstractTestContainerBuilder<T, S> {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/AbstractTestActionBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/AbstractTestActionBuilder.java
index decf144700..e3b40cfca6 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/AbstractTestActionBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/AbstractTestActionBuilder.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractTestActionBuilder<T extends TestAction, S extends TestActionBuilder<T>> implements TestActionBuilder<T> {
 
     protected final S self;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/AbstractTestBoundaryContainerBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/AbstractTestBoundaryContainerBuilder.java
index 0ef9cd51a2..47c8a169b2 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/AbstractTestBoundaryContainerBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/AbstractTestBoundaryContainerBuilder.java
@@ -26,7 +26,6 @@
 
 /**
  * Abstract container builder takes care on calling the container runner when actions are placed in the container.
- * @author Christoph Deppisch
  */
 public abstract class AbstractTestBoundaryContainerBuilder<T extends AbstractTestBoundaryActionContainer, S extends AbstractTestBoundaryContainerBuilder<T, S>> extends AbstractTestContainerBuilder<T, S> {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/AbstractTestContainerBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/AbstractTestContainerBuilder.java
index ed479946ff..8ff791e169 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/AbstractTestContainerBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/AbstractTestContainerBuilder.java
@@ -28,7 +28,6 @@
 
 /**
  * Abstract container builder takes care on calling the container runner when actions are placed in the container.
- * @author Christoph Deppisch
  */
 public abstract class AbstractTestContainerBuilder<T extends TestActionContainer, S extends TestActionContainerBuilder<T, S>> extends AbstractTestActionBuilder<T, S> implements TestActionContainerBuilder<T, S>, ReferenceResolverAware {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/Citrus.java b/core/citrus-base/src/main/java/org/citrusframework/Citrus.java
index 532c6663a2..437c68abf2 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/Citrus.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/Citrus.java
@@ -32,7 +32,6 @@
  * Citrus main class initializes a new Citrus runtime environment with a Citrus context. Provides before/after suite action execution
  * and test execution methods.
  *
- * @author Christoph Deppisch
  * @since 2.1
  */
 public final class Citrus implements TestListenerAware, TestSuiteListenerAware, TestReporterAware, MessageListenerAware {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/CitrusContext.java b/core/citrus-base/src/main/java/org/citrusframework/CitrusContext.java
index 8e40644140..a12d93f031 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/CitrusContext.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/CitrusContext.java
@@ -59,7 +59,6 @@
 /**
  * Default Citrus context implementation holds basic components used in Citrus.
  *
- * @author Christoph Deppisch
  */
 public class CitrusContext implements TestListenerAware, TestActionListenerAware,
         TestSuiteListenerAware, TestReporterAware, MessageListenerAware, ReferenceRegistry {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/CitrusContextProvider.java b/core/citrus-base/src/main/java/org/citrusframework/CitrusContextProvider.java
index 7e09745402..33c19afd8d 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/CitrusContextProvider.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/CitrusContextProvider.java
@@ -25,9 +25,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 @FunctionalInterface
 public interface CitrusContextProvider {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/DefaultCitrusContextProvider.java b/core/citrus-base/src/main/java/org/citrusframework/DefaultCitrusContextProvider.java
index beb220bc6b..91aea0cde3 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/DefaultCitrusContextProvider.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/DefaultCitrusContextProvider.java
@@ -20,7 +20,6 @@
  * Default implementation of CitrusContext provider. Works with default CitrusContext and creates new instances based on
  * a given strategy. Either creates a new instance for each provider call or always returns a singleton context instance.
  *
- * @author Christoph Deppisch
  */
 public class DefaultCitrusContextProvider implements CitrusContextProvider {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/DefaultTestActionBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/DefaultTestActionBuilder.java
index 8178b0701b..7c81c31630 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/DefaultTestActionBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/DefaultTestActionBuilder.java
@@ -19,9 +19,6 @@
 import org.citrusframework.actions.AbstractTestAction;
 import org.citrusframework.context.TestContext;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultTestActionBuilder extends AbstractTestActionBuilder<AbstractTestAction, AbstractTestActionBuilder<AbstractTestAction, ?>> {
 
     private final TestAction delegate;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/DefaultTestCase.java b/core/citrus-base/src/main/java/org/citrusframework/DefaultTestCase.java
index 236ad4efde..53467d9e0f 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/DefaultTestCase.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/DefaultTestCase.java
@@ -45,7 +45,6 @@
  * Default test case implementation holding a list of test actions to execute. Test case also holds variable definitions and
  * performs the test lifecycle such as start, finish, before and after test.
  *
- * @author Christoph Deppisch
  */
 public class DefaultTestCase extends AbstractActionContainer implements TestCase, TestGroupAware, TestParameterAware {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/DefaultTestCaseRunner.java b/core/citrus-base/src/main/java/org/citrusframework/DefaultTestCaseRunner.java
index 956abe1c78..d8b9e4e046 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/DefaultTestCaseRunner.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/DefaultTestCaseRunner.java
@@ -23,9 +23,6 @@
 import org.citrusframework.context.TestContext;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultTestCaseRunner implements TestCaseRunner {
 
     /** The test case */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/TestCaseRunnerFactory.java b/core/citrus-base/src/main/java/org/citrusframework/TestCaseRunnerFactory.java
index 6b66f46393..4e9b1a9b9b 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/TestCaseRunnerFactory.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/TestCaseRunnerFactory.java
@@ -35,7 +35,6 @@
  * The specified file must define the type of {@link TestCaseRunnerProvider} responsible for
  * delivering the custom test case runner.
  *
- * @author Thorsten Schlathoelter
  * @since 4.0
  * @see TestCaseRunnerProvider
  */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/AbstractAsyncTestAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/AbstractAsyncTestAction.java
index 092fb1aa50..51f57b503f 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/AbstractAsyncTestAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/AbstractAsyncTestAction.java
@@ -32,7 +32,6 @@
  * Test action that performs in a separate thread. Action execution is not blocking the test execution chain. After
  * action has performed optional validation step is called.
  *
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public abstract class AbstractAsyncTestAction extends AbstractTestAction implements Completable {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/AbstractTestAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/AbstractTestAction.java
index 97a099231b..bc158685d0 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/AbstractTestAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/AbstractTestAction.java
@@ -28,7 +28,6 @@
 
 /**
  * Abstract base class for test actions. Class provides a default name and description.
- * @author Christoph Deppisch
  */
 public abstract class AbstractTestAction implements TestAction, Named, Described, TestActorAware {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/AntRunAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/AntRunAction.java
index a3c94f7ebb..de79a038c6 100755
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/AntRunAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/AntRunAction.java
@@ -44,7 +44,6 @@
  *
  * Build logging output is forwarded to test run logger.
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public class AntRunAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/ApplyTestBehaviorAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/ApplyTestBehaviorAction.java
index 2d8948b095..7f8c6d0dfb 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/ApplyTestBehaviorAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/ApplyTestBehaviorAction.java
@@ -22,7 +22,6 @@
 import org.citrusframework.context.TestContext;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class ApplyTestBehaviorAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/CreateVariablesAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/CreateVariablesAction.java
index cc1f88c318..2788d24009 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/CreateVariablesAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/CreateVariablesAction.java
@@ -30,7 +30,6 @@
  * Action creating new test variables during a test. Existing test variables are overwritten
  * by new values.
  *
- * @author Christoph Deppisch
  * @since 2006
  */
 public class CreateVariablesAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/EchoAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/EchoAction.java
index 783b618cf4..92bf99ecb3 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/EchoAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/EchoAction.java
@@ -26,7 +26,6 @@
 /**
  * Prints messages to the console/logger during test execution.
  *
- * @author Christoph Deppisch
  * @since 2006
  */
 public class EchoAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/FailAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/FailAction.java
index ea828fab3d..9a8211e34a 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/FailAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/FailAction.java
@@ -23,7 +23,6 @@
 /**
  * Action fails the test explicitly. User can specify a cause message.
  *
- * @author Christoph Deppisch
  */
 public class FailAction extends AbstractTestAction {
     /** User defined cause message to explain the error */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/InputAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/InputAction.java
index afbae196ac..268b2b64fd 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/InputAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/InputAction.java
@@ -38,7 +38,6 @@
  * Action can declare a set of valid answers, so user will be prompted until a valid
  * answer was returned.
  *
- * @author Christoph Deppisch
  */
 public class InputAction extends AbstractTestAction {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/JavaAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/JavaAction.java
index b6d287be06..a8009c3fb9 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/JavaAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/JavaAction.java
@@ -35,7 +35,6 @@
 /**
  * Action to enable class invocation through java reflection
  *
- * @author Christoph Deppisch
  * @since 2006
  */
 public class JavaAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/LoadPropertiesAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/LoadPropertiesAction.java
index 5dca697c70..29f989a8d3 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/LoadPropertiesAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/LoadPropertiesAction.java
@@ -33,7 +33,6 @@
  * Action reads property files and creates test variables for every property entry. File
  * resource path can define a resource located on classpath or file system.
  *
- * @author Christoph Deppisch
  */
 public class LoadPropertiesAction extends AbstractTestAction {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/NoopTestAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/NoopTestAction.java
index 02fbac4ea8..1cf320e97b 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/NoopTestAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/NoopTestAction.java
@@ -24,7 +24,6 @@
  * that needs to return a test action but this should not be included or executed during the test run. See test behavior applying
  * test actions.
  *
- * @author Christoph Deppisch
  */
 public class NoopTestAction implements TestAction {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/PurgeEndpointAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/PurgeEndpointAction.java
index 933ed2bf15..b01217db4f 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/PurgeEndpointAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/PurgeEndpointAction.java
@@ -41,7 +41,6 @@
  * Action purges all messages from a message endpoint. Action receives
  * a list of endpoint objects or a list of endpoint names that are resolved dynamically at runtime.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class PurgeEndpointAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/ReceiveMessageAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/ReceiveMessageAction.java
index 757a22ff37..ea89780675 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/ReceiveMessageAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/ReceiveMessageAction.java
@@ -69,7 +69,6 @@
  * The received message is validated using a {@link MessageValidator} supporting expected
  * control message payload and header templates.
  *
- * @author Christoph Deppisch
  * @since 2008
  */
 public class ReceiveMessageAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/ReceiveTimeoutAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/ReceiveTimeoutAction.java
index e2539bb858..3a8da7ef60 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/ReceiveTimeoutAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/ReceiveTimeoutAction.java
@@ -36,7 +36,6 @@
  * Action expecting a timeout on a message destination, this means that no message
  * should arrive on the destination.
  *
- * @author Christoph Deppisch
  * @since 2006
  */
 public class ReceiveTimeoutAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/SendMessageAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/SendMessageAction.java
index eca0da2dc3..db9a117edb 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/SendMessageAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/SendMessageAction.java
@@ -52,7 +52,6 @@
  * a {@link org.citrusframework.endpoint.Endpoint}, which is capable of the message transport implementation. So action is
  * independent of the message transport configuration.
  *
- * @author Christoph Deppisch
  * @since 2008
  */
 public class SendMessageAction extends AbstractTestAction implements Completable {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/SleepAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/SleepAction.java
index 7f2d55be12..148bbfb9b3 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/SleepAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/SleepAction.java
@@ -28,7 +28,6 @@
 /**
  * Stop the test execution for a given amount of time.
  *
- * @author Christoph Deppisch
  * @since 2006
  */
 public class SleepAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/StartServerAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/StartServerAction.java
index 4e1e7dd147..98bfb7ae9f 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/StartServerAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/StartServerAction.java
@@ -32,7 +32,6 @@
 /**
  * Action starting a {@link Server} instance.
  *
- * @author Christoph Deppisch
  * @since 2006
  */
 public class StartServerAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/StopServerAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/StopServerAction.java
index 04cde27600..12cf143651 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/StopServerAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/StopServerAction.java
@@ -32,7 +32,6 @@
 /**
  * Action stopping {@link Server} instances.
  *
- * @author Christoph Deppisch
  * @since 2006
  */
 public class StopServerAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/StopTimeAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/StopTimeAction.java
index 89c50eb747..0436a1bee1 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/StopTimeAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/StopTimeAction.java
@@ -26,7 +26,6 @@
  * Action used for time measurement during test. User can define a time line that is followed
  * during the test case. Action can print out the watched time to the console/logger.
  *
- * @author Christoph Deppisch
  * @since 2006
  */
 public class StopTimeAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/StopTimerAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/StopTimerAction.java
index a7ced7b1ac..9c2e2a8b79 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/StopTimerAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/StopTimerAction.java
@@ -22,7 +22,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class StopTimerAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/TraceVariablesAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/TraceVariablesAction.java
index 2a43a2ed1d..d387beb395 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/TraceVariablesAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/TraceVariablesAction.java
@@ -30,7 +30,6 @@
  * Action that prints variable values to the console/logger. Action requires a list of variable
  * names. Tries to find the variables in the test context and print its values.
  *
- * @author Christoph Deppisch
  * @since 2006
  */
 public class TraceVariablesAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/actions/TransformAction.java b/core/citrus-base/src/main/java/org/citrusframework/actions/TransformAction.java
index 4ddff77393..acc54c6578 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/actions/TransformAction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/actions/TransformAction.java
@@ -40,7 +40,6 @@
  * with a XSLT document(specified inline or from external file resource)
  * and puts the result in the specified variable.
  *
- * @author Philipp Komninos
  * @since 2010
  */
 public class TransformAction extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/annotations/CitrusAnnotations.java b/core/citrus-base/src/main/java/org/citrusframework/annotations/CitrusAnnotations.java
index 9b38c77f74..88fa8578b2 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/annotations/CitrusAnnotations.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/annotations/CitrusAnnotations.java
@@ -37,7 +37,6 @@
 /**
  * Dependency injection support for {@link CitrusFramework}, {@link CitrusResource} and {@link CitrusEndpoint} annotations.
  *
- * @author Christoph Deppisch
  * @since 2.5
  */
 public abstract class CitrusAnnotations {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/common/DefaultTestLoader.java b/core/citrus-base/src/main/java/org/citrusframework/common/DefaultTestLoader.java
index 440e51546a..0701f4e2bc 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/common/DefaultTestLoader.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/common/DefaultTestLoader.java
@@ -38,7 +38,6 @@
  * Default test loader implementation takes case on test names/packages and initializes the test runner if applicable.
  * Also loads the test case and provides it to registered test handlers. This way a test case can be loaded from different sources
  * like Java code, Groovy code, XML, Json, YAML, etc.
- * @author Christoph Deppisch
  */
 public class DefaultTestLoader implements TestLoader {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/condition/AbstractCondition.java b/core/citrus-base/src/main/java/org/citrusframework/condition/AbstractCondition.java
index aa99403adf..d7e1d82789 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/condition/AbstractCondition.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/condition/AbstractCondition.java
@@ -17,7 +17,6 @@
 package org.citrusframework.condition;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public abstract class AbstractCondition implements Condition {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/condition/ActionCondition.java b/core/citrus-base/src/main/java/org/citrusframework/condition/ActionCondition.java
index 86f93f2b90..fee180ff40 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/condition/ActionCondition.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/condition/ActionCondition.java
@@ -24,7 +24,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class ActionCondition extends AbstractCondition {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/condition/FileCondition.java b/core/citrus-base/src/main/java/org/citrusframework/condition/FileCondition.java
index 5b3c543004..ac2c844f11 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/condition/FileCondition.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/condition/FileCondition.java
@@ -26,7 +26,6 @@
 /**
  * Tests for the presence of a file and returns true if the file exists
  *
- * @author Martin Maher
  * @since 2.4
  */
 public class FileCondition extends AbstractCondition {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/condition/HttpCondition.java b/core/citrus-base/src/main/java/org/citrusframework/condition/HttpCondition.java
index b693d9d176..fb45cb9799 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/condition/HttpCondition.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/condition/HttpCondition.java
@@ -30,7 +30,6 @@
  * Tests if a HTTP Endpoint is reachable. The test is successful if the endpoint responds with the expected response
  * code. By default a HTTP 200 response code is expected.
  *
- * @author Martin Maher
  * @since 2.4
  */
 public class HttpCondition extends AbstractCondition {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/condition/MessageCondition.java b/core/citrus-base/src/main/java/org/citrusframework/condition/MessageCondition.java
index d78f6ef4ae..986762dee5 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/condition/MessageCondition.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/condition/MessageCondition.java
@@ -25,7 +25,6 @@
  *
  * Message to check is identified by its name in the message store.
  *
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class MessageCondition extends AbstractCondition {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/AbstractActionContainer.java b/core/citrus-base/src/main/java/org/citrusframework/container/AbstractActionContainer.java
index 6819d5355d..1f52b35f7e 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/AbstractActionContainer.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/AbstractActionContainer.java
@@ -35,7 +35,6 @@
 /**
  * Abstract base class for all containers holding several embedded test actions.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractActionContainer extends AbstractTestAction implements TestActionContainer, Completable {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/AbstractIteratingActionContainer.java b/core/citrus-base/src/main/java/org/citrusframework/container/AbstractIteratingActionContainer.java
index 321a5cd1b4..d3d2cb8e81 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/AbstractIteratingActionContainer.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/AbstractIteratingActionContainer.java
@@ -24,9 +24,6 @@
 import org.citrusframework.util.BooleanExpressionParser;
 import org.citrusframework.validation.matcher.ValidationMatcherUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractIteratingActionContainer extends AbstractActionContainer {
     /** Boolean expression string */
     protected final String condition;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/AbstractSuiteActionContainer.java b/core/citrus-base/src/main/java/org/citrusframework/container/AbstractSuiteActionContainer.java
index 260529dbd6..9c7265d35b 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/AbstractSuiteActionContainer.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/AbstractSuiteActionContainer.java
@@ -29,7 +29,6 @@
  * Abstract suit container actions executed before and after test suite run. Container decides
  * weather to execute according to given suite name and included test groups if any.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public abstract class AbstractSuiteActionContainer extends AbstractActionContainer {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/AbstractTestBoundaryActionContainer.java b/core/citrus-base/src/main/java/org/citrusframework/container/AbstractTestBoundaryActionContainer.java
index 23ab8d0ad3..461c8fed14 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/AbstractTestBoundaryActionContainer.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/AbstractTestBoundaryActionContainer.java
@@ -30,7 +30,6 @@
  * Abstract test action container describes methods to enable/disable container execution based on given test name, package
  * and test groups. This action container is typically used by before and after test action containers.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public abstract class AbstractTestBoundaryActionContainer extends AbstractActionContainer {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/Assert.java b/core/citrus-base/src/main/java/org/citrusframework/container/Assert.java
index 25175b498a..13e93aee68 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/Assert.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/Assert.java
@@ -35,7 +35,6 @@
 /**
  * Assert exception to happen in nested test action.
  *
- * @author Christoph Deppisch
  * @since 2009
  */
 public class Assert extends AbstractActionContainer {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/Async.java b/core/citrus-base/src/main/java/org/citrusframework/container/Async.java
index 6678c08d4a..e742d44d4d 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/Async.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/Async.java
@@ -31,7 +31,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class Async extends AbstractActionContainer {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/Catch.java b/core/citrus-base/src/main/java/org/citrusframework/container/Catch.java
index 4c244496fa..2730af0cee 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/Catch.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/Catch.java
@@ -26,7 +26,6 @@
 /**
  * Action catches possible exceptions in nested test actions.
  *
- * @author Christoph Deppisch
  */
 public class Catch extends AbstractActionContainer {
     /** Exception type caught */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/ConditionExpression.java b/core/citrus-base/src/main/java/org/citrusframework/container/ConditionExpression.java
index 33e5f71aed..8d0c9522c6 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/ConditionExpression.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/ConditionExpression.java
@@ -22,7 +22,6 @@
  * Interface evaluates a conditional expression to true or false. Usually used in test action containers that need to evaluate
  * condition on test action execution.
  *
- * @author Christoph Deppisch
  * @since 2.3
  */
 @FunctionalInterface
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/Conditional.java b/core/citrus-base/src/main/java/org/citrusframework/container/Conditional.java
index 6fad62c423..089da376bf 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/Conditional.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/Conditional.java
@@ -28,7 +28,6 @@
 /**
  * Class executes nested test actions if condition expression evaluates to true.
  *
- * @author Matthias Beil, Christoph Deppisch
  * @since 1.2
  */
 public class Conditional extends AbstractActionContainer {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/FinallySequence.java b/core/citrus-base/src/main/java/org/citrusframework/container/FinallySequence.java
index 4b8cd9b363..df4b8e14fe 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/FinallySequence.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/FinallySequence.java
@@ -23,7 +23,6 @@
  * Helper sequence to mark actions as finally actions that should be
  * executed in finally block of test case.
  *
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class FinallySequence extends Sequence {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/Iterate.java b/core/citrus-base/src/main/java/org/citrusframework/container/Iterate.java
index 0c64307e79..f70505ce47 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/Iterate.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/Iterate.java
@@ -27,7 +27,6 @@
  * test actions as normal test variable. Iteration starts with index=1 and increments with a
  * default step=1.
  *
- * @author Christoph Deppisch
  */
 public class Iterate extends AbstractIteratingActionContainer {
     /** Index increment step */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/IteratingConditionExpression.java b/core/citrus-base/src/main/java/org/citrusframework/container/IteratingConditionExpression.java
index 0bd1aa0547..af75cfb58c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/IteratingConditionExpression.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/IteratingConditionExpression.java
@@ -22,7 +22,6 @@
  * Interface used when iterating test action containers evaluate
  * the iteration breaking condition.
  *
- * @author Christoph Deppisch
  * @since 2.3
  */
 @FunctionalInterface
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/Parallel.java b/core/citrus-base/src/main/java/org/citrusframework/container/Parallel.java
index 3d3dd5da47..01f2799cbe 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/Parallel.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/Parallel.java
@@ -34,7 +34,6 @@
  * Test action will execute nested actions in parallel. Each action is executed in a
  * separate thread. Container joins all threads and waiting for them to end successfully.
  *
- * @author Christoph Deppisch
  */
 public class Parallel extends AbstractActionContainer {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/RepeatOnErrorUntilTrue.java b/core/citrus-base/src/main/java/org/citrusframework/container/RepeatOnErrorUntilTrue.java
index 78981127c2..1f9a34e065 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/RepeatOnErrorUntilTrue.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/RepeatOnErrorUntilTrue.java
@@ -31,7 +31,6 @@
  *
  * Between the iterations container can sleep automatically a given amount of time.
  *
- * @author Christoph Deppisch
  */
 public class RepeatOnErrorUntilTrue extends AbstractIteratingActionContainer {
     /** Auto sleep in milliseconds */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/RepeatUntilTrue.java b/core/citrus-base/src/main/java/org/citrusframework/container/RepeatUntilTrue.java
index fa874064c1..b28f7187d3 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/RepeatUntilTrue.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/RepeatUntilTrue.java
@@ -26,7 +26,6 @@
  * Index is incremented each iteration and stored as test variable accessible in the nested test actions
  * as normal variable. Index starts with 1 by default.
  *
- * @author Christoph Deppisch
  */
 public class RepeatUntilTrue extends AbstractIteratingActionContainer {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/Sequence.java b/core/citrus-base/src/main/java/org/citrusframework/container/Sequence.java
index 069c27b0f8..84988bba1e 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/Sequence.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/Sequence.java
@@ -25,7 +25,6 @@
 /**
  * Sequence container executing a set of nested test actions in simple sequence.
  *
- * @author Christoph Deppisch
  * @since 2007
  */
 public class Sequence extends AbstractActionContainer {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/SequenceAfterSuite.java b/core/citrus-base/src/main/java/org/citrusframework/container/SequenceAfterSuite.java
index 7a855eb4e0..55a95ad1bf 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/SequenceAfterSuite.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/SequenceAfterSuite.java
@@ -28,7 +28,6 @@
  * Sequence of Citrus test actions that get executed after a test suite run. Sequence should
  * decide weather to execute according to given suite name and included test groups if any.
  *
- * @author Christoph Deppisch
  */
 public class SequenceAfterSuite extends AbstractSuiteActionContainer implements AfterSuite {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/SequenceAfterTest.java b/core/citrus-base/src/main/java/org/citrusframework/container/SequenceAfterTest.java
index 35c6448d37..17349516eb 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/SequenceAfterTest.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/SequenceAfterTest.java
@@ -27,7 +27,6 @@
  * Sequence of test actions executed after a test case. Container execution can be restricted according to test name ,
  * package and test groups.
  *
- * @author Christoph Deppisch
  */
 public class SequenceAfterTest extends AbstractTestBoundaryActionContainer implements AfterTest {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/SequenceBeforeSuite.java b/core/citrus-base/src/main/java/org/citrusframework/container/SequenceBeforeSuite.java
index df7671e05d..c99a064e30 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/SequenceBeforeSuite.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/SequenceBeforeSuite.java
@@ -28,7 +28,6 @@
  * Sequence of Citrus test actions that get executed before a test suite run. Sequence should
  * decide weather to execute according to given suite name and included test groups if any.
  *
- * @author Christoph Deppisch
  */
 public class SequenceBeforeSuite extends AbstractSuiteActionContainer implements BeforeSuite {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/SequenceBeforeTest.java b/core/citrus-base/src/main/java/org/citrusframework/container/SequenceBeforeTest.java
index c0462ffd1e..3cc9afd8cf 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/SequenceBeforeTest.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/SequenceBeforeTest.java
@@ -27,7 +27,6 @@
  * Sequence of test actions executed before a test case. Container execution can be restricted according to test name ,
  * package and test groups.
  *
- * @author Christoph Deppisch
  */
 public class SequenceBeforeTest extends AbstractTestBoundaryActionContainer implements BeforeTest {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/Template.java b/core/citrus-base/src/main/java/org/citrusframework/container/Template.java
index 8e33df2b9f..4c05685ac3 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/Template.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/Template.java
@@ -56,7 +56,6 @@
  * users can create a local test context by setting globalContext to false. Templates then will
  * have no affect on the variables used in the test case.
  *
- * @author Christoph Deppisch
  * @since 2007
  */
 public class Template extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/Timer.java b/core/citrus-base/src/main/java/org/citrusframework/container/Timer.java
index ac56fe77d2..aa73cdd67a 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/Timer.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/Timer.java
@@ -30,7 +30,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class Timer extends AbstractActionContainer implements StopTimer {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/Wait.java b/core/citrus-base/src/main/java/org/citrusframework/container/Wait.java
index e13c493883..b9bcdeb3cc 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/Wait.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/Wait.java
@@ -41,7 +41,6 @@
 /**
  * Pause the test execution until the condition is met or the wait time has been exceeded.
  *
- * @author Martin Maher
  * @since 2.4
  */
 public class Wait extends AbstractTestAction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/WaitActionConditionBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/container/WaitActionConditionBuilder.java
index d49615b524..fbf395b7b7 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/WaitActionConditionBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/WaitActionConditionBuilder.java
@@ -21,7 +21,6 @@
 import org.citrusframework.condition.ActionCondition;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class WaitActionConditionBuilder extends WaitConditionBuilder<ActionCondition, WaitActionConditionBuilder> {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/WaitConditionBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/container/WaitConditionBuilder.java
index 9942daec4b..378f1da9f2 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/WaitConditionBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/WaitConditionBuilder.java
@@ -22,7 +22,6 @@
 import org.citrusframework.condition.Condition;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public abstract class WaitConditionBuilder<T extends Condition, S extends WaitConditionBuilder<T, S>> implements TestActionBuilder<Wait> {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/WaitFileConditionBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/container/WaitFileConditionBuilder.java
index 1ad3e7ab72..457fca7918 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/WaitFileConditionBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/WaitFileConditionBuilder.java
@@ -21,7 +21,6 @@
 import org.citrusframework.condition.FileCondition;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class WaitFileConditionBuilder extends WaitConditionBuilder<FileCondition, WaitFileConditionBuilder> {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/WaitHttpConditionBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/container/WaitHttpConditionBuilder.java
index 88069af6fd..43f4bfad4c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/WaitHttpConditionBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/WaitHttpConditionBuilder.java
@@ -19,7 +19,6 @@
 import org.citrusframework.condition.HttpCondition;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class WaitHttpConditionBuilder extends WaitConditionBuilder<HttpCondition, WaitHttpConditionBuilder> {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/container/WaitMessageConditionBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/container/WaitMessageConditionBuilder.java
index 1ba5be6e2e..0c01d352ae 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/container/WaitMessageConditionBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/container/WaitMessageConditionBuilder.java
@@ -19,7 +19,6 @@
 import org.citrusframework.condition.MessageCondition;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class WaitMessageConditionBuilder extends WaitConditionBuilder<MessageCondition, WaitMessageConditionBuilder> {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/context/StaticTestContextFactory.java b/core/citrus-base/src/main/java/org/citrusframework/context/StaticTestContextFactory.java
index 5afd6a06b3..50511c4244 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/context/StaticTestContextFactory.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/context/StaticTestContextFactory.java
@@ -20,7 +20,6 @@
  * Static test context factory always returns a single test context instance.
  * Mainly used for unit testing.
  *
- * @author Christoph Deppisch
  */
 public class StaticTestContextFactory extends TestContextFactory {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/context/TestContextFactory.java b/core/citrus-base/src/main/java/org/citrusframework/context/TestContextFactory.java
index 9a4bc85223..aec9161f71 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/context/TestContextFactory.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/context/TestContextFactory.java
@@ -47,7 +47,6 @@
  * Factory bean implementation constructs test context instances. Takes care of adding proper default components
  * to the test context such as {@link FunctionRegistry} or {@link GlobalVariables}.
  *
- * @author Christoph Deppisch
  */
 public class TestContextFactory implements ReferenceResolverAware {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/dsl/MessageSupport.java b/core/citrus-base/src/main/java/org/citrusframework/dsl/MessageSupport.java
index 331b5c2553..2327a8a99e 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/dsl/MessageSupport.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/dsl/MessageSupport.java
@@ -21,7 +21,6 @@
 
 /**
  * Message Java DSL helper.
- * @author Christoph Deppisch
  */
 public class MessageSupport {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/dsl/PathExpressionSupport.java b/core/citrus-base/src/main/java/org/citrusframework/dsl/PathExpressionSupport.java
index d2e77ae744..a6b16812e3 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/dsl/PathExpressionSupport.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/dsl/PathExpressionSupport.java
@@ -28,9 +28,6 @@
 import org.citrusframework.validation.context.ValidationContext;
 import org.citrusframework.variable.VariableExtractor;
 
-/**
- * @author Christoph Deppisch
- */
 public class PathExpressionSupport implements WithExpressions<PathExpressionSupport>, PathExpressionAdapter {
 
     private final Map<String, Object> expressions = new LinkedHashMap<>();
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpoint.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpoint.java
index bed215c005..9ed8f6f912 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpoint.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpoint.java
@@ -20,7 +20,6 @@
 
 /**
  * Abstract message endpoint handles send/receive timeout setting and test actors.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public abstract class AbstractEndpoint implements Endpoint {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpointAdapter.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpointAdapter.java
index b50eec3751..3a171ede82 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpointAdapter.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpointAdapter.java
@@ -25,7 +25,6 @@
 /**
  * Abstract endpoint adapter adds fallback endpoint adapter in case no response was provided.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public abstract class AbstractEndpointAdapter implements EndpointAdapter {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpointBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpointBuilder.java
index faf1832c13..d51fe08cfe 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpointBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpointBuilder.java
@@ -23,7 +23,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public abstract class AbstractEndpointBuilder<T extends Endpoint> implements EndpointBuilder<T> {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpointComponent.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpointComponent.java
index 33bafd530a..1fe8f46fe6 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpointComponent.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractEndpointComponent.java
@@ -41,7 +41,6 @@
  * jms:queue.name?connectionFactory=specialConnectionFactory
  * soap:localhost:8080?soapAction=sayHello
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public abstract class AbstractEndpointComponent implements EndpointComponent {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractPollableEndpointConfiguration.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractPollableEndpointConfiguration.java
index cbfcf2a8b9..c09cb4898c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractPollableEndpointConfiguration.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/AbstractPollableEndpointConfiguration.java
@@ -19,7 +19,6 @@
 /**
  * Abstract pollable endpoint configuration adds polling interval settings.
  *
- * @author Christoph Deppisch
  * @since 2.1
  */
 public class AbstractPollableEndpointConfiguration extends AbstractEndpointConfiguration implements PollableEndpointConfiguration {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/EmptyResponseEndpointAdapter.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/EmptyResponseEndpointAdapter.java
index 27d22e3f00..51e1cdce2e 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/EmptyResponseEndpointAdapter.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/EmptyResponseEndpointAdapter.java
@@ -22,7 +22,6 @@
 /**
  * Endpoint adapter always returning empty response message.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class EmptyResponseEndpointAdapter extends StaticEndpointAdapter {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/RequestDispatchingEndpointAdapter.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/RequestDispatchingEndpointAdapter.java
index bf0e21183c..1112313f1c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/RequestDispatchingEndpointAdapter.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/RequestDispatchingEndpointAdapter.java
@@ -25,7 +25,6 @@
  * a endpoint adapter mapping. Once adapter mapping identified proper endpoint adapter implementation the incoming request is forwarded
  * to this adapter for further processing steps.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class RequestDispatchingEndpointAdapter extends StaticEndpointAdapter {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/StaticEndpointAdapter.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/StaticEndpointAdapter.java
index f419c894df..97d3015ab8 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/StaticEndpointAdapter.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/StaticEndpointAdapter.java
@@ -25,7 +25,6 @@
  * Static endpoint adapter always responds with static response message. No endpoint is provided as this is a
  * static endpoint adapter. Clients trying to get endpoint for interaction will receive runtime exception.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public abstract class StaticEndpointAdapter extends AbstractEndpointAdapter {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/StaticResponseEndpointAdapter.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/StaticResponseEndpointAdapter.java
index d0b2710ad5..94d7416ddc 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/StaticResponseEndpointAdapter.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/StaticResponseEndpointAdapter.java
@@ -32,7 +32,6 @@
 /**
  * Endpoint adapter always returns a static response message.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class StaticResponseEndpointAdapter extends StaticEndpointAdapter {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/TimeoutProducingEndpointAdapter.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/TimeoutProducingEndpointAdapter.java
index 5eff669f9e..8346a4a748 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/TimeoutProducingEndpointAdapter.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/TimeoutProducingEndpointAdapter.java
@@ -21,7 +21,6 @@
 /**
  * Endpoint adapter produces no response message forcing a request timeout on client side.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class TimeoutProducingEndpointAdapter extends StaticEndpointAdapter {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/AbstractMappingKeyExtractor.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/AbstractMappingKeyExtractor.java
index cf1f557151..fc3fbeb940 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/AbstractMappingKeyExtractor.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/AbstractMappingKeyExtractor.java
@@ -23,7 +23,6 @@
  * Subclasses do evaluate mapping key from incoming request message and optional prefix and/or suffix are
  * automatically added to resulting mapping key.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public abstract class AbstractMappingKeyExtractor implements MappingKeyExtractor {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/BeanNameMappingStrategy.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/BeanNameMappingStrategy.java
index 2523c4deee..1a29c1e894 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/BeanNameMappingStrategy.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/BeanNameMappingStrategy.java
@@ -24,7 +24,6 @@
  * for the given mapping key. Bean id or name has to match the given mapping key and bean must be of type
  * {@link org.citrusframework.endpoint.EndpointAdapter}
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class BeanNameMappingStrategy implements EndpointAdapterMappingStrategy {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/HeaderMappingKeyExtractor.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/HeaderMappingKeyExtractor.java
index 53872e007c..5be4c5c937 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/HeaderMappingKeyExtractor.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/HeaderMappingKeyExtractor.java
@@ -22,7 +22,6 @@
 /**
  * Extractor searches for header name in request headers for mapping name identification.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class HeaderMappingKeyExtractor extends AbstractMappingKeyExtractor {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/SimpleMappingStrategy.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/SimpleMappingStrategy.java
index a68265c2bf..2971f70f96 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/SimpleMappingStrategy.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/SimpleMappingStrategy.java
@@ -26,7 +26,6 @@
  * Endpoint adapter mapping strategy simply holds a map of mapping keys and adapter instances. Searches for available mapping key
  * and returns respective adapter implementation.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class SimpleMappingStrategy implements EndpointAdapterMappingStrategy {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/SoapActionMappingKeyExtractor.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/SoapActionMappingKeyExtractor.java
index c321adf2f5..1c9dc12c09 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/SoapActionMappingKeyExtractor.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/adapter/mapping/SoapActionMappingKeyExtractor.java
@@ -18,7 +18,6 @@
 
 /**
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class SoapActionMappingKeyExtractor extends HeaderMappingKeyExtractor {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/builder/AbstractEndpointBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/builder/AbstractEndpointBuilder.java
index d9c06869bd..277e75cd1b 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/builder/AbstractEndpointBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/builder/AbstractEndpointBuilder.java
@@ -20,7 +20,6 @@
 import org.citrusframework.endpoint.EndpointBuilder;
 
 /**
- * @author Christoph Deppisch
  * @since 2.8
  */
 public abstract class AbstractEndpointBuilder<B extends EndpointBuilder<? extends Endpoint>> {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/builder/AsyncSyncEndpointBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/builder/AsyncSyncEndpointBuilder.java
index 2c2f49ae58..2079c2fe07 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/builder/AsyncSyncEndpointBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/builder/AsyncSyncEndpointBuilder.java
@@ -20,7 +20,6 @@
 import org.citrusframework.endpoint.EndpointBuilder;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class AsyncSyncEndpointBuilder<A extends EndpointBuilder<? extends Endpoint>, S extends EndpointBuilder<? extends Endpoint>> {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/builder/ClientServerEndpointBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/builder/ClientServerEndpointBuilder.java
index 921bdd044d..a98312a992 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/builder/ClientServerEndpointBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/builder/ClientServerEndpointBuilder.java
@@ -20,7 +20,6 @@
 import org.citrusframework.endpoint.EndpointBuilder;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class ClientServerEndpointBuilder<C extends EndpointBuilder<? extends Endpoint>, S extends EndpointBuilder<? extends Endpoint>> {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectConsumer.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectConsumer.java
index 3d42a81107..0f6ccd4468 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectConsumer.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectConsumer.java
@@ -28,9 +28,6 @@
 import org.slf4j.LoggerFactory;
 import org.citrusframework.util.StringUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectConsumer extends AbstractSelectiveMessageConsumer {
 
     /** Logger */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpoint.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpoint.java
index 2de42e3283..3cf8b3c9e0 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpoint.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpoint.java
@@ -23,7 +23,6 @@
 /**
  * Direct message endpoint implementation sends and receives message from in memory message queue.
  *
- * @author Christoph Deppisch
  * @since 3.0
  */
 public class DirectEndpoint extends AbstractEndpoint {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointAdapter.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointAdapter.java
index 9eb9fc5fda..cf1d813964 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointAdapter.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointAdapter.java
@@ -28,7 +28,6 @@
  * on reply queue. Provides simple endpoint for clients to connect to message queue in order to provide proper
  * response message.
  *
- * @author Christoph Deppisch
  * @since 3.0
  */
 public class DirectEndpointAdapter extends AbstractEndpointAdapter {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointBuilder.java
index ad12f327d7..14e52661f7 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointBuilder.java
@@ -19,9 +19,6 @@
 import org.citrusframework.endpoint.AbstractEndpointBuilder;
 import org.citrusframework.message.MessageQueue;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectEndpointBuilder extends AbstractEndpointBuilder<DirectEndpoint> {
 
     /** Endpoint target */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointComponent.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointComponent.java
index a6cd0dc7c4..d0907acf3e 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointComponent.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointComponent.java
@@ -27,7 +27,6 @@
  * Direct endpoint component creates synchronous or asynchronous channel endpoint and sets configuration properties
  * accordingly.
  *
- * @author Christoph Deppisch
  * @since 3.0
  */
 public class DirectEndpointComponent extends AbstractEndpointComponent {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointConfiguration.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointConfiguration.java
index 8266518038..a916e82c8b 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointConfiguration.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpointConfiguration.java
@@ -19,9 +19,6 @@
 import org.citrusframework.endpoint.AbstractEndpointConfiguration;
 import org.citrusframework.message.MessageQueue;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectEndpointConfiguration extends AbstractEndpointConfiguration {
 
     /** Destination queue */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpoints.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpoints.java
index cd51e27c84..71af315775 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpoints.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectEndpoints.java
@@ -18,9 +18,6 @@
 
 import org.citrusframework.endpoint.builder.AsyncSyncEndpointBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectEndpoints extends AsyncSyncEndpointBuilder<DirectEndpointBuilder, DirectSyncEndpointBuilder> {
 
     /**
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectMessageHeaders.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectMessageHeaders.java
index e77dedde31..c754e212d0 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectMessageHeaders.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectMessageHeaders.java
@@ -18,9 +18,6 @@
 
 import org.citrusframework.message.MessageHeaders;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectMessageHeaders {
 
     /** Message reply queue name header */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectProducer.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectProducer.java
index 85f32dbc61..9dd4fafcf3 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectProducer.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectProducer.java
@@ -25,9 +25,6 @@
 import org.slf4j.LoggerFactory;
 import org.citrusframework.util.StringUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectProducer implements Producer {
 
     /** Logger */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncConsumer.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncConsumer.java
index 18d66b085a..5b25d7597a 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncConsumer.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncConsumer.java
@@ -27,9 +27,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectSyncConsumer extends DirectConsumer implements ReplyProducer {
     /** Logger */
     private static final Logger logger = LoggerFactory.getLogger(DirectSyncConsumer.class);
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncEndpoint.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncEndpoint.java
index 5558d22044..7630b81357 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncEndpoint.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncEndpoint.java
@@ -19,9 +19,6 @@
 import org.citrusframework.messaging.Producer;
 import org.citrusframework.messaging.SelectiveConsumer;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectSyncEndpoint extends DirectEndpoint {
 
     /** One of producer or consumer for this endpoint */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncEndpointBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncEndpointBuilder.java
index 0730f5bc47..fbe1004076 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncEndpointBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncEndpointBuilder.java
@@ -20,9 +20,6 @@
 import org.citrusframework.message.MessageCorrelator;
 import org.citrusframework.message.MessageQueue;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectSyncEndpointBuilder extends AbstractEndpointBuilder<DirectSyncEndpoint> {
 
     /** Endpoint target */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncEndpointConfiguration.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncEndpointConfiguration.java
index deeec45dd0..aed033fbcd 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncEndpointConfiguration.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncEndpointConfiguration.java
@@ -20,9 +20,6 @@
 import org.citrusframework.message.DefaultMessageCorrelator;
 import org.citrusframework.message.MessageCorrelator;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectSyncEndpointConfiguration extends DirectEndpointConfiguration implements PollableEndpointConfiguration {
 
     /** Reply message correlator */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncProducer.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncProducer.java
index 0a6a16a06a..c5788fdb67 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncProducer.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/DirectSyncProducer.java
@@ -30,9 +30,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectSyncProducer extends DirectProducer implements ReplyConsumer {
     /** Logger */
     private static final Logger logger = LoggerFactory.getLogger(DirectSyncProducer.class);
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/annotation/DirectEndpointConfigParser.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/annotation/DirectEndpointConfigParser.java
index 1ab51210f8..f0d623b0be 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/annotation/DirectEndpointConfigParser.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/annotation/DirectEndpointConfigParser.java
@@ -24,9 +24,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.util.StringUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectEndpointConfigParser implements AnnotationConfigParser<DirectEndpointConfig, DirectEndpoint> {
 
     @Override
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/annotation/DirectSyncEndpointConfigParser.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/annotation/DirectSyncEndpointConfigParser.java
index 2e2ed25d11..c13d71408e 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/annotation/DirectSyncEndpointConfigParser.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/direct/annotation/DirectSyncEndpointConfigParser.java
@@ -25,9 +25,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.util.StringUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectSyncEndpointConfigParser implements AnnotationConfigParser<DirectSyncEndpointConfig, DirectSyncEndpoint> {
 
     @Override
diff --git a/core/citrus-base/src/main/java/org/citrusframework/endpoint/resolver/DynamicEndpointUriResolver.java b/core/citrus-base/src/main/java/org/citrusframework/endpoint/resolver/DynamicEndpointUriResolver.java
index 3b0f41fdf3..6d2cb8d20c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/endpoint/resolver/DynamicEndpointUriResolver.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/endpoint/resolver/DynamicEndpointUriResolver.java
@@ -27,7 +27,6 @@
  * Endpoint uri resolver working on message headers. Resolver is searching for a specific header entry which holds the actual
  * target endpoint uri.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class DynamicEndpointUriResolver implements EndpointUriResolver {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/DefaultFunctionLibrary.java b/core/citrus-base/src/main/java/org/citrusframework/functions/DefaultFunctionLibrary.java
index 6111a9d9c3..dcd06c91bb 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/DefaultFunctionLibrary.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/DefaultFunctionLibrary.java
@@ -51,9 +51,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultFunctionLibrary extends FunctionLibrary {
 
     /** Logger */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/DefaultFunctionRegistry.java b/core/citrus-base/src/main/java/org/citrusframework/functions/DefaultFunctionRegistry.java
index 5b26f8ea5f..721ebce73d 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/DefaultFunctionRegistry.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/DefaultFunctionRegistry.java
@@ -18,7 +18,6 @@
 
 /**
  * Default registry automatically adds default function library.
- * @author Christoph Deppisch
  */
 public class DefaultFunctionRegistry extends FunctionRegistry {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/Functions.java b/core/citrus-base/src/main/java/org/citrusframework/functions/Functions.java
index 08d03374f7..879d64d284 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/Functions.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/Functions.java
@@ -35,7 +35,6 @@
 import org.citrusframework.functions.core.UnixTimestampFunction;
 
 /**
- * @author Christoph Deppisch
  * @since 2.1
  */
 public final class Functions {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/AbsoluteFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/AbsoluteFunction.java
index 7fe255f504..61b131e681 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/AbsoluteFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/AbsoluteFunction.java
@@ -29,7 +29,6 @@
 /**
  * Function returning the absolute value of a decimal number.
  *
- * @author Christoph Deppisch
  */
 public class AbsoluteFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/AbstractDateFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/AbstractDateFunction.java
index 763dc8300f..487536a558 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/AbstractDateFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/AbstractDateFunction.java
@@ -27,7 +27,6 @@
 /**
  * Abstract date value handling function provides base date value manipulation helpers.
  *
- * @author Christoph Deppisch
  * @since 1.3.1
  */
 public abstract class AbstractDateFunction implements Function {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/AvgFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/AvgFunction.java
index feeecabfdb..631b09dccd 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/AvgFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/AvgFunction.java
@@ -27,7 +27,6 @@
 /**
  * Function returning the average of a set of numeric values.
  *
- * @author Christoph Deppisch
  */
 public class AvgFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/CeilingFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/CeilingFunction.java
index faf63dada3..a1cbf18857 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/CeilingFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/CeilingFunction.java
@@ -29,7 +29,6 @@
  * Returns the smallest (closest to negative infinity) double value
  * according to the numeric argument.
  *
- * @author Christoph Deppisch
  */
 public class CeilingFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/ChangeDateFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/ChangeDateFunction.java
index ee32876dd2..46b8a9e34d 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/ChangeDateFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/ChangeDateFunction.java
@@ -31,7 +31,6 @@
  * Function changes given date value by adding/subtracting day/month/year/hour/minute
  * offset values. Class uses special date format to parse date string to Calendar instance.
  *
- * @author Christoph Deppisch
  * @since 1.3.1
  */
 public class ChangeDateFunction extends AbstractDateFunction {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/ConcatFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/ConcatFunction.java
index 39d2af5c90..ab992599c9 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/ConcatFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/ConcatFunction.java
@@ -26,7 +26,6 @@
  * Function concatenating multiple tokens to a single string. Tokens can be either
  * static string values or dynamic variables or functions.
  *
- * @author Christoph Deppisch
  */
 public class ConcatFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/CurrentDateFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/CurrentDateFunction.java
index bcc6aaa024..b8bd98775c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/CurrentDateFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/CurrentDateFunction.java
@@ -29,7 +29,6 @@
  * Function returning the actual date as formatted string value. User specifies format string
  * as argument. Function also supports additional date offset in order to manipulate result date value.
  *
- * @author Christoph Deppisch
  */
 public class CurrentDateFunction extends AbstractDateFunction {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/DecodeBase64Function.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/DecodeBase64Function.java
index 70162165b4..35fc0d6c96 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/DecodeBase64Function.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/DecodeBase64Function.java
@@ -28,7 +28,6 @@
 /**
  * Decodes base64 binary data to a character sequence.
  *
- * @author Christoph Deppisch
  */
 public class DecodeBase64Function implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/DigestAuthHeaderFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/DigestAuthHeaderFunction.java
index 1f6f8eadae..885fb3d3b9 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/DigestAuthHeaderFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/DigestAuthHeaderFunction.java
@@ -36,7 +36,6 @@
  * opaque
  * algorithm
  *
- * @author Christoph Deppisch
  */
 public class DigestAuthHeaderFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/EncodeBase64Function.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/EncodeBase64Function.java
index 3cfae70b7e..2465903570 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/EncodeBase64Function.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/EncodeBase64Function.java
@@ -28,7 +28,6 @@
 /**
  * Encodes a character sequence to base64 binary using given charset.
  *
- * @author Christoph Deppisch
  */
 public class EncodeBase64Function implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/FloorFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/FloorFunction.java
index 3176fafd60..c7130d9a8c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/FloorFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/FloorFunction.java
@@ -29,7 +29,6 @@
  * Returns the largest (closest to positive infinity) double value according to numeric argument
  * value.
  *
- * @author Christoph Deppisch
  */
 public class FloorFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/LoadMessageFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/LoadMessageFunction.java
index 13d1146d33..48b0ad1641 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/LoadMessageFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/LoadMessageFunction.java
@@ -29,7 +29,6 @@
  * Function loads message from test context message store. Incoming and sent messages get automatically
  * stored to the message store. Messages are identified by their name.
  *
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class LoadMessageFunction implements Function {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/LocalHostAddressFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/LocalHostAddressFunction.java
index 8f52b5005f..530329d18a 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/LocalHostAddressFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/LocalHostAddressFunction.java
@@ -29,7 +29,6 @@
  * Function gets the local host address. Usually some IP address (e.g. 192.168.2.100).
  * This enables us to access the localhost dynamically in tests.
  *
- * @author Christoph Deppisch
  */
 public class LocalHostAddressFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/LowerCaseFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/LowerCaseFunction.java
index b7cf173bce..6362bb9c5a 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/LowerCaseFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/LowerCaseFunction.java
@@ -25,7 +25,6 @@
 /**
  * Function returns given string argument in lower case.
  *
- * @author Christoph Deppisch
  */
 public class LowerCaseFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/MapValueFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/MapValueFunction.java
index b22d1c727b..76a241dd90 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/MapValueFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/MapValueFunction.java
@@ -59,7 +59,6 @@
  * </pre>
  * </code>
  *
- * @author Dimo Velev (dimo.velev@gmail.com)
  *
  */
 public class MapValueFunction implements Function, InitializingPhase {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/MaxFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/MaxFunction.java
index d171549934..56cb13fb33 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/MaxFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/MaxFunction.java
@@ -27,7 +27,6 @@
 /**
  * Function returns the maximum numeric value in a set of numeric arguments.
  *
- * @author Christoph Deppisch
  */
 public class MaxFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/MinFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/MinFunction.java
index 4553831ed6..fd32d4b7e4 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/MinFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/MinFunction.java
@@ -27,7 +27,6 @@
 /**
  * Returns the minimum value in a set of numeric arguments.
  *
- * @author Christoph Deppisch
  */
 public class MinFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomEnumValueFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomEnumValueFunction.java
index d9b54c3d07..6394c16d51 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomEnumValueFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomEnumValueFunction.java
@@ -69,7 +69,6 @@
  * You should choose which one of the two flavours to use based on the number of times you use this function - if you need it in
  * only one special case you may go with specifying the list as arguments otherwise you should define a custom function and reuse it.
  *
- * @author Dimo Velev (dimo.velev@gmail.com)
  */
 public class RandomEnumValueFunction implements Function {
 	private Random random = new Random(System.currentTimeMillis());
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomNumberFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomNumberFunction.java
index 20d81d42b2..a3fa489e5a 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomNumberFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomNumberFunction.java
@@ -30,7 +30,6 @@
  * Function returning a random numeric value. Argument specifies the number of digits and
  * padding boolean flag.
  *
- * @author Christoph Deppisch
  */
 public class RandomNumberFunction implements Function {
     /** Basic seed generating random number */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomStringFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomStringFunction.java
index a1b03ea154..099c13df55 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomStringFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomStringFunction.java
@@ -30,7 +30,6 @@
  * Function generating a random string containing alphabetic characters. Arguments specify
  * upper and lower case mode.
  *
- * @author Christoph Deppisch
  */
 public class RandomStringFunction implements Function {
     private static Random generator = new Random(System.currentTimeMillis());
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomUUIDFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomUUIDFunction.java
index 137ae3cf4e..201489b964 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomUUIDFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/RandomUUIDFunction.java
@@ -25,7 +25,6 @@
 /**
  * Creates a random Java UUID.
  *
- * @author Christoph Deppisch
  */
 public class RandomUUIDFunction  implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/ReadFileResourceFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/ReadFileResourceFunction.java
index 0ef4536716..710600b8c1 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/ReadFileResourceFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/ReadFileResourceFunction.java
@@ -40,7 +40,6 @@
  *     <li>Boolean value to indicate that a dynamic replacement should be performed before the content is base64 encoded. Defaults to false.</li>
  * </ol>
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class ReadFileResourceFunction implements Function {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/RoundFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/RoundFunction.java
index 6689b0572b..87a263cbb1 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/RoundFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/RoundFunction.java
@@ -27,7 +27,6 @@
 /**
  * Function returns the closest integer value to a decimal argument.
  *
- * @author Christoph Deppisch
  */
 public class RoundFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/StringLengthFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/StringLengthFunction.java
index fe3becdae2..eebffa7a9b 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/StringLengthFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/StringLengthFunction.java
@@ -25,7 +25,6 @@
 /**
  * Returning the length of a given string argument.
  *
- * @author Christoph Deppisch
  */
 public class StringLengthFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/SubstringAfterFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/SubstringAfterFunction.java
index 222d7715b5..5a294ca406 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/SubstringAfterFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/SubstringAfterFunction.java
@@ -25,7 +25,6 @@
 /**
  * Function implements substring after functionality.
  *
- * @author Christoph Deppisch
  */
 public class SubstringAfterFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/SubstringBeforeFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/SubstringBeforeFunction.java
index 727a82410e..5c29c87828 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/SubstringBeforeFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/SubstringBeforeFunction.java
@@ -25,7 +25,6 @@
 /**
  * Function implements substring before functionality.
  *
- * @author Christoph Deppisch
  */
 public class SubstringBeforeFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/SubstringFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/SubstringFunction.java
index 795a96b01c..a5f23b5973 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/SubstringFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/SubstringFunction.java
@@ -32,7 +32,6 @@
  * optional endIndex may be given as function parameter, too. The parameter usage looks
  * like this: substring(targetString, beginIndex, [endIndex]).
  *
- * @author Christoph Deppisch
  */
 public class SubstringFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/SumFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/SumFunction.java
index e72cdd54a9..6ab4c9d396 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/SumFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/SumFunction.java
@@ -25,7 +25,6 @@
 /**
  * Function to sum up all numeric arguments.
  *
- * @author Christoph Deppisch
  */
 public class SumFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/SystemPropertyFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/SystemPropertyFunction.java
index 63e17219b6..de1a470bbe 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/SystemPropertyFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/SystemPropertyFunction.java
@@ -27,7 +27,6 @@
 /**
  * Function returns given string argument in lower case.
  *
- * @author Christoph Deppisch
  */
 public class SystemPropertyFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/TranslateFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/TranslateFunction.java
index 4c8ffc058a..b81880dcd7 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/TranslateFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/TranslateFunction.java
@@ -26,7 +26,6 @@
  * Function searches for occurrences of a given character sequence and replaces all
  * findings with given replacement string.
  *
- * @author Christoph Deppisch
  */
 public class TranslateFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/UnixTimestampFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/UnixTimestampFunction.java
index 5423850d47..94cef1a42b 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/UnixTimestampFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/UnixTimestampFunction.java
@@ -24,7 +24,6 @@
 /**
  * Function returning the actual timestamp.
  *
- * @author Alexandr Kuznecov
  */
 public class UnixTimestampFunction extends AbstractDateFunction {
     public String execute(List<String> parameterList, TestContext context) {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/UpperCaseFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/UpperCaseFunction.java
index bb1ff586a1..28d4500f2a 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/UpperCaseFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/UpperCaseFunction.java
@@ -25,7 +25,6 @@
 /**
  * Returns given string argument in upper case letters.
  *
- * @author Christoph Deppisch
  */
 public class UpperCaseFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/UrlDecodeFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/UrlDecodeFunction.java
index 4d8fa6178e..0f3abd5c5c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/UrlDecodeFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/UrlDecodeFunction.java
@@ -28,7 +28,6 @@
 /**
  * Decodes URL encoded string to a character sequence.
  *
- * @author Christoph Deppisch
  */
 public class UrlDecodeFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/functions/core/UrlEncodeFunction.java b/core/citrus-base/src/main/java/org/citrusframework/functions/core/UrlEncodeFunction.java
index a9556a1c0c..293cebb0e6 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/functions/core/UrlEncodeFunction.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/functions/core/UrlEncodeFunction.java
@@ -28,7 +28,6 @@
 /**
  * Encodes a character sequence to URL encoded string using given charset.
  *
- * @author Christoph Deppisch
  */
 public class UrlEncodeFunction implements Function {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/log/DefaultLogModifier.java b/core/citrus-base/src/main/java/org/citrusframework/log/DefaultLogModifier.java
index 74a94f1c3c..d99d2fd5ca 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/log/DefaultLogModifier.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/log/DefaultLogModifier.java
@@ -26,7 +26,6 @@
  * Default modifier implementation uses regular expressions to mask logger output.
  * Regular expressions match on default keywords.
  *
- * @author Christoph Deppisch
  */
 public class DefaultLogModifier implements LogMessageModifier {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/main/AbstractTestEngine.java b/core/citrus-base/src/main/java/org/citrusframework/main/AbstractTestEngine.java
index 20fe0f19be..725099e1d1 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/main/AbstractTestEngine.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/main/AbstractTestEngine.java
@@ -17,7 +17,6 @@
 package org.citrusframework.main;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public abstract class AbstractTestEngine implements TestEngine {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/main/scan/AbstractTestScanner.java b/core/citrus-base/src/main/java/org/citrusframework/main/scan/AbstractTestScanner.java
index cb8a87045d..4e9b36a575 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/main/scan/AbstractTestScanner.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/main/scan/AbstractTestScanner.java
@@ -22,7 +22,6 @@
 import java.util.stream.Collectors;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public abstract class AbstractTestScanner implements TestScanner {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/main/scan/ClassPathTestScanner.java b/core/citrus-base/src/main/java/org/citrusframework/main/scan/ClassPathTestScanner.java
index 89453eae45..2bccded319 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/main/scan/ClassPathTestScanner.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/main/scan/ClassPathTestScanner.java
@@ -34,7 +34,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class ClassPathTestScanner extends AbstractTestScanner {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/main/scan/JarFileTestScanner.java b/core/citrus-base/src/main/java/org/citrusframework/main/scan/JarFileTestScanner.java
index 35e7d4db8b..9773c6c64c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/main/scan/JarFileTestScanner.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/main/scan/JarFileTestScanner.java
@@ -31,7 +31,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class JarFileTestScanner extends AbstractTestScanner {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/DefaultMessage.java b/core/citrus-base/src/main/java/org/citrusframework/message/DefaultMessage.java
index b74b5355ca..cdb38f5ee0 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/DefaultMessage.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/DefaultMessage.java
@@ -33,7 +33,6 @@
  * Default message implementation holds message payload and message headers. Also provides access methods for special
  * header elements such as unique message id and creation timestamp.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class DefaultMessage implements Message {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/DefaultMessageCorrelator.java b/core/citrus-base/src/main/java/org/citrusframework/message/DefaultMessageCorrelator.java
index 7bd3cd1cb2..0dbcc0254a 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/DefaultMessageCorrelator.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/DefaultMessageCorrelator.java
@@ -20,7 +20,6 @@
  * Default message correlator implementation using the Citrus message id
  * as correlation key.
  *
- * @author Christoph Deppisch
  */
 public class DefaultMessageCorrelator implements MessageCorrelator {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/DefaultMessageQueue.java b/core/citrus-base/src/main/java/org/citrusframework/message/DefaultMessageQueue.java
index ac52e902e5..607990f568 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/DefaultMessageQueue.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/DefaultMessageQueue.java
@@ -25,7 +25,6 @@
  * Default message queue implementation. Holds queued messages in memory and adds selective consumption of messages
  * according to a message selector implementation.
  *
- * @author Christoph Deppisch
  */
 public class DefaultMessageQueue implements MessageQueue {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/MessageSelectorBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/message/MessageSelectorBuilder.java
index 0ad1f85be0..449637ed9e 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/MessageSelectorBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/MessageSelectorBuilder.java
@@ -30,7 +30,6 @@
  * Constructs message selectors either from string value or from key value maps. Currently only AND logical combination
  * of multiple expressions is supported.
  *
- * @author Christoph Deppisch
  */
 public class MessageSelectorBuilder {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/RawMessage.java b/core/citrus-base/src/main/java/org/citrusframework/message/RawMessage.java
index 1a305b7c2b..5498110ba7 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/RawMessage.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/RawMessage.java
@@ -17,7 +17,6 @@
 package org.citrusframework.message;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class RawMessage extends DefaultMessage {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/ZipMessage.java b/core/citrus-base/src/main/java/org/citrusframework/message/ZipMessage.java
index 4520f6676d..200f840c0f 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/ZipMessage.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/ZipMessage.java
@@ -34,7 +34,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class ZipMessage extends DefaultMessage {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/builder/BinaryFileResourcePayloadBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/message/builder/BinaryFileResourcePayloadBuilder.java
index 7e868d676b..8a33f9b9dc 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/builder/BinaryFileResourcePayloadBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/builder/BinaryFileResourcePayloadBuilder.java
@@ -20,9 +20,6 @@
 import org.citrusframework.message.MessagePayloadBuilder;
 import org.citrusframework.util.FileUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class BinaryFileResourcePayloadBuilder implements MessagePayloadBuilder {
 
     private final String resourcePath;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/builder/DefaultHeaderBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/message/builder/DefaultHeaderBuilder.java
index e571949511..cf27502e9a 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/builder/DefaultHeaderBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/builder/DefaultHeaderBuilder.java
@@ -21,9 +21,6 @@
 import org.citrusframework.context.TestContext;
 import org.citrusframework.message.MessageHeaderBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultHeaderBuilder implements MessageHeaderBuilder {
 
     private final Map<String, Object> headers;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/builder/DefaultHeaderDataBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/message/builder/DefaultHeaderDataBuilder.java
index 12dc087cc3..2b7571c893 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/builder/DefaultHeaderDataBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/builder/DefaultHeaderDataBuilder.java
@@ -20,9 +20,6 @@
 import org.citrusframework.message.MessageHeaderDataBuilder;
 import org.citrusframework.util.TypeConversionUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultHeaderDataBuilder implements MessageHeaderDataBuilder {
 
     private final Object headerData;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/builder/DefaultPayloadBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/message/builder/DefaultPayloadBuilder.java
index a9947bec76..b867e3dc58 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/builder/DefaultPayloadBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/builder/DefaultPayloadBuilder.java
@@ -19,9 +19,6 @@
 import org.citrusframework.context.TestContext;
 import org.citrusframework.message.MessagePayloadBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultPayloadBuilder implements MessagePayloadBuilder {
 
     private final Object payload;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/builder/FileResourceHeaderDataBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/message/builder/FileResourceHeaderDataBuilder.java
index 437183112e..406d3a2b3b 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/builder/FileResourceHeaderDataBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/builder/FileResourceHeaderDataBuilder.java
@@ -25,9 +25,6 @@
 import org.citrusframework.message.MessageHeaderDataBuilder;
 import org.citrusframework.util.FileUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class FileResourceHeaderDataBuilder implements MessageHeaderDataBuilder {
 
     private final String charsetName;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/builder/FileResourcePayloadBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/message/builder/FileResourcePayloadBuilder.java
index 24b4074b8d..15b20f7a9e 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/builder/FileResourcePayloadBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/builder/FileResourcePayloadBuilder.java
@@ -28,9 +28,6 @@
 import org.citrusframework.spi.Resource;
 import org.citrusframework.util.FileUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class FileResourcePayloadBuilder implements MessagePayloadBuilder, MessageTypeAware {
 
     private String messageType;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/builder/MessageBuilderSupport.java b/core/citrus-base/src/main/java/org/citrusframework/message/builder/MessageBuilderSupport.java
index 83a13a11c0..cc3450229c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/builder/MessageBuilderSupport.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/builder/MessageBuilderSupport.java
@@ -51,9 +51,6 @@
 import static org.citrusframework.util.FileUtils.getDefaultCharset;
 import static org.citrusframework.util.FileUtils.readToString;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class MessageBuilderSupport<T extends TestAction, B extends MessageBuilderSupport.MessageActionBuilder<T, S, B>, S extends MessageBuilderSupport<T, B, S>>
         implements TestActionBuilder<T>, ReferenceResolverAware {
     protected final S self;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/builder/ReceiveMessageBuilderSupport.java b/core/citrus-base/src/main/java/org/citrusframework/message/builder/ReceiveMessageBuilderSupport.java
index 42358755e9..698ef2e4b7 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/builder/ReceiveMessageBuilderSupport.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/builder/ReceiveMessageBuilderSupport.java
@@ -30,9 +30,6 @@
 import org.citrusframework.validation.context.ValidationContext;
 import org.citrusframework.variable.VariableExtractor;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageBuilderSupport<T extends ReceiveMessageAction, B extends ReceiveMessageAction.ReceiveMessageActionBuilder<T, S, B>, S extends ReceiveMessageBuilderSupport<T, B, S>>
         extends MessageBuilderSupport<T, B, S> {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/builder/SendMessageBuilderSupport.java b/core/citrus-base/src/main/java/org/citrusframework/message/builder/SendMessageBuilderSupport.java
index 4148cc6ef5..c27de01cf5 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/builder/SendMessageBuilderSupport.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/builder/SendMessageBuilderSupport.java
@@ -19,9 +19,6 @@
 import org.citrusframework.actions.SendMessageAction;
 import org.citrusframework.message.MessageProcessor;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendMessageBuilderSupport<T extends SendMessageAction, B extends SendMessageAction.SendMessageActionBuilder<T, S, B>, S extends SendMessageBuilderSupport<T, B, S>>
         extends MessageBuilderSupport<T, B, S> {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/correlation/DefaultCorrelationManager.java b/core/citrus-base/src/main/java/org/citrusframework/message/correlation/DefaultCorrelationManager.java
index ca0c2f564b..ffea23f0a1 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/correlation/DefaultCorrelationManager.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/correlation/DefaultCorrelationManager.java
@@ -25,7 +25,6 @@
  * Default correlation manager implementation works on simple in memory map for storing objects.
  * Correlation key is the map key. Clients can access objects in the store using the correlation key.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class DefaultCorrelationManager<T> implements CorrelationManager<T> {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/correlation/DefaultObjectStore.java b/core/citrus-base/src/main/java/org/citrusframework/message/correlation/DefaultObjectStore.java
index 5964ad642e..b1ea2983ef 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/correlation/DefaultObjectStore.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/correlation/DefaultObjectStore.java
@@ -21,7 +21,6 @@
 /**
  * Default object store implementation works on simple in memory hash map.
  *
- * @author Christoph Deppisch
  * @since 2.1
  */
 public class DefaultObjectStore<T> extends ConcurrentHashMap<String, T> implements ObjectStore<T> {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/correlation/PollingCorrelationManager.java b/core/citrus-base/src/main/java/org/citrusframework/message/correlation/PollingCorrelationManager.java
index 1ed5ddac9e..4c445b7c1d 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/correlation/PollingCorrelationManager.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/correlation/PollingCorrelationManager.java
@@ -27,7 +27,6 @@
  * In case object is not found in store retry is automatically performed. Polling interval and overall retry timeout
  * is usually defined in endpoint configuration.
  *
- * @author Christoph Deppisch
  * @since 2.1
  */
 public class PollingCorrelationManager<T> extends DefaultCorrelationManager<T> {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/selector/AbstractMessageSelector.java b/core/citrus-base/src/main/java/org/citrusframework/message/selector/AbstractMessageSelector.java
index 6f8d3f7ef3..716976237b 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/selector/AbstractMessageSelector.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/selector/AbstractMessageSelector.java
@@ -23,7 +23,6 @@
 import org.citrusframework.validation.matcher.ValidationMatcherUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 3.0
  */
 public abstract class AbstractMessageSelector implements MessageSelector {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/selector/DelegatingMessageSelector.java b/core/citrus-base/src/main/java/org/citrusframework/message/selector/DelegatingMessageSelector.java
index 571fea1117..f7137a0e22 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/selector/DelegatingMessageSelector.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/selector/DelegatingMessageSelector.java
@@ -30,7 +30,6 @@
  * Message selector delegates incoming messages to several other selector implementations
  * according to selector names.
  *
- * @author Christoph Deppisch
  * @since 3.0
  */
 public class DelegatingMessageSelector implements MessageSelector {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/selector/HeaderMatchingMessageSelector.java b/core/citrus-base/src/main/java/org/citrusframework/message/selector/HeaderMatchingMessageSelector.java
index eb033af24a..dad8ea6208 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/selector/HeaderMatchingMessageSelector.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/selector/HeaderMatchingMessageSelector.java
@@ -27,7 +27,6 @@
  * matching header elements are present in message header and its value matches the expected value
  * the message is accepted.
  *
- * @author Christoph Deppisch
  */
 public class HeaderMatchingMessageSelector extends AbstractMessageSelector {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/message/selector/PayloadMatchingMessageSelector.java b/core/citrus-base/src/main/java/org/citrusframework/message/selector/PayloadMatchingMessageSelector.java
index 4dc4707f9f..509f1d705c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/message/selector/PayloadMatchingMessageSelector.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/message/selector/PayloadMatchingMessageSelector.java
@@ -24,7 +24,6 @@
  * matching header elements are present in message header and its value matches the expected value
  * the message is accepted.
  *
- * @author Christoph Deppisch
  */
 public class PayloadMatchingMessageSelector extends AbstractMessageSelector {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/AbstractOutputFileReporter.java b/core/citrus-base/src/main/java/org/citrusframework/report/AbstractOutputFileReporter.java
index 9f1a66742f..72f3265347 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/AbstractOutputFileReporter.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/AbstractOutputFileReporter.java
@@ -26,7 +26,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public abstract class AbstractOutputFileReporter extends AbstractTestReporter {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestActionListener.java b/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestActionListener.java
index b1dddcf659..33b7d0c5f9 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestActionListener.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestActionListener.java
@@ -23,7 +23,6 @@
  * Basic implementation of {@link TestActionListener} interface so that subclasses only have to overwrite
  * methods of interest.
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public abstract class AbstractTestActionListener implements TestActionListener {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestListener.java b/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestListener.java
index f5934ed1b4..c3e4016407 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestListener.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestListener.java
@@ -22,7 +22,6 @@
  * Basic implementation of {@link TestListener} interface so that subclasses must not implement
  * all methods but only overwrite some listener methods.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractTestListener implements TestListener {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestReporter.java b/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestReporter.java
index fb98db2621..b96ee73886 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestReporter.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestReporter.java
@@ -20,7 +20,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public abstract class AbstractTestReporter implements TestReporter {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestSuiteListener.java b/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestSuiteListener.java
index 5e94682b90..9f5c95bdfc 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestSuiteListener.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/AbstractTestSuiteListener.java
@@ -20,7 +20,6 @@
  * Basic implementation of {@link TestSuiteListener} interface so that subclasses must not implement
  * all methods but only overwrite some listener methods.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractTestSuiteListener implements TestSuiteListener {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/DefaultTestReporters.java b/core/citrus-base/src/main/java/org/citrusframework/report/DefaultTestReporters.java
index 0a1ec5b768..517337b3b7 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/DefaultTestReporters.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/DefaultTestReporters.java
@@ -21,7 +21,6 @@
 
 /**
  *
- * @author Christoph Deppisch
  */
 public class DefaultTestReporters extends TestReporters {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/FailureStackTestListener.java b/core/citrus-base/src/main/java/org/citrusframework/report/FailureStackTestListener.java
index 30741fccfc..f33699f056 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/FailureStackTestListener.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/FailureStackTestListener.java
@@ -37,9 +37,6 @@
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
-/**
- * @author Christoph Deppisch
- */
 public class FailureStackTestListener extends AbstractTestListener {
 
     /** Logger */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/HtmlReporter.java b/core/citrus-base/src/main/java/org/citrusframework/report/HtmlReporter.java
index 469ada6d21..e093ce1e96 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/HtmlReporter.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/HtmlReporter.java
@@ -40,7 +40,6 @@
 /**
  * Basic logging reporter generating a HTML report with detailed test results.
  *
- * @author Philipp Komninos, Christoph Deppisch
  */
 public class HtmlReporter extends AbstractOutputFileReporter implements TestListener {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/HtmlReporterSettings.java b/core/citrus-base/src/main/java/org/citrusframework/report/HtmlReporterSettings.java
index 2f18613a2f..728dda1f04 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/HtmlReporterSettings.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/HtmlReporterSettings.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.report;
 
-/**
- * @author Christoph Deppisch
- */
 public class HtmlReporterSettings {
 
     private HtmlReporterSettings() {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/JUnitReporter.java b/core/citrus-base/src/main/java/org/citrusframework/report/JUnitReporter.java
index 2d3141d643..8933f3e99f 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/JUnitReporter.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/JUnitReporter.java
@@ -47,7 +47,6 @@
 import static org.apache.commons.lang3.StringEscapeUtils.escapeXml;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class JUnitReporter extends AbstractTestReporter {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/JUnitReporterSettings.java b/core/citrus-base/src/main/java/org/citrusframework/report/JUnitReporterSettings.java
index a945d30be0..c6830c2ec6 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/JUnitReporterSettings.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/JUnitReporterSettings.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.report;
 
-/**
- * @author Christoph Deppisch
- */
 public class JUnitReporterSettings {
 
     private JUnitReporterSettings() {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/MessageTracingTestListener.java b/core/citrus-base/src/main/java/org/citrusframework/report/MessageTracingTestListener.java
index f303edf1be..771973daa4 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/MessageTracingTestListener.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/MessageTracingTestListener.java
@@ -41,7 +41,6 @@
  * Note: This class is not thread safe! Parallel test execution leads to behaviour that messages get mixed.
  * Proper correlation to test case is not possible here.
  *
- * @author Christoph Deppisch
  * @since 1.2
  */
 public class MessageTracingTestListener extends AbstractTestListener implements MessageListener {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/OutputStreamReporter.java b/core/citrus-base/src/main/java/org/citrusframework/report/OutputStreamReporter.java
index 31561d627d..19c30a0f9c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/OutputStreamReporter.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/OutputStreamReporter.java
@@ -23,7 +23,6 @@
 import java.util.concurrent.CountDownLatch;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class OutputStreamReporter extends LoggingReporter {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/SummaryReporter.java b/core/citrus-base/src/main/java/org/citrusframework/report/SummaryReporter.java
index a583b11091..84baddb166 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/SummaryReporter.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/SummaryReporter.java
@@ -26,7 +26,6 @@
 /**
  * Reporter creates a summary report as file.
  *
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SummaryReporter extends AbstractOutputFileReporter {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/report/SummaryReporterSettings.java b/core/citrus-base/src/main/java/org/citrusframework/report/SummaryReporterSettings.java
index db9bbca11d..97f319b4c3 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/report/SummaryReporterSettings.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/report/SummaryReporterSettings.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.report;
 
-/**
- * @author Christoph Deppisch
- */
 public class SummaryReporterSettings {
 
     private SummaryReporterSettings() {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/server/AbstractServer.java b/core/citrus-base/src/main/java/org/citrusframework/server/AbstractServer.java
index a1840ff9e2..d9d1d14b3f 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/server/AbstractServer.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/server/AbstractServer.java
@@ -39,7 +39,6 @@
 /**
  * Abstract base class for {@link Server} implementations.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractServer extends AbstractEndpoint
         implements Server, InitializingPhase, ShutdownPhase, ReferenceResolverAware {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/server/AbstractServerBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/server/AbstractServerBuilder.java
index 0a5871a950..b1990a317c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/server/AbstractServerBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/server/AbstractServerBuilder.java
@@ -19,9 +19,6 @@
 import org.citrusframework.endpoint.AbstractEndpointBuilder;
 import org.citrusframework.endpoint.EndpointAdapter;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractServerBuilder<T extends AbstractServer, B extends AbstractServerBuilder<T, B>> extends AbstractEndpointBuilder<T> {
 
     private final B self;
diff --git a/core/citrus-base/src/main/java/org/citrusframework/util/FileUtils.java b/core/citrus-base/src/main/java/org/citrusframework/util/FileUtils.java
index 82ff139d88..ce40894de1 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/util/FileUtils.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/util/FileUtils.java
@@ -45,7 +45,6 @@
  * Class to provide general file utilities, such as listing all XML files in a directory,
  * or finding certain tests in a directory.
  *
- * @author Christoph Deppisch
  * @since 2007
  */
 public abstract class FileUtils {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/util/MessageUtils.java b/core/citrus-base/src/main/java/org/citrusframework/util/MessageUtils.java
index 87ecee0975..ac9cdb85b9 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/util/MessageUtils.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/util/MessageUtils.java
@@ -20,9 +20,6 @@
 
 import org.citrusframework.message.Message;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageUtils {
 
     /**
diff --git a/core/citrus-base/src/main/java/org/citrusframework/util/PropertyUtils.java b/core/citrus-base/src/main/java/org/citrusframework/util/PropertyUtils.java
index fd2bfcd11f..43788a1abf 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/util/PropertyUtils.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/util/PropertyUtils.java
@@ -26,7 +26,6 @@
  * Utility class supporting property replacement in template files.
  * For usage see doc generators and test case creator.
  *
- * @author Christoph Deppisch
  * @since 2009
  */
 public final class PropertyUtils {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/util/TestUtils.java b/core/citrus-base/src/main/java/org/citrusframework/util/TestUtils.java
index 09aae1db63..67ba7afd8a 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/util/TestUtils.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/util/TestUtils.java
@@ -35,7 +35,6 @@
  * Utility class for test cases providing several utility
  * methods regarding Citrus test cases.
  *
- * @author Christoph Deppisch
  */
 public abstract class TestUtils {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/AbstractValidationProcessor.java b/core/citrus-base/src/main/java/org/citrusframework/validation/AbstractValidationProcessor.java
index 9d09661c8c..245bd7a048 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/AbstractValidationProcessor.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/AbstractValidationProcessor.java
@@ -25,7 +25,6 @@
  * Validation callback automatically extracts message payload and headers so we work with
  * Java code for validation.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractValidationProcessor<T> implements ValidationProcessor, GenericValidationProcessor<T>, ReferenceResolverAware {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/DefaultHeaderValidator.java b/core/citrus-base/src/main/java/org/citrusframework/validation/DefaultHeaderValidator.java
index 3d79e8d410..85e223f2fe 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/DefaultHeaderValidator.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/DefaultHeaderValidator.java
@@ -29,7 +29,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class DefaultHeaderValidator implements HeaderValidator {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/DefaultMessageHeaderValidator.java b/core/citrus-base/src/main/java/org/citrusframework/validation/DefaultMessageHeaderValidator.java
index 48ebd75fcc..f6bcc30068 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/DefaultMessageHeaderValidator.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/DefaultMessageHeaderValidator.java
@@ -40,7 +40,6 @@
  * Basic header message validator provides message header validation. Subclasses only have to add
  * specific logic for message payload validation. This validator is based on a control message.
  *
- * @author Christoph Deppisch
  */
 public class DefaultMessageHeaderValidator extends AbstractMessageValidator<HeaderValidationContext> {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/DefaultMessageValidatorRegistry.java b/core/citrus-base/src/main/java/org/citrusframework/validation/DefaultMessageValidatorRegistry.java
index 670b9a155d..44c1f7f580 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/DefaultMessageValidatorRegistry.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/DefaultMessageValidatorRegistry.java
@@ -20,7 +20,6 @@
  * Default registry adds default message validators located via resource path lookup. This adds
  * all validators present on the classpath.
  *
- * @author Christoph Deppisch
  */
 public class DefaultMessageValidatorRegistry extends MessageValidatorRegistry {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/DelegatingPayloadVariableExtractor.java b/core/citrus-base/src/main/java/org/citrusframework/validation/DelegatingPayloadVariableExtractor.java
index 63a6430cb1..3e2c2d3ade 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/DelegatingPayloadVariableExtractor.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/DelegatingPayloadVariableExtractor.java
@@ -33,7 +33,6 @@
  * Generic extractor implementation delegating to JSONPath or XPath variable extractor based on given expression
  * type. Delegate extractor implementations are referenced through resource path lookup.
  *
- * @author Simon Hofmann
  * @since 2.7.3
  */
 public class DelegatingPayloadVariableExtractor implements VariableExtractor {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/PathExpressionValidationContext.java b/core/citrus-base/src/main/java/org/citrusframework/validation/PathExpressionValidationContext.java
index 980baf91f9..e9b4a1eb21 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/PathExpressionValidationContext.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/PathExpressionValidationContext.java
@@ -26,9 +26,6 @@
 import org.citrusframework.validation.json.JsonPathMessageValidationContext;
 import org.citrusframework.validation.xml.XpathMessageValidationContext;
 
-/**
- * @author Christoph Deppisch
- */
 public class PathExpressionValidationContext {
 
     /**
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/ValidationUtils.java b/core/citrus-base/src/main/java/org/citrusframework/validation/ValidationUtils.java
index b3b97ebfe8..d18083c144 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/ValidationUtils.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/ValidationUtils.java
@@ -31,7 +31,6 @@
 /**
  * Utility class provides helper methods for validation work in Citrus.
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public abstract class ValidationUtils {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/builder/DefaultMessageBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/validation/builder/DefaultMessageBuilder.java
index 1d930b9ab3..735966ad44 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/builder/DefaultMessageBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/builder/DefaultMessageBuilder.java
@@ -42,7 +42,6 @@
  * Default message builder delegates to given message header builders and message payload
  * builder.
  *
- * @author Christoph Deppisch
  */
 public class DefaultMessageBuilder implements MessageBuilder, WithPayloadBuilder, WithHeaderBuilder, Named {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/builder/StaticMessageBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/validation/builder/StaticMessageBuilder.java
index 810dcfbdc4..b0558a3ea4 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/builder/StaticMessageBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/builder/StaticMessageBuilder.java
@@ -33,7 +33,6 @@
  * class is primary used in unit tests and Soap message validators as we have other mechanisms there to
  * construct the control message.
  *
- * @author Christoph Deppisch
  */
 public class StaticMessageBuilder extends DefaultMessageBuilder {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/interceptor/BinaryMessageProcessor.java b/core/citrus-base/src/main/java/org/citrusframework/validation/interceptor/BinaryMessageProcessor.java
index 112849c5b1..d5bc138788 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/interceptor/BinaryMessageProcessor.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/interceptor/BinaryMessageProcessor.java
@@ -31,7 +31,6 @@
  * Message construction processor automatically converts message payloads to binary content. Supports String typed message payloads and
  * payload resources.
  *
- * @author Christoph Deppisch
  */
 public class BinaryMessageProcessor extends AbstractMessageProcessor {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/interceptor/GzipMessageProcessor.java b/core/citrus-base/src/main/java/org/citrusframework/validation/interceptor/GzipMessageProcessor.java
index d216cbdde4..9eef214472 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/interceptor/GzipMessageProcessor.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/interceptor/GzipMessageProcessor.java
@@ -36,7 +36,6 @@
  * Message processor automatically converts message payloads to gzipped content. Supports String typed message payloads and
  * payload resources.
  *
- * @author Christoph Deppisch
  */
 public class GzipMessageProcessor extends AbstractMessageProcessor {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/json/JsonMessageValidationContext.java b/core/citrus-base/src/main/java/org/citrusframework/validation/json/JsonMessageValidationContext.java
index 79a50785bf..3c4faaaec0 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/json/JsonMessageValidationContext.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/json/JsonMessageValidationContext.java
@@ -26,7 +26,6 @@
 
 /**
  * Validation context holding JSON specific validation information.
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class JsonMessageValidationContext extends DefaultValidationContext implements SchemaValidationContext {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/json/JsonPathMessageValidationContext.java b/core/citrus-base/src/main/java/org/citrusframework/validation/json/JsonPathMessageValidationContext.java
index 37e01753f3..dbd7d8e39d 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/json/JsonPathMessageValidationContext.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/json/JsonPathMessageValidationContext.java
@@ -32,7 +32,6 @@
 
 /**
  * Specialised validation context adds JSON path expressions for message validation.
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class JsonPathMessageValidationContext extends DefaultValidationContext {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/DefaultValidationMatcherLibrary.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/DefaultValidationMatcherLibrary.java
index 01a1df37f0..ad87db3edd 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/DefaultValidationMatcherLibrary.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/DefaultValidationMatcherLibrary.java
@@ -41,9 +41,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultValidationMatcherLibrary extends ValidationMatcherLibrary {
 
     /** Logger */
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/DefaultValidationMatcherRegistry.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/DefaultValidationMatcherRegistry.java
index ac9ac68aa5..1a0e05d62b 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/DefaultValidationMatcherRegistry.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/DefaultValidationMatcherRegistry.java
@@ -18,7 +18,6 @@
 
 /**
  * Default registry automatically adds default validation matcher library.
- * @author Christoph Deppisch
  */
 public class DefaultValidationMatcherRegistry extends ValidationMatcherRegistry {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/ContainsIgnoreCaseValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/ContainsIgnoreCaseValidationMatcher.java
index 3bde8e3127..5f5ba684ee 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/ContainsIgnoreCaseValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/ContainsIgnoreCaseValidationMatcher.java
@@ -25,7 +25,6 @@
 /**
  * ValidationMatcher based on String.toLowerCase().contains()
  *
- * @author Christian Wied
  */
 public class ContainsIgnoreCaseValidationMatcher implements ValidationMatcher {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/ContainsValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/ContainsValidationMatcher.java
index 9e7be3e406..91b7dcc37e 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/ContainsValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/ContainsValidationMatcher.java
@@ -25,7 +25,6 @@
 /**
  * ValidationMatcher based on String.contains()
  *
- * @author Christian Wied
  */
 public class ContainsValidationMatcher implements ValidationMatcher {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/CreateVariableValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/CreateVariableValidationMatcher.java
index e59aa269b6..a55813f0b1 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/CreateVariableValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/CreateVariableValidationMatcher.java
@@ -27,7 +27,6 @@
 /**
  * Creates new variables from given field. Either uses field name or control value as variable name.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class CreateVariableValidationMatcher implements ValidationMatcher {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/DatePatternValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/DatePatternValidationMatcher.java
index ea97fb17bc..e4b6e1330c 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/DatePatternValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/DatePatternValidationMatcher.java
@@ -28,7 +28,6 @@
 /**
  * ValidationMatcher checking for valid date format.
  *
- * @author Christian Wied
  */
 public class DatePatternValidationMatcher implements ValidationMatcher {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/DateRangeValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/DateRangeValidationMatcher.java
index 8c57697625..658fc84cfd 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/DateRangeValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/DateRangeValidationMatcher.java
@@ -34,7 +34,6 @@
  * the validation: <br />
  * from-date >= date-to-validate <= to-date
  *
- * @author Martin Maher
  * @since 2.5
  */
 public class DateRangeValidationMatcher implements ValidationMatcher {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/EmptyValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/EmptyValidationMatcher.java
index d7ca8a98db..d7ab947eb2 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/EmptyValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/EmptyValidationMatcher.java
@@ -21,9 +21,6 @@
 import org.citrusframework.validation.matcher.ValidationMatcher;
 import java.util.List;
 
-/**
- * @author Tamer Erdogan
- */
 public class EmptyValidationMatcher implements ValidationMatcher {
 
     @Override
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/EndsWithValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/EndsWithValidationMatcher.java
index fb85433604..13531d4798 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/EndsWithValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/EndsWithValidationMatcher.java
@@ -25,7 +25,6 @@
 /**
  * ValidationMatcher based on String.endsWith()
  *
- * @author Christian Wied
  */
 public class EndsWithValidationMatcher implements ValidationMatcher {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/EqualsIgnoreCaseValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/EqualsIgnoreCaseValidationMatcher.java
index 7c97ca7ac9..bfcd0b72ab 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/EqualsIgnoreCaseValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/EqualsIgnoreCaseValidationMatcher.java
@@ -25,7 +25,6 @@
 /**
  * ValidationMatcher based on String.equalsIgnoreCase()
  *
- * @author Christian Wied
  */
 public class EqualsIgnoreCaseValidationMatcher implements ValidationMatcher {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/GreaterThanValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/GreaterThanValidationMatcher.java
index e214d3fe62..1913896826 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/GreaterThanValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/GreaterThanValidationMatcher.java
@@ -25,7 +25,6 @@
 /**
  * ValidationMatcher based on Double > Double.
  *
- * @author Christian Wied
  */
 public class GreaterThanValidationMatcher implements ValidationMatcher {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/IgnoreNewLineValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/IgnoreNewLineValidationMatcher.java
index 1614d3a901..46078059b6 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/IgnoreNewLineValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/IgnoreNewLineValidationMatcher.java
@@ -25,7 +25,6 @@
 /**
  * ValidationMatcher ignores all new line characters in value and control value.
  *
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class IgnoreNewLineValidationMatcher implements ValidationMatcher {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/IgnoreValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/IgnoreValidationMatcher.java
index bcc2d63988..b5deaa66af 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/IgnoreValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/IgnoreValidationMatcher.java
@@ -25,7 +25,6 @@
 import java.util.List;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class IgnoreValidationMatcher implements ValidationMatcher {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/IsNumberValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/IsNumberValidationMatcher.java
index 7fdce6e0d7..c5be0f5973 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/IsNumberValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/IsNumberValidationMatcher.java
@@ -25,7 +25,6 @@
 /**
  * ValidationMatcher based on Double > Double.
  *
- * @author Christian Wied
  */
 public class IsNumberValidationMatcher implements ValidationMatcher {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/LowerThanValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/LowerThanValidationMatcher.java
index 3681120fd8..8096101c4b 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/LowerThanValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/LowerThanValidationMatcher.java
@@ -25,7 +25,6 @@
 /**
  * ValidationMatcher based on on Double < Double.
  *
- * @author Christian Wied
  */
 public class LowerThanValidationMatcher implements ValidationMatcher {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/MatchesValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/MatchesValidationMatcher.java
index 405949cd2c..67d1d120c2 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/MatchesValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/MatchesValidationMatcher.java
@@ -26,7 +26,6 @@
 /**
  * ValidationMatcher based on String.matches()
  *
- * @author Christian Wied
  */
 public class MatchesValidationMatcher implements ValidationMatcher {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/NotEmptyValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/NotEmptyValidationMatcher.java
index 458aac8532..0c3fd33d89 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/NotEmptyValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/NotEmptyValidationMatcher.java
@@ -21,9 +21,6 @@
 import org.citrusframework.validation.matcher.ValidationMatcher;
 import java.util.List;
 
-/**
- * @author Tamer Erdogan
- */
 public class NotEmptyValidationMatcher implements ValidationMatcher {
 
     @Override
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/NotNullValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/NotNullValidationMatcher.java
index 2e9f2b350b..cf39840a0b 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/NotNullValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/NotNullValidationMatcher.java
@@ -21,9 +21,6 @@
 import org.citrusframework.validation.matcher.ValidationMatcher;
 import java.util.List;
 
-/**
- * @author Tamer Erdogan
- */
 public class NotNullValidationMatcher implements ValidationMatcher {
 
     @Override
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/NullValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/NullValidationMatcher.java
index a4c88dce39..7bee67f726 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/NullValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/NullValidationMatcher.java
@@ -21,9 +21,6 @@
 import org.citrusframework.validation.matcher.ValidationMatcher;
 import java.util.List;
 
-/**
- * @author Tamer Erdogan
- */
 public class NullValidationMatcher implements ValidationMatcher {
 
     @Override
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/StartsWithValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/StartsWithValidationMatcher.java
index 1b91a3c674..904884eb98 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/StartsWithValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/StartsWithValidationMatcher.java
@@ -25,7 +25,6 @@
 /**
  * ValidationMatcher based on String.startsWith()
  *
- * @author Christian Wied
  */
 public class StartsWithValidationMatcher implements ValidationMatcher {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/StringLengthValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/StringLengthValidationMatcher.java
index a6d1179fa8..c07544aa94 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/StringLengthValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/StringLengthValidationMatcher.java
@@ -25,7 +25,6 @@
 /**
  * ValidationMatcher checks string length of given field.
  *
- * @author Christoph Deppisch
  */
 public class StringLengthValidationMatcher implements ValidationMatcher {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/TrimAllWhitespacesValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/TrimAllWhitespacesValidationMatcher.java
index 5340f40248..aee2e78816 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/TrimAllWhitespacesValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/TrimAllWhitespacesValidationMatcher.java
@@ -25,7 +25,6 @@
 /**
  * ValidationMatcher trims leading and trailing whitespaces in value and control value.
  *
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class TrimAllWhitespacesValidationMatcher implements ValidationMatcher {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/TrimValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/TrimValidationMatcher.java
index 6db99ffc44..1444def6d8 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/TrimValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/TrimValidationMatcher.java
@@ -25,7 +25,6 @@
 /**
  * ValidationMatcher trims leading and trailing whitespaces in value and control value.
  *
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class TrimValidationMatcher implements ValidationMatcher {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/WeekdayValidationMatcher.java b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/WeekdayValidationMatcher.java
index 98f3d81204..e896d42255 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/WeekdayValidationMatcher.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/matcher/core/WeekdayValidationMatcher.java
@@ -39,7 +39,6 @@
  * In addition to that user can specify the date format to parse:
  * MONDAY(YYYY-MM-DD)
  *
- * @author Christoph Deppisch
  * @since 1.3.1
  */
 public class WeekdayValidationMatcher implements ValidationMatcher, ControlExpressionParser {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/script/ScriptValidationContext.java b/core/citrus-base/src/main/java/org/citrusframework/validation/script/ScriptValidationContext.java
index e5dfcce527..5e4ebe3448 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/script/ScriptValidationContext.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/script/ScriptValidationContext.java
@@ -32,7 +32,6 @@
  * Basic script validation context providing the validation code either from file resource or
  * from direct script string.
  *
- * @author Christoph Deppisch
  */
 public class ScriptValidationContext extends DefaultValidationContext {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/script/TemplateBasedScriptBuilder.java b/core/citrus-base/src/main/java/org/citrusframework/validation/script/TemplateBasedScriptBuilder.java
index fc1a25c493..b9c7c1ba66 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/script/TemplateBasedScriptBuilder.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/script/TemplateBasedScriptBuilder.java
@@ -28,7 +28,6 @@
  * Script builder builds a script with custom code body. Script header and tail come from static
  * script template.
  *
- * @author Christoph Deppisch
  */
 public final class TemplateBasedScriptBuilder {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/script/sql/SqlResultSetScriptValidator.java b/core/citrus-base/src/main/java/org/citrusframework/validation/script/sql/SqlResultSetScriptValidator.java
index 7a5311e3a5..65ac950ec6 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/script/sql/SqlResultSetScriptValidator.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/script/sql/SqlResultSetScriptValidator.java
@@ -31,7 +31,6 @@
  * Validator working on SQL result sets. Scripts get the actual test context
  * and a SQL result set representation for validation.
  *
- * @author Christoph Deppisch
  */
 public interface SqlResultSetScriptValidator {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/xml/XmlMessageValidationContext.java b/core/citrus-base/src/main/java/org/citrusframework/validation/xml/XmlMessageValidationContext.java
index 407d870e87..301868d97e 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/xml/XmlMessageValidationContext.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/xml/XmlMessageValidationContext.java
@@ -29,7 +29,6 @@
  * XML validation context holding validation specific information needed for XML
  * message validation.
  *
- * @author Christoph Deppisch
  */
 public class XmlMessageValidationContext extends DefaultValidationContext implements SchemaValidationContext {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/validation/xml/XpathMessageValidationContext.java b/core/citrus-base/src/main/java/org/citrusframework/validation/xml/XpathMessageValidationContext.java
index fc7d6d264c..5ffddac1ef 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/validation/xml/XpathMessageValidationContext.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/validation/xml/XpathMessageValidationContext.java
@@ -30,7 +30,6 @@
 
 /**
  * Specialised Xml validation context adds XPath expression evaluation.
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class XpathMessageValidationContext extends XmlMessageValidationContext {
diff --git a/core/citrus-base/src/main/java/org/citrusframework/variable/MessageHeaderVariableExtractor.java b/core/citrus-base/src/main/java/org/citrusframework/variable/MessageHeaderVariableExtractor.java
index 93b081c754..004f4164ec 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/variable/MessageHeaderVariableExtractor.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/variable/MessageHeaderVariableExtractor.java
@@ -30,7 +30,6 @@
 /**
  * Variable extractor reading message headers and saves them to new test variables.
  *
- * @author Christoph Deppisch
  */
 public class MessageHeaderVariableExtractor implements VariableExtractor {
 
diff --git a/core/citrus-base/src/main/java/org/citrusframework/variable/dictionary/AbstractDataDictionary.java b/core/citrus-base/src/main/java/org/citrusframework/variable/dictionary/AbstractDataDictionary.java
index 7fd71e7159..3158114b68 100644
--- a/core/citrus-base/src/main/java/org/citrusframework/variable/dictionary/AbstractDataDictionary.java
+++ b/core/citrus-base/src/main/java/org/citrusframework/variable/dictionary/AbstractDataDictionary.java
@@ -30,7 +30,6 @@
 
 /**
  * Abstract data dictionary implementation provides global scope handling.
- * @author Christoph Deppisch
  */
 public abstract class AbstractDataDictionary<T> extends AbstractMessageProcessor implements DataDictionary<T> {
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/CitrusContextProviderTest.java b/core/citrus-base/src/test/java/org/citrusframework/CitrusContextProviderTest.java
index 606b5d0895..312302c5d3 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/CitrusContextProviderTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/CitrusContextProviderTest.java
@@ -19,9 +19,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CitrusContextProviderTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/CitrusContextTest.java b/core/citrus-base/src/test/java/org/citrusframework/CitrusContextTest.java
index a3d85e2055..c3008d3e6a 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/CitrusContextTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/CitrusContextTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CitrusContextTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/TestMetaInfoTest.java b/core/citrus-base/src/test/java/org/citrusframework/TestMetaInfoTest.java
index bdca7b7bcf..19d684b039 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/TestMetaInfoTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/TestMetaInfoTest.java
@@ -18,9 +18,6 @@
 
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestMetaInfoTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/UnitTestSupport.java b/core/citrus-base/src/test/java/org/citrusframework/UnitTestSupport.java
index dd2dd000d7..e292b9083d 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/UnitTestSupport.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/UnitTestSupport.java
@@ -20,9 +20,6 @@
 import org.citrusframework.context.TestContextFactory;
 import org.testng.annotations.BeforeMethod;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport {
 
     protected TestContextFactory testContextFactory;
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/AbstractAsyncTestActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/AbstractAsyncTestActionTest.java
index c3b8d4cd1a..3979ac2ca6 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/AbstractAsyncTestActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/AbstractAsyncTestActionTest.java
@@ -29,7 +29,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class AbstractAsyncTestActionTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/AntRunActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/AntRunActionTest.java
index 583361255d..be3b663b87 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/AntRunActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/AntRunActionTest.java
@@ -28,9 +28,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AntRunActionTest extends UnitTestSupport {
 
 	@Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/ApplyTestBehaviorActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/ApplyTestBehaviorActionTest.java
index b62b6a79ca..afb0d69a98 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/ApplyTestBehaviorActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/ApplyTestBehaviorActionTest.java
@@ -27,9 +27,6 @@
 
 import static org.mockito.Mockito.verify;
 
-/**
- * @author Christoph Deppisch
- */
 public class ApplyTestBehaviorActionTest extends UnitTestSupport {
 
     @Mock
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/CreateVariablesActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/CreateVariablesActionTest.java
index bc9d5b5c0d..c8a83470f0 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/CreateVariablesActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/CreateVariablesActionTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CreateVariablesActionTest extends UnitTestSupport {
 
 	@Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/EchoActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/EchoActionTest.java
index 5d4d626b98..cfba20948a 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/EchoActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/EchoActionTest.java
@@ -20,9 +20,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class EchoActionTest extends UnitTestSupport {
 
 	@Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/FailActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/FailActionTest.java
index bf1d40e987..6d4dbd3cd3 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/FailActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/FailActionTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class FailActionTest extends UnitTestSupport {
 
 	@Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/InputActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/InputActionTest.java
index 7b36a811b9..e563faf0e0 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/InputActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/InputActionTest.java
@@ -28,9 +28,6 @@
 import static org.mockito.Mockito.when;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class InputActionTest extends UnitTestSupport {
 
     private BufferedReader inputReader = Mockito.mock(BufferedReader.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/JavaActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/JavaActionTest.java
index c68117d048..aacfb10255 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/JavaActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/JavaActionTest.java
@@ -24,9 +24,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class JavaActionTest extends UnitTestSupport {
 
 	@Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/LoadPropertiesActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/LoadPropertiesActionTest.java
index dbec3ec424..87540923a9 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/LoadPropertiesActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/LoadPropertiesActionTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class LoadPropertiesActionTest extends UnitTestSupport {
 
 	@Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/PurgeEndpointActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/PurgeEndpointActionTest.java
index 2e7a882706..b77472e1e5 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/PurgeEndpointActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/PurgeEndpointActionTest.java
@@ -32,9 +32,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class PurgeEndpointActionTest extends UnitTestSupport {
 
     private Endpoint mockEndpoint = Mockito.mock(Endpoint.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveMessageActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveMessageActionTest.java
index 55ec004f0c..cacfb4465d 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveMessageActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveMessageActionTest.java
@@ -65,9 +65,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.expectThrows;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageActionTest extends UnitTestSupport {
 
     @Mock
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveTimeoutActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveTimeoutActionTest.java
index 43d2eb27db..2c37464606 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveTimeoutActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/ReceiveTimeoutActionTest.java
@@ -30,9 +30,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveTimeoutActionTest extends UnitTestSupport {
 
     private Endpoint endpoint = Mockito.mock(Endpoint.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/SendMessageActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/SendMessageActionTest.java
index 7c5a7764ac..a57d607aee 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/SendMessageActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/SendMessageActionTest.java
@@ -57,9 +57,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendMessageActionTest extends UnitTestSupport {
 
     private Endpoint endpoint = mock(Endpoint.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/SleepActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/SleepActionTest.java
index 0170872205..42a1a85115 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/SleepActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/SleepActionTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.UnitTestSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SleepActionTest extends UnitTestSupport {
 
 	@Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/StartServerActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/StartServerActionTest.java
index 3aaa898ae8..c0978d7ad4 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/StartServerActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/StartServerActionTest.java
@@ -27,9 +27,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class StartServerActionTest extends UnitTestSupport {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/StopServerActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/StopServerActionTest.java
index 9a897b68a6..1c3a541a2c 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/StopServerActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/StopServerActionTest.java
@@ -29,9 +29,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopServerActionTest extends UnitTestSupport {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/StopTimeActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/StopTimeActionTest.java
index cd8c339266..c7449391fa 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/StopTimeActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/StopTimeActionTest.java
@@ -20,9 +20,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopTimeActionTest extends UnitTestSupport {
 
 	@Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/StopTimerActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/StopTimerActionTest.java
index 1a11717fbc..57a00f7a61 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/StopTimerActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/StopTimerActionTest.java
@@ -26,7 +26,6 @@
 import static org.mockito.Mockito.verify;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class StopTimerActionTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/TestActionBuilderLookupTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/TestActionBuilderLookupTest.java
index b378de0d7a..21172fd32b 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/TestActionBuilderLookupTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/TestActionBuilderLookupTest.java
@@ -34,9 +34,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestActionBuilderLookupTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/TraceVariablesActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/TraceVariablesActionTest.java
index 7e33f7a868..4e6223d2de 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/TraceVariablesActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/TraceVariablesActionTest.java
@@ -20,9 +20,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TraceVariablesActionTest extends UnitTestSupport {
 
 	@Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/TransformActionTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/TransformActionTest.java
index 1c70b22d0a..bd746e38ea 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/TransformActionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/TransformActionTest.java
@@ -20,9 +20,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Philipp Komninos
- */
 public class TransformActionTest extends UnitTestSupport {
 
 	@Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/WaitTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/WaitTest.java
index 8f9e323b17..7fa8c8ac21 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/WaitTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/WaitTest.java
@@ -28,7 +28,6 @@
 import static org.testng.Assert.fail;
 
 /**
- * @author Martin Maher
  * @since 2.4
  */
 public class WaitTest {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java
index f1744f919b..cdba297247 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java
@@ -65,9 +65,6 @@
 import static org.citrusframework.validation.xml.XmlMessageValidationContext.Builder.xml;
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageActionBuilderTest extends UnitTestSupport {
 
     @Mock
diff --git a/core/citrus-base/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java b/core/citrus-base/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java
index 52af03b1b3..97308267f3 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java
@@ -59,9 +59,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendMessageActionBuilderTest extends UnitTestSupport {
 
     private final ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/condition/ActionConditionTest.java b/core/citrus-base/src/test/java/org/citrusframework/condition/ActionConditionTest.java
index e20b256997..16b97a4488 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/condition/ActionConditionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/condition/ActionConditionTest.java
@@ -26,7 +26,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class ActionConditionTest {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/condition/FileConditionTest.java b/core/citrus-base/src/test/java/org/citrusframework/condition/FileConditionTest.java
index 10bb106748..0aaafebc14 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/condition/FileConditionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/condition/FileConditionTest.java
@@ -23,7 +23,6 @@
 import static org.testng.Assert.assertTrue;
 
 /**
- * @author Martin Maher
  * @since 2.4
  */
 public class FileConditionTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/condition/HttpConditionTest.java b/core/citrus-base/src/test/java/org/citrusframework/condition/HttpConditionTest.java
index eb1217c319..8010cccebe 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/condition/HttpConditionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/condition/HttpConditionTest.java
@@ -30,7 +30,6 @@
 
 
 /**
- * @author Martin Maher
  * @since 2.4
  */
 public class HttpConditionTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/condition/MessageConditionTest.java b/core/citrus-base/src/test/java/org/citrusframework/condition/MessageConditionTest.java
index 4a26fe4f20..2d505dee8c 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/condition/MessageConditionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/condition/MessageConditionTest.java
@@ -28,7 +28,6 @@
 
 
 /**
- * @author Martin Maher
  * @since 2.6.2
  */
 public class MessageConditionTest {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/AssertTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/AssertTest.java
index 1ddcbbde92..431e6bf7eb 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/AssertTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/AssertTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AssertTest extends UnitTestSupport {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/AsyncTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/AsyncTest.java
index a11116b2fd..5283be9dc9 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/AsyncTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/AsyncTest.java
@@ -40,7 +40,6 @@
 import static org.mockito.Mockito.verify;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class AsyncTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/CatchTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/CatchTest.java
index 6baa28be4a..b9db9ce13c 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/CatchTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/CatchTest.java
@@ -28,9 +28,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-/**
- * @author Christoph Deppisch
- */
 public class CatchTest extends UnitTestSupport {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/ConditionalTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/ConditionalTest.java
index 1bc028e3da..57c427530e 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/ConditionalTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/ConditionalTest.java
@@ -28,7 +28,6 @@
 import static org.mockito.Mockito.verify;
 
 /**
- * @author Matthias Beil
  * @since 1.2
  */
 public class ConditionalTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/IterateTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/IterateTest.java
index 621ec3f1b6..84e302432a 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/IterateTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/IterateTest.java
@@ -28,9 +28,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-/**
- * @author Christoph Deppisch
- */
 public class IterateTest extends UnitTestSupport {
 
     private TestAction action = Mockito.mock(TestAction.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/ParallelTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/ParallelTest.java
index 3401a091e6..6aa3d45c52 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/ParallelTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/ParallelTest.java
@@ -32,9 +32,6 @@
 import static org.mockito.Mockito.verify;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class ParallelTest extends UnitTestSupport {
 
     private TestAction action = Mockito.mock(TestAction.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/RepeatOnErrorUntilTrueTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/RepeatOnErrorUntilTrueTest.java
index 1902165dc2..83ac658eda 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/RepeatOnErrorUntilTrueTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/RepeatOnErrorUntilTrueTest.java
@@ -28,9 +28,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-/**
- * @author Christoph Deppisch
- */
 public class RepeatOnErrorUntilTrueTest extends UnitTestSupport {
 
     private TestAction action = Mockito.mock(TestAction.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java
index 42c9299e92..c69e858e91 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java
@@ -28,9 +28,6 @@
 import static org.mockito.Mockito.verify;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class RepeatUntilTrueTest extends UnitTestSupport {
 
     private TestAction action = Mockito.mock(TestAction.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/SequenceTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/SequenceTest.java
index afa0e194fa..9d13a4a512 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/SequenceTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/SequenceTest.java
@@ -27,9 +27,6 @@
 import static org.mockito.Mockito.verify;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class SequenceTest extends UnitTestSupport {
 
     private TestAction action = Mockito.mock(TestAction.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/TemplateTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/TemplateTest.java
index ab0b116715..9f6fa0babc 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/TemplateTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/TemplateTest.java
@@ -31,9 +31,6 @@
 import static org.mockito.Mockito.verify;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class TemplateTest extends UnitTestSupport {
 
     private final TestAction action = Mockito.mock(TestAction.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/container/TimerTest.java b/core/citrus-base/src/test/java/org/citrusframework/container/TimerTest.java
index a86df6d95e..77213fc50e 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/container/TimerTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/container/TimerTest.java
@@ -33,7 +33,6 @@
 import static org.testng.Assert.assertNotNull;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class TimerTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/context/TestContextTest.java b/core/citrus-base/src/test/java/org/citrusframework/context/TestContextTest.java
index dc86ee3550..459603bc7a 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/context/TestContextTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/context/TestContextTest.java
@@ -45,9 +45,6 @@
 import static org.mockito.Mockito.verify;
 import static org.testng.Assert.fail;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestContextTest extends UnitTestSupport {
 
     private final GlobalVariables globalVariables = new GlobalVariables();
diff --git a/core/citrus-base/src/test/java/org/citrusframework/dictionary/SimpleMappingDictionary.java b/core/citrus-base/src/test/java/org/citrusframework/dictionary/SimpleMappingDictionary.java
index c45bb0419f..c5a889176d 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/dictionary/SimpleMappingDictionary.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/dictionary/SimpleMappingDictionary.java
@@ -23,9 +23,6 @@
 import org.citrusframework.message.Message;
 import org.citrusframework.variable.dictionary.AbstractDataDictionary;
 
-/**
- * @author Christoph Deppisch
- */
 public class SimpleMappingDictionary extends AbstractDataDictionary<String> {
 
     private final Map<String, String> mappings;
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/AbstractEndpointAdapterTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/AbstractEndpointAdapterTest.java
index ec88ad4211..22e0927b97 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/AbstractEndpointAdapterTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/AbstractEndpointAdapterTest.java
@@ -25,9 +25,6 @@
 import static org.mockito.Mockito.*;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractEndpointAdapterTest {
 
     /** Endpoint adapter mock */
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/AbstractEndpointBuilderTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/AbstractEndpointBuilderTest.java
index 14f26c26f6..0296245da3 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/AbstractEndpointBuilderTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/AbstractEndpointBuilderTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractEndpointBuilderTest extends UnitTestSupport {
 
     @CitrusEndpoint(
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/DefaultEndpointFactoryTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/DefaultEndpointFactoryTest.java
index 1c7bc88942..f67c80c891 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/DefaultEndpointFactoryTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/DefaultEndpointFactoryTest.java
@@ -32,9 +32,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultEndpointFactoryTest {
 
     private ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/EmptyResponseEndpointAdapterTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/EmptyResponseEndpointAdapterTest.java
index 79ecdbdc54..c8393c8c48 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/EmptyResponseEndpointAdapterTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/EmptyResponseEndpointAdapterTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class EmptyResponseEndpointAdapterTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/RequestDispatchingEndpointAdapterTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/RequestDispatchingEndpointAdapterTest.java
index a8b7ee2384..474402d556 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/RequestDispatchingEndpointAdapterTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/RequestDispatchingEndpointAdapterTest.java
@@ -24,9 +24,6 @@
 
 import static java.util.Collections.singletonMap;
 
-/**
- * @author Christoph Deppisch
- */
 public class RequestDispatchingEndpointAdapterTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/StaticEndpointAdapterTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/StaticEndpointAdapterTest.java
index d8735ae58f..18e9d5c77b 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/StaticEndpointAdapterTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/StaticEndpointAdapterTest.java
@@ -21,9 +21,6 @@
 import org.citrusframework.message.Message;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StaticEndpointAdapterTest {
 
     @Test(expectedExceptions = CitrusRuntimeException.class)
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/StaticResponseEndpointAdapterTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/StaticResponseEndpointAdapterTest.java
index 1b91eabb69..f66d083b8f 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/StaticResponseEndpointAdapterTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/StaticResponseEndpointAdapterTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StaticResponseEndpointAdapterTest extends UnitTestSupport {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/TimeoutProducingEndpointAdapterTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/TimeoutProducingEndpointAdapterTest.java
index 74b7fa871f..6cb42766d0 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/TimeoutProducingEndpointAdapterTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/TimeoutProducingEndpointAdapterTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TimeoutProducingEndpointAdapterTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/AbstractMappingKeyExtractorTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/AbstractMappingKeyExtractorTest.java
index 24d645c2e2..2218ba534c 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/AbstractMappingKeyExtractorTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/AbstractMappingKeyExtractorTest.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class AbstractMappingKeyExtractorTest {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/BeanNameMappingStrategyTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/BeanNameMappingStrategyTest.java
index 3ba531ece5..e0c57db156 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/BeanNameMappingStrategyTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/BeanNameMappingStrategyTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class BeanNameMappingStrategyTest {
 
     private SimpleReferenceResolver referenceResolver = new SimpleReferenceResolver();
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/HeaderMappingKeyExtractorTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/HeaderMappingKeyExtractorTest.java
index 2de6e80c91..cf93cc2e75 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/HeaderMappingKeyExtractorTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/HeaderMappingKeyExtractorTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class HeaderMappingKeyExtractorTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/SimpleMappingStrategyTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/SimpleMappingStrategyTest.java
index b57908562b..10ce1c4552 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/SimpleMappingStrategyTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/SimpleMappingStrategyTest.java
@@ -26,7 +26,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class SimpleMappingStrategyTest {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/SoapActionMappingKeyExtractorTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/SoapActionMappingKeyExtractorTest.java
index 9fb75f9cf8..2285c3c752 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/SoapActionMappingKeyExtractorTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/adapter/mapping/SoapActionMappingKeyExtractorTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapActionMappingKeyExtractorTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointAdapterTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointAdapterTest.java
index 5af48a86d3..eac37ce042 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointAdapterTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointAdapterTest.java
@@ -30,9 +30,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectEndpointAdapterTest {
 
     private MessageQueue queue = new DefaultMessageQueue("testQueue");
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointComponentTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointComponentTest.java
index 49f23f1915..f627e16c2d 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointComponentTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointComponentTest.java
@@ -27,9 +27,6 @@
 import org.testng.annotations.Test;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectEndpointComponentTest {
 
     private TestContext context;
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointConsumerTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointConsumerTest.java
index 6eb20ef6ff..d43d319c8e 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointConsumerTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointConsumerTest.java
@@ -39,9 +39,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectEndpointConsumerTest {
 
     private MessageQueue queue = Mockito.mock(MessageQueue.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointProducerTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointProducerTest.java
index dc6300b08e..3ff87fd127 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointProducerTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointProducerTest.java
@@ -33,9 +33,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectEndpointProducerTest {
 
     private MessageQueue queue = Mockito.mock(MessageQueue.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointSyncConsumerTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointSyncConsumerTest.java
index 7a41bf7644..c967cf41b6 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointSyncConsumerTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointSyncConsumerTest.java
@@ -41,9 +41,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectEndpointSyncConsumerTest {
 
     private final MessageQueue queue = Mockito.mock(MessageQueue.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointSyncProducerTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointSyncProducerTest.java
index 583ca444b6..d3b6e41cb5 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointSyncProducerTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointSyncProducerTest.java
@@ -39,9 +39,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectEndpointSyncProducerTest {
 
     private MessageQueue queue = Mockito.mock(MessageQueue.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointsTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointsTest.java
index b416ab2890..9275c17328 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointsTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/DirectEndpointsTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectEndpointsTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/annotation/DirectEndpointConfigParserTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/annotation/DirectEndpointConfigParserTest.java
index 202f62b5c0..eefc5fbb3b 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/annotation/DirectEndpointConfigParserTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/annotation/DirectEndpointConfigParserTest.java
@@ -37,9 +37,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectEndpointConfigParserTest {
 
     @CitrusEndpoint
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/annotation/DirectSyncEndpointConfigParserTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/annotation/DirectSyncEndpointConfigParserTest.java
index 5cc0ab9f23..742c9305d1 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/annotation/DirectSyncEndpointConfigParserTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/direct/annotation/DirectSyncEndpointConfigParserTest.java
@@ -39,9 +39,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class DirectSyncEndpointConfigParserTest {
 
     @CitrusEndpoint
diff --git a/core/citrus-base/src/test/java/org/citrusframework/endpoint/resolver/DynamicEndpointUriResolverTest.java b/core/citrus-base/src/test/java/org/citrusframework/endpoint/resolver/DynamicEndpointUriResolverTest.java
index c2bb5a6ede..23b665944a 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/endpoint/resolver/DynamicEndpointUriResolverTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/endpoint/resolver/DynamicEndpointUriResolverTest.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class DynamicEndpointUriResolverTest {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/FunctionUtilsTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/FunctionUtilsTest.java
index 9fb0caccf6..e006b0c0ba 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/FunctionUtilsTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/FunctionUtilsTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class FunctionUtilsTest extends UnitTestSupport {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/AbsoluteFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/AbsoluteFunctionTest.java
index 2fa60f5d6a..405a4c3fff 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/AbsoluteFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/AbsoluteFunctionTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbsoluteFunctionTest extends UnitTestSupport {
     AbsoluteFunction function = new AbsoluteFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/AvgFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/AvgFunctionTest.java
index a0feaf6eab..11c710b31b 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/AvgFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/AvgFunctionTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AvgFunctionTest extends UnitTestSupport {
     AvgFunction function = new AvgFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/CeilingFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/CeilingFunctionTest.java
index f47bf4ab56..8c17593818 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/CeilingFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/CeilingFunctionTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CeilingFunctionTest extends UnitTestSupport {
     CeilingFunction function = new CeilingFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/ChangeDateFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/ChangeDateFunctionTest.java
index 5a378518c9..da15d31eda 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/ChangeDateFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/ChangeDateFunctionTest.java
@@ -33,9 +33,6 @@
 
 import static org.mockito.Mockito.doReturn;
 
-/**
- * @author Christoph Deppisch
- */
 public class ChangeDateFunctionTest extends UnitTestSupport {
 
     @Mock
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/ConcatFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/ConcatFunctionTest.java
index 5caba79d4e..582a10600b 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/ConcatFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/ConcatFunctionTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ConcatFunctionTest extends UnitTestSupport {
     ConcatFunction function = new ConcatFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/CurrentDateFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/CurrentDateFunctionTest.java
index e2f7230450..6bdf0157ab 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/CurrentDateFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/CurrentDateFunctionTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CurrentDateFunctionTest extends UnitTestSupport {
     CurrentDateFunction function = new CurrentDateFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/DecodeBase64FunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/DecodeBase64FunctionTest.java
index bc47899a32..e618242e23 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/DecodeBase64FunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/DecodeBase64FunctionTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DecodeBase64FunctionTest extends UnitTestSupport {
     private final DecodeBase64Function function = new DecodeBase64Function();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/DigestAuthHeaderFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/DigestAuthHeaderFunctionTest.java
index 40f873dc5a..878cd6285e 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/DigestAuthHeaderFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/DigestAuthHeaderFunctionTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DigestAuthHeaderFunctionTest extends UnitTestSupport {
 
     DigestAuthHeaderFunction function = new DigestAuthHeaderFunction();
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/EncodeBase64FunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/EncodeBase64FunctionTest.java
index 3612077ce7..4521c271a0 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/EncodeBase64FunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/EncodeBase64FunctionTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class EncodeBase64FunctionTest extends UnitTestSupport {
     private final EncodeBase64Function function = new EncodeBase64Function();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/FloorFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/FloorFunctionTest.java
index ee82170689..a8d4a24fc7 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/FloorFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/FloorFunctionTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class FloorFunctionTest extends UnitTestSupport {
     FloorFunction function = new FloorFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/LoadMessageFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/LoadMessageFunctionTest.java
index b63316b6d8..9f1d341c5b 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/LoadMessageFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/LoadMessageFunctionTest.java
@@ -26,7 +26,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class LoadMessageFunctionTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/LocalHostAddressFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/LocalHostAddressFunctionTest.java
index ce2675ba24..313105a615 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/LocalHostAddressFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/LocalHostAddressFunctionTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class LocalHostAddressFunctionTest extends UnitTestSupport {
 
     LocalHostAddressFunction function = new LocalHostAddressFunction();
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/LowerCaseFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/LowerCaseFunctionTest.java
index 2196345b59..920ab42ce6 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/LowerCaseFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/LowerCaseFunctionTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class LowerCaseFunctionTest extends UnitTestSupport {
     LowerCaseFunction function = new LowerCaseFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/MapValueFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/MapValueFunctionTest.java
index 1c381d69d0..a931f41fb5 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/MapValueFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/MapValueFunctionTest.java
@@ -29,7 +29,6 @@
 
 /**
  * Test the {@link MapValueFunction} function.
- * @author Dimo Velev (dimo.velev@gmail.com)
  *
  */
 public class MapValueFunctionTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/MaxFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/MaxFunctionTest.java
index 0779dfeb6d..e793d5cee8 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/MaxFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/MaxFunctionTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MaxFunctionTest extends UnitTestSupport {
     MaxFunction function = new MaxFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/MinFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/MinFunctionTest.java
index 250c2ca485..fef9da8dd2 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/MinFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/MinFunctionTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MinFunctionTest extends UnitTestSupport {
     MinFunction function = new MinFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomEnumValueFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomEnumValueFunctionTest.java
index e12c77615f..39089280be 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomEnumValueFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomEnumValueFunctionTest.java
@@ -31,7 +31,6 @@
 /**
  * Test the {@link RandomEnumValueFunction} function.
  *
- * @author Dimo Velev (dimo.velev@gmail.com)
  *
  */
 public class RandomEnumValueFunctionTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomNumberFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomNumberFunctionTest.java
index c3b1976233..99f7610473 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomNumberFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomNumberFunctionTest.java
@@ -28,9 +28,6 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
-/**
- * @author Christoph Deppisch
- */
 public class RandomNumberFunctionTest extends UnitTestSupport {
     private final RandomNumberFunction function = new RandomNumberFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomStringFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomStringFunctionTest.java
index 0d06a912b1..34b982a486 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomStringFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomStringFunctionTest.java
@@ -27,9 +27,6 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
-/**
- * @author Christoph Deppisch
- */
 public class RandomStringFunctionTest extends UnitTestSupport {
     private RandomStringFunction function = new RandomStringFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomUUIDFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomUUIDFunctionTest.java
index da106452db..5f55871025 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomUUIDFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/RandomUUIDFunctionTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RandomUUIDFunctionTest extends UnitTestSupport {
     RandomUUIDFunction function = new RandomUUIDFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/ReadFileResourceFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/ReadFileResourceFunctionTest.java
index 4a293a5127..d4ea875370 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/ReadFileResourceFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/ReadFileResourceFunctionTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class ReadFileResourceFunctionTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/RoundFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/RoundFunctionTest.java
index 0d277abeaa..003c0663d1 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/RoundFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/RoundFunctionTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RoundFunctionTest extends UnitTestSupport {
     RoundFunction function = new RoundFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/StringLengthFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/StringLengthFunctionTest.java
index c3fbe8733a..922047cb29 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/StringLengthFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/StringLengthFunctionTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StringLengthFunctionTest extends UnitTestSupport {
     StringLengthFunction function = new StringLengthFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/SubstringAfterFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/SubstringAfterFunctionTest.java
index bbe28065e9..c916e8c76f 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/SubstringAfterFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/SubstringAfterFunctionTest.java
@@ -26,9 +26,6 @@
 
 import static java.util.Collections.emptyList;
 
-/**
- * @author Christoph Deppisch
- */
 public class SubstringAfterFunctionTest extends UnitTestSupport {
     SubstringAfterFunction function = new SubstringAfterFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/SubstringBeforeFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/SubstringBeforeFunctionTest.java
index 29a5ad2ea7..12c2fbe57d 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/SubstringBeforeFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/SubstringBeforeFunctionTest.java
@@ -26,9 +26,6 @@
 
 import static java.util.Collections.emptyList;
 
-/**
- * @author Christoph Deppisch
- */
 public class SubstringBeforeFunctionTest extends UnitTestSupport {
     SubstringBeforeFunction function = new SubstringBeforeFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/SubstringFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/SubstringFunctionTest.java
index f03e27699b..8042b1effb 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/SubstringFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/SubstringFunctionTest.java
@@ -27,9 +27,6 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
-/**
- * @author Christoph Deppisch
- */
 public class SubstringFunctionTest extends UnitTestSupport {
     SubstringFunction function = new SubstringFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/SumFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/SumFunctionTest.java
index 34426b6b29..dfa012037f 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/SumFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/SumFunctionTest.java
@@ -27,9 +27,6 @@
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 
-/**
- * @author Christoph Deppisch
- */
 public class SumFunctionTest extends UnitTestSupport {
     SumFunction function = new SumFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/SystemPropertyFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/SystemPropertyFunctionTest.java
index cd5ec24e4e..f239ef2ed4 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/SystemPropertyFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/SystemPropertyFunctionTest.java
@@ -26,7 +26,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SystemPropertyFunctionTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/TranslateFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/TranslateFunctionTest.java
index 57436ebeaf..825885aa12 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/TranslateFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/TranslateFunctionTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TranslateFunctionTest extends UnitTestSupport {
     TranslateFunction function = new TranslateFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/UpperCaseFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/UpperCaseFunctionTest.java
index 5f752ce865..6b5cca6e4c 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/UpperCaseFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/UpperCaseFunctionTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class UpperCaseFunctionTest extends UnitTestSupport {
     UpperCaseFunction function = new UpperCaseFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/UrlDecodeFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/UrlDecodeFunctionTest.java
index ae1fb28194..61a6e9169a 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/UrlDecodeFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/UrlDecodeFunctionTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class UrlDecodeFunctionTest extends UnitTestSupport {
     private UrlDecodeFunction function = new UrlDecodeFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/functions/core/UrlEncodeFunctionTest.java b/core/citrus-base/src/test/java/org/citrusframework/functions/core/UrlEncodeFunctionTest.java
index bab194c53f..3eb9b2474c 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/functions/core/UrlEncodeFunctionTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/functions/core/UrlEncodeFunctionTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class UrlEncodeFunctionTest extends UnitTestSupport {
     private final UrlEncodeFunction function = new UrlEncodeFunction();
 
diff --git a/core/citrus-base/src/test/java/org/citrusframework/log/DefaultLogModifierTest.java b/core/citrus-base/src/test/java/org/citrusframework/log/DefaultLogModifierTest.java
index 25741ef2ec..62b0f1124d 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/log/DefaultLogModifierTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/log/DefaultLogModifierTest.java
@@ -20,9 +20,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultLogModifierTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/message/AbstractMessageProcessorTest.java b/core/citrus-base/src/test/java/org/citrusframework/message/AbstractMessageProcessorTest.java
index 7065c6d9a4..cc0727c0fb 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/message/AbstractMessageProcessorTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/message/AbstractMessageProcessorTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractMessageProcessorTest extends UnitTestSupport {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/message/DefaultMessageQueueTest.java b/core/citrus-base/src/test/java/org/citrusframework/message/DefaultMessageQueueTest.java
index 98ce38aad1..7045ad662b 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/message/DefaultMessageQueueTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/message/DefaultMessageQueueTest.java
@@ -24,9 +24,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultMessageQueueTest {
 
     private TestContext context;
diff --git a/core/citrus-base/src/test/java/org/citrusframework/message/DefaultMessageStoreTest.java b/core/citrus-base/src/test/java/org/citrusframework/message/DefaultMessageStoreTest.java
index 8b0d71b296..b0faa45f93 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/message/DefaultMessageStoreTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/message/DefaultMessageStoreTest.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class DefaultMessageStoreTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/message/DefaultMessageTest.java b/core/citrus-base/src/test/java/org/citrusframework/message/DefaultMessageTest.java
index 9f6f6bde8b..ed5ae2e902 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/message/DefaultMessageTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/message/DefaultMessageTest.java
@@ -23,9 +23,6 @@
 import org.citrusframework.UnitTestSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultMessageTest extends UnitTestSupport {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/message/MessageSelectorBuilderTest.java b/core/citrus-base/src/test/java/org/citrusframework/message/MessageSelectorBuilderTest.java
index 59348f6a10..6873579616 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/message/MessageSelectorBuilderTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/message/MessageSelectorBuilderTest.java
@@ -20,9 +20,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageSelectorBuilderTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/message/MessageTypeTest.java b/core/citrus-base/src/test/java/org/citrusframework/message/MessageTypeTest.java
index 6658f9ed40..ff31b2e112 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/message/MessageTypeTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/message/MessageTypeTest.java
@@ -20,9 +20,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageTypeTest extends UnitTestSupport {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/message/ZipMessageTest.java b/core/citrus-base/src/test/java/org/citrusframework/message/ZipMessageTest.java
index 6dfff94b55..996198b932 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/message/ZipMessageTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/message/ZipMessageTest.java
@@ -30,7 +30,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class ZipMessageTest {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/message/selector/DelegatingMessageSelectorTest.java b/core/citrus-base/src/test/java/org/citrusframework/message/selector/DelegatingMessageSelectorTest.java
index 27165c8cde..15c7bb5708 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/message/selector/DelegatingMessageSelectorTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/message/selector/DelegatingMessageSelectorTest.java
@@ -30,9 +30,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class DelegatingMessageSelectorTest extends UnitTestSupport {
 
     private ReferenceResolver resolver = Mockito.mock(ReferenceResolver.class);
diff --git a/core/citrus-base/src/test/java/org/citrusframework/message/selector/HeaderMatchingMessageSelectorTest.java b/core/citrus-base/src/test/java/org/citrusframework/message/selector/HeaderMatchingMessageSelectorTest.java
index 39bb034abb..98a71c1564 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/message/selector/HeaderMatchingMessageSelectorTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/message/selector/HeaderMatchingMessageSelectorTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class HeaderMatchingMessageSelectorTest extends UnitTestSupport {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/message/selector/PayloadMessageSelectorTest.java b/core/citrus-base/src/test/java/org/citrusframework/message/selector/PayloadMessageSelectorTest.java
index 49b94747aa..cba1167763 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/message/selector/PayloadMessageSelectorTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/message/selector/PayloadMessageSelectorTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class PayloadMessageSelectorTest extends UnitTestSupport {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/report/FailureStackTestListenerTest.java b/core/citrus-base/src/test/java/org/citrusframework/report/FailureStackTestListenerTest.java
index 7b292a2ef0..ac1db57a03 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/report/FailureStackTestListenerTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/report/FailureStackTestListenerTest.java
@@ -30,9 +30,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class FailureStackTestListenerTest extends UnitTestSupport {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/report/JUnitReporterTest.java b/core/citrus-base/src/test/java/org/citrusframework/report/JUnitReporterTest.java
index 15355dd9c8..4b650567ca 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/report/JUnitReporterTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/report/JUnitReporterTest.java
@@ -31,7 +31,6 @@
 import static org.testng.Assert.assertTrue;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class JUnitReporterTest {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/report/MessageTracingTestListenerTest.java b/core/citrus-base/src/test/java/org/citrusframework/report/MessageTracingTestListenerTest.java
index 7b666392c2..9239cc659a 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/report/MessageTracingTestListenerTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/report/MessageTracingTestListenerTest.java
@@ -31,7 +31,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class MessageTracingTestListenerTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/report/TestResultsTest.java b/core/citrus-base/src/test/java/org/citrusframework/report/TestResultsTest.java
index 3ecc026510..baf4637c08 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/report/TestResultsTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/report/TestResultsTest.java
@@ -38,9 +38,6 @@
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestResultsTest {
 
     private TestResults fixture;
diff --git a/core/citrus-base/src/test/java/org/citrusframework/util/BooleanExpressionParserTest.java b/core/citrus-base/src/test/java/org/citrusframework/util/BooleanExpressionParserTest.java
index 3cc714f929..49569493ba 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/util/BooleanExpressionParserTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/util/BooleanExpressionParserTest.java
@@ -21,9 +21,6 @@
 
 import org.citrusframework.exceptions.CitrusRuntimeException;
 
-/**
- * @author Christoph Deppisch
- */
 public class BooleanExpressionParserTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/util/FileUtilsTest.java b/core/citrus-base/src/test/java/org/citrusframework/util/FileUtilsTest.java
index 4d69e2f310..2b4da6f619 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/util/FileUtilsTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/util/FileUtilsTest.java
@@ -25,7 +25,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class FileUtilsTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/util/InvocationDummy.java b/core/citrus-base/src/test/java/org/citrusframework/util/InvocationDummy.java
index 68de3c9e18..8cf2d5e467 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/util/InvocationDummy.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/util/InvocationDummy.java
@@ -19,9 +19,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public class InvocationDummy {
 
     /**
diff --git a/core/citrus-base/src/test/java/org/citrusframework/util/PropertyUtilsTest.java b/core/citrus-base/src/test/java/org/citrusframework/util/PropertyUtilsTest.java
index f30e0375d8..e9eb705d69 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/util/PropertyUtilsTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/util/PropertyUtilsTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class PropertyUtilsTest extends UnitTestSupport {
     @Test
     public void testPropertyReplacementSingleProperty() {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/util/VariableUtilsTest.java b/core/citrus-base/src/test/java/org/citrusframework/util/VariableUtilsTest.java
index 55e08583b4..e2c423158b 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/util/VariableUtilsTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/util/VariableUtilsTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Jan Lipphaus
- */
 public class VariableUtilsTest extends UnitTestSupport {
     private String validGroovyScript = "a = 1";
     private String groovyScriptResult = "1";
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/DefaultHeaderValidatorTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/DefaultHeaderValidatorTest.java
index 72483e7b1b..8f2e061c03 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/DefaultHeaderValidatorTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/DefaultHeaderValidatorTest.java
@@ -26,7 +26,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class DefaultHeaderValidatorTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/DefaultMessageHeaderValidatorTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/DefaultMessageHeaderValidatorTest.java
index 778af622a7..a23f8f800c 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/DefaultMessageHeaderValidatorTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/DefaultMessageHeaderValidatorTest.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class DefaultMessageHeaderValidatorTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/DefaultTextEqualsMessageValidatorTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/DefaultTextEqualsMessageValidatorTest.java
index 0d310a7d07..30b947de8b 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/DefaultTextEqualsMessageValidatorTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/DefaultTextEqualsMessageValidatorTest.java
@@ -27,9 +27,6 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultTextEqualsMessageValidatorTest extends UnitTestSupport {
 
     private final DefaultTextEqualsMessageValidator validator = new DefaultTextEqualsMessageValidator();
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/FooValueMatcher.java b/core/citrus-base/src/test/java/org/citrusframework/validation/FooValueMatcher.java
index 0ab55aa5be..a6164a052d 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/FooValueMatcher.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/FooValueMatcher.java
@@ -18,9 +18,6 @@
 
 import org.citrusframework.context.TestContext;
 
-/**
- * @author Christoph Deppisch
- */
 public class FooValueMatcher implements ValueMatcher {
     @Override
     public boolean supports(Class<?> controlType) {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/HeaderValidatorTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/HeaderValidatorTest.java
index 57bafa5ee4..392ddc6727 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/HeaderValidatorTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/HeaderValidatorTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class HeaderValidatorTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/MessageValidatorRegistryTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/MessageValidatorRegistryTest.java
index 74e4c2b854..a3edb691a2 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/MessageValidatorRegistryTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/MessageValidatorRegistryTest.java
@@ -38,7 +38,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class MessageValidatorRegistryTest {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/MessageValidatorTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
index 3274d15677..4c5b4bd78d 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageValidatorTest {
 
     @Test
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/ValidationUtilsTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/ValidationUtilsTest.java
index 43c14f9a72..2d8fe154fe 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/ValidationUtilsTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/ValidationUtilsTest.java
@@ -33,7 +33,6 @@
 import static org.testng.Assert.assertEquals;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class ValidationUtilsTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/builder/StaticMessageBuilderTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/builder/StaticMessageBuilderTest.java
index 7125818128..040b79f97a 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/builder/StaticMessageBuilderTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/builder/StaticMessageBuilderTest.java
@@ -30,9 +30,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StaticMessageBuilderTest extends UnitTestSupport {
 
     private StaticMessageBuilder messageBuilder;
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/interceptor/GzipMessageProcessorTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/interceptor/GzipMessageProcessorTest.java
index f9473acae6..0a9092bf0b 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/interceptor/GzipMessageProcessorTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/interceptor/GzipMessageProcessorTest.java
@@ -35,9 +35,6 @@
 
 import static org.testng.Assert.assertEquals;
 
-/**
- * @author Christoph Deppisch
- */
 public class GzipMessageProcessorTest extends UnitTestSupport {
 
     private final GzipMessageProcessor processor = new GzipMessageProcessor();
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/DefaultControlExpressionParserTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/DefaultControlExpressionParserTest.java
index 3ec484ab74..8af04aba37 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/DefaultControlExpressionParserTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/DefaultControlExpressionParserTest.java
@@ -25,7 +25,6 @@
 import java.util.List;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class DefaultControlExpressionParserTest {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/ValidationMatcherLibraryTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/ValidationMatcherLibraryTest.java
index 1bd01df677..827a6b71e6 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/ValidationMatcherLibraryTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/ValidationMatcherLibraryTest.java
@@ -25,9 +25,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ValidationMatcherLibraryTest {
 
     private ValidationMatcherLibrary validationMatcherLibrary = new ValidationMatcherLibrary();
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/ValidationMatcherRegistryTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/ValidationMatcherRegistryTest.java
index f6cff0214a..de18e8dd5c 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/ValidationMatcherRegistryTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/ValidationMatcherRegistryTest.java
@@ -27,9 +27,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ValidationMatcherRegistryTest extends UnitTestSupport {
 
     private ValidationMatcherLibrary validationMatcherLibrary = new ValidationMatcherLibrary();
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/ValidationMatcherUtilsTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/ValidationMatcherUtilsTest.java
index 3d7f494eb4..208640f72d 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/ValidationMatcherUtilsTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/ValidationMatcherUtilsTest.java
@@ -29,9 +29,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-/**
- * @author Christoph Deppisch
- */
 public class ValidationMatcherUtilsTest extends UnitTestSupport {
 
     private ValidationMatcherLibrary validationMatcherLibrary = new ValidationMatcherLibrary();
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/DateRangeValidationMatcherTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/DateRangeValidationMatcherTest.java
index 46122bb08f..372467cc9f 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/DateRangeValidationMatcherTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/DateRangeValidationMatcherTest.java
@@ -26,7 +26,6 @@
 import static org.testng.Assert.fail;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class DateRangeValidationMatcherTest {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/IgnoreNewLineValidationMatcherTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/IgnoreNewLineValidationMatcherTest.java
index 1160438a00..d02de14288 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/IgnoreNewLineValidationMatcherTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/IgnoreNewLineValidationMatcherTest.java
@@ -23,7 +23,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class IgnoreNewLineValidationMatcherTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/StringLengthValidationMatcherTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/StringLengthValidationMatcherTest.java
index 03a50f961a..15ffedac4d 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/StringLengthValidationMatcherTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/StringLengthValidationMatcherTest.java
@@ -23,7 +23,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class StringLengthValidationMatcherTest extends UnitTestSupport {
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/WeekdayValidationMatcherTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/WeekdayValidationMatcherTest.java
index ac789b41fc..c1bc6689a2 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/WeekdayValidationMatcherTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/matcher/core/WeekdayValidationMatcherTest.java
@@ -27,9 +27,6 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class WeekdayValidationMatcherTest extends UnitTestSupport {
 
     private WeekdayValidationMatcher matcher = new WeekdayValidationMatcher();
diff --git a/core/citrus-base/src/test/java/org/citrusframework/validation/script/TemplateBasedScriptBuilderTest.java b/core/citrus-base/src/test/java/org/citrusframework/validation/script/TemplateBasedScriptBuilderTest.java
index a4fdec0b1e..0f64916691 100644
--- a/core/citrus-base/src/test/java/org/citrusframework/validation/script/TemplateBasedScriptBuilderTest.java
+++ b/core/citrus-base/src/test/java/org/citrusframework/validation/script/TemplateBasedScriptBuilderTest.java
@@ -20,9 +20,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TemplateBasedScriptBuilderTest {
 
     @Test
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/CitrusSpringContext.java b/core/citrus-spring/src/main/java/org/citrusframework/CitrusSpringContext.java
index 547a73fe45..8cfcebd4fb 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/CitrusSpringContext.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/CitrusSpringContext.java
@@ -39,9 +39,6 @@
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
-/**
- * @author Christoph Deppisch
- */
 public class CitrusSpringContext extends CitrusContext {
 
     /** Basic Spring application context */
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/CitrusSpringContextProvider.java b/core/citrus-spring/src/main/java/org/citrusframework/CitrusSpringContextProvider.java
index e26370a725..87f70dba76 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/CitrusSpringContextProvider.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/CitrusSpringContextProvider.java
@@ -28,7 +28,6 @@
  * that has created a context. When very same application context creates another CitrusContext use the cached instance. This
  * caching should give us some performance improvements and less instance duplications.
  *
- * @author Christoph Deppisch
  */
 public class CitrusSpringContextProvider implements CitrusContextProvider {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/CitrusSpringSettings.java b/core/citrus-spring/src/main/java/org/citrusframework/CitrusSpringSettings.java
index eb1024d108..edcceae358 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/CitrusSpringSettings.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/CitrusSpringSettings.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework;
 
-/**
- * @author Christoph Deppisch
- */
 public class CitrusSpringSettings {
 
     /**
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoader.java b/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoader.java
index 2b1da4aa11..74119db4b0 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoader.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoader.java
@@ -37,7 +37,6 @@
  * for test case and a parent application context. At runtime this class loads the Spring application context and gets
  * test case bean instance from context.
  *
- * @author Christoph Deppisch
  * @since 2.1
  */
 public class SpringXmlTestLoader extends DefaultTestLoader implements TestSourceAware {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoaderConfiguration.java b/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoaderConfiguration.java
index 5e73c896fb..93bee22adb 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoaderConfiguration.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoaderConfiguration.java
@@ -24,7 +24,6 @@
 /**
  * Xml test loader annotation used to configure parsers in {@link org.citrusframework.config.handler.CitrusTestCaseNamespaceHandler}
  *
- * @author T. Schlathoelter
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoaderConfigurer.java b/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoaderConfigurer.java
index 1dc80fab73..e40464d6f1 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoaderConfigurer.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/common/SpringXmlTestLoaderConfigurer.java
@@ -26,7 +26,6 @@
  * loading SpringXmlTest.
  *
  *
- * @author Thorsten Schlathoelter
  * @since 4.0
  * @see SpringXmlTestLoader
  */
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusBeanDefinitionReader.java b/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusBeanDefinitionReader.java
index 2bed9b48e1..446f7be97d 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusBeanDefinitionReader.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusBeanDefinitionReader.java
@@ -22,7 +22,6 @@
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class CitrusBeanDefinitionReader extends XmlBeanDefinitionReader {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusConfigImport.java b/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusConfigImport.java
index 3193833d4a..de65da5d17 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusConfigImport.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusConfigImport.java
@@ -22,7 +22,6 @@
 import org.springframework.core.type.AnnotationMetadata;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class CitrusConfigImport implements DeferredImportSelector {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusConversionServiceConfiguration.java b/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusConversionServiceConfiguration.java
index 1a3d5e6234..cc3762824a 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusConversionServiceConfiguration.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusConversionServiceConfiguration.java
@@ -27,7 +27,6 @@
  * This configuration is necessary only when using Spring without Spring Boot. Spring Boot includes a standard conversion service
  * that automatically detects and uses relevant converters by default.
  *
- * @author Thorsten Schlathoelter
  * @since 4.0
  */
 @Configuration
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusNamespaceParserRegistry.java b/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusNamespaceParserRegistry.java
index 873d0489bb..28e4a7e803 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusNamespaceParserRegistry.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusNamespaceParserRegistry.java
@@ -29,7 +29,6 @@
 /**
  * Registers bean definition parser for beans in test case, handled by {@link CitrusTestCaseNamespaceHandler}
  *
- * @author Christoph Deppisch
  * @since 2007
  */
 public final class CitrusNamespaceParserRegistry {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusSpringConfig.java b/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusSpringConfig.java
index 9f9ac4f3d9..3999ac2a46 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusSpringConfig.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/CitrusSpringConfig.java
@@ -49,7 +49,6 @@
 import org.springframework.context.annotation.ImportResource;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 @Configuration
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/ComponentLifecycleProcessor.java b/core/citrus-spring/src/main/java/org/citrusframework/config/ComponentLifecycleProcessor.java
index 85294b9ff9..2badf88110 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/ComponentLifecycleProcessor.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/ComponentLifecycleProcessor.java
@@ -29,9 +29,6 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
-/**
- * @author Christoph Deppisch
- */
 public class ComponentLifecycleProcessor implements DestructionAwareBeanPostProcessor, ApplicationContextAware {
 
     private ReferenceResolver referenceResolver;
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/TestCaseFactory.java b/core/citrus-spring/src/main/java/org/citrusframework/config/TestCaseFactory.java
index 072e5fab29..f6c06dc486 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/TestCaseFactory.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/TestCaseFactory.java
@@ -25,7 +25,6 @@
 /**
  * Test case factory bean constructs test cases with test actions and test finally block.
  *
- * @author Christoph Deppisch
  */
 public class TestCaseFactory implements FactoryBean<TestCase> {
     /** Result test case object */
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/handler/CitrusConfigNamespaceHandler.java b/core/citrus-spring/src/main/java/org/citrusframework/config/handler/CitrusConfigNamespaceHandler.java
index eda16eb716..be4bb210a6 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/handler/CitrusConfigNamespaceHandler.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/handler/CitrusConfigNamespaceHandler.java
@@ -47,7 +47,6 @@
 /**
  * Namespace handler for components in Citrus configuration.
  *
- * @author Christoph Deppisch
  */
 public class CitrusConfigNamespaceHandler extends NamespaceHandlerSupport {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/handler/CitrusTestCaseNamespaceHandler.java b/core/citrus-spring/src/main/java/org/citrusframework/config/handler/CitrusTestCaseNamespaceHandler.java
index 060c108c86..2174e5f056 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/handler/CitrusTestCaseNamespaceHandler.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/handler/CitrusTestCaseNamespaceHandler.java
@@ -26,7 +26,6 @@
  * Namespace handler registers bean definition parser
  * for Citrus testcase schema elements.
  *
- * @author Christoph Deppisch, Thorsten Schlathoelter
  * @since 2007
  */
 public class CitrusTestCaseNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/util/BeanDefinitionParserUtils.java b/core/citrus-spring/src/main/java/org/citrusframework/config/util/BeanDefinitionParserUtils.java
index 087be309da..6aeefc3cb7 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/util/BeanDefinitionParserUtils.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/util/BeanDefinitionParserUtils.java
@@ -27,7 +27,6 @@
 /**
  * Provides shared utility methods for bean definition parsing.
  *
- * @author Christoph Deppisch
  */
 public abstract class BeanDefinitionParserUtils {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/util/ValidateMessageParserUtil.java b/core/citrus-spring/src/main/java/org/citrusframework/config/util/ValidateMessageParserUtil.java
index 2c3273b888..d90b64bc07 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/util/ValidateMessageParserUtil.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/util/ValidateMessageParserUtil.java
@@ -26,7 +26,6 @@
 /**
  * Helper for parsing message validation elements.
  *
- * @author Martin Maher
  * @since 2.5
  */
 public class ValidateMessageParserUtil {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/util/VariableExtractorParserUtil.java b/core/citrus-spring/src/main/java/org/citrusframework/config/util/VariableExtractorParserUtil.java
index dc23206079..dae8b76c38 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/util/VariableExtractorParserUtil.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/util/VariableExtractorParserUtil.java
@@ -28,7 +28,6 @@
 /**
  * Helper for parsing 'extract' elements containing nested xpath or json variable-extractors.
  *
- * @author Martin Maher
  * @since 2.5
  */
 public class VariableExtractorParserUtil {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractDataDictionaryParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractDataDictionaryParser.java
index 2f7a97b254..cff6b3b4f7 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractDataDictionaryParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractDataDictionaryParser.java
@@ -28,7 +28,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public abstract class AbstractDataDictionaryParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractDirectEndpointParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractDirectEndpointParser.java
index f34240c5ea..a8cbd58886 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractDirectEndpointParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractDirectEndpointParser.java
@@ -21,9 +21,6 @@
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractDirectEndpointParser extends AbstractEndpointParser {
 
     @Override
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractEndpointParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractEndpointParser.java
index eb24c3610d..21f14b8ad4 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractEndpointParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractEndpointParser.java
@@ -30,7 +30,6 @@
  * bean definition. Registers endpoint configuration as bean definition in parser context and adds reference to endpoint
  * bean definition.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public abstract class AbstractEndpointParser extends AbstractBeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractIteratingTestContainerFactoryBean.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractIteratingTestContainerFactoryBean.java
index e07dc50054..e7fc201ffe 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractIteratingTestContainerFactoryBean.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractIteratingTestContainerFactoryBean.java
@@ -20,9 +20,6 @@
 import org.citrusframework.container.AbstractIteratingActionContainer;
 import org.citrusframework.container.IteratingConditionExpression;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractIteratingTestContainerFactoryBean<T extends AbstractIteratingActionContainer, B extends AbstractIteratingContainerBuilder<?, ?>> extends AbstractTestContainerFactoryBean<T, B> {
 
     /**
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractIterationTestActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractIterationTestActionParser.java
index 7f96a4108a..f0be3b9eb6 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractIterationTestActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractIterationTestActionParser.java
@@ -28,7 +28,6 @@
  * Abstract parser implementation for all iterative container actions. Parser takes care of
  * index name, aborting condition, index start value and description
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractIterationTestActionParser  implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractMessageActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractMessageActionParser.java
index 488a53cd88..1ac012104d 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractMessageActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractMessageActionParser.java
@@ -54,7 +54,6 @@
 /**
  * Parser providing basic message element configurations used in send and receive actions.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractMessageActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractReceiveMessageActionFactoryBean.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractReceiveMessageActionFactoryBean.java
index a3a0967b23..b2a578d9e4 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractReceiveMessageActionFactoryBean.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractReceiveMessageActionFactoryBean.java
@@ -30,9 +30,6 @@
 import org.citrusframework.variable.VariableExtractor;
 import org.citrusframework.variable.dictionary.DataDictionary;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractReceiveMessageActionFactoryBean<T extends ReceiveMessageAction, M extends ReceiveMessageBuilderSupport<T, B, M>, B extends ReceiveMessageAction.ReceiveMessageActionBuilder<T, M, B>> extends AbstractTestActionFactoryBean<T, B> {
 
     /**
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractSendMessageActionFactoryBean.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractSendMessageActionFactoryBean.java
index 2a12ac494d..b463e812e0 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractSendMessageActionFactoryBean.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractSendMessageActionFactoryBean.java
@@ -26,9 +26,6 @@
 import org.citrusframework.variable.VariableExtractor;
 import org.citrusframework.variable.dictionary.DataDictionary;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractSendMessageActionFactoryBean<T extends SendMessageAction, M extends SendMessageBuilderSupport<T, B, M>, B extends SendMessageAction.SendMessageActionBuilder<T, M, B>> extends AbstractTestActionFactoryBean<T, B> {
 
     /**
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractServerParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractServerParser.java
index edc566c90e..4a66c76509 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractServerParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractServerParser.java
@@ -27,7 +27,6 @@
 
 /**
  * Abstract server parser adds endpoint adapter construction and basic server property parsing.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public abstract class AbstractServerParser extends AbstractBeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractSuiteActionContainerParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractSuiteActionContainerParser.java
index a741357c5c..ab391111da 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractSuiteActionContainerParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractSuiteActionContainerParser.java
@@ -30,7 +30,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public abstract class AbstractSuiteActionContainerParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractTestActionFactoryBean.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractTestActionFactoryBean.java
index 0b53f0281e..83b5c6cbbf 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractTestActionFactoryBean.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractTestActionFactoryBean.java
@@ -21,9 +21,6 @@
 import org.citrusframework.TestActor;
 import org.springframework.beans.factory.FactoryBean;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractTestActionFactoryBean<T extends TestAction, B extends AbstractTestActionBuilder<?, ?>> implements FactoryBean<T> {
 
     /**
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractTestBoundaryActionContainerParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractTestBoundaryActionContainerParser.java
index 82022688d5..39b7f289c3 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractTestBoundaryActionContainerParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractTestBoundaryActionContainerParser.java
@@ -31,7 +31,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public abstract class AbstractTestBoundaryActionContainerParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractTestContainerFactoryBean.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractTestContainerFactoryBean.java
index f3031ca3f4..80790f17fe 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractTestContainerFactoryBean.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AbstractTestContainerFactoryBean.java
@@ -23,9 +23,6 @@
 import org.citrusframework.TestAction;
 import org.citrusframework.container.TestActionContainer;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractTestContainerFactoryBean<T extends TestActionContainer, B extends AbstractTestContainerBuilder<?, ?>> extends AbstractTestActionFactoryBean<T, B> {
 
     private List<TestAction> actions = new ArrayList<>();
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ActionContainerParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ActionContainerParser.java
index 6c80e929e7..159986694d 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ActionContainerParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ActionContainerParser.java
@@ -31,7 +31,6 @@
  * Abstract parser implementation that is aware of several embedded test actions of a container. Bean definitions that use
  * this parser component must have an 'actions' property of type {@link List} in order to receive the list of embedded test actions.
  *
- * @author Christoph Deppisch
  */
 public abstract class ActionContainerParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ActionParser.java
index aa00d0417b..f4373f2dc3 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ActionParser.java
@@ -27,7 +27,6 @@
 /**
  * Bean definition parser for generic test action element.
  *
- * @author Christoph Deppisch
  */
 public class ActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AntRunActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AntRunActionParser.java
index 1e41c461ce..f47e50aa60 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AntRunActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AntRunActionParser.java
@@ -32,7 +32,6 @@
 /**
  * Bean definition parser for ant run action in test case.
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public class AntRunActionParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AssertParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AssertParser.java
index 8d3c94dcde..11bce610fe 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AssertParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AssertParser.java
@@ -31,7 +31,6 @@
 /**
  * Bean definition parser for assert action in test case.
  *
- * @author Christoph Deppisch
  */
 public class AssertParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AsyncParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AsyncParser.java
index 12d5a642d1..7b2acd5350 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AsyncParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/AsyncParser.java
@@ -31,7 +31,6 @@
 /**
  * Bean definition parser for sequential container in test case.
  *
- * @author Christoph Deppisch
  */
 public class AsyncParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseMetaInfoParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseMetaInfoParser.java
index b56eb3dc79..8652bb0a6b 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseMetaInfoParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/BaseTestCaseMetaInfoParser.java
@@ -35,7 +35,6 @@
  *
  * @param <T>
  *
- * @author Thorsten Schlathoelter
  */
 public abstract class BaseTestCaseMetaInfoParser<T extends TestCaseMetaInfo> implements BeanDefinitionParser  {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/CallTemplateParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/CallTemplateParser.java
index c0e6727d6f..e5d5ff0905 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/CallTemplateParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/CallTemplateParser.java
@@ -33,7 +33,6 @@
 /**
  * Bean definition parser for call template action in test case.
  *
- * @author Christoph Deppisch
  */
 public class CallTemplateParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/CatchParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/CatchParser.java
index 1cf16e3281..b0e7949bb1 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/CatchParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/CatchParser.java
@@ -27,7 +27,6 @@
 /**
  * Bean definition parser for catch action in test case.
  *
- * @author Christoph Deppisch
  */
 public class CatchParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ConditionalParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ConditionalParser.java
index ce70f0e21a..1b3ffa48a2 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ConditionalParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ConditionalParser.java
@@ -28,7 +28,6 @@
 /**
  * Bean definition parser for selection container in test case.
  *
- * @author Matthias Beil
  * @since 1.2
  */
 public class ConditionalParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/CreateVariablesActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/CreateVariablesActionParser.java
index 906a46cf2a..6a5f47c902 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/CreateVariablesActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/CreateVariablesActionParser.java
@@ -31,7 +31,6 @@
 /**
  * Bean definition parser for create-variables action in test case.
  *
- * @author Christoph Deppisch
  */
 public class CreateVariablesActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DefaultMessageQueueParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DefaultMessageQueueParser.java
index 24331fe448..b08dacd9a4 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DefaultMessageQueueParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DefaultMessageQueueParser.java
@@ -27,7 +27,6 @@
 /**
  * Bean definition parser for special message queue configuration
  *
- * @author Christoph Deppisch
  */
 public class DefaultMessageQueueParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DelayActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DelayActionParser.java
index 3a9376c1a3..88a9769eaf 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DelayActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DelayActionParser.java
@@ -25,7 +25,6 @@
  * Bean definition parser for delay action in test case.
  * Delegates to sleep action parser.
  *
- * @author Christoph Deppisch
  */
 public class DelayActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DescriptionElementParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DescriptionElementParser.java
index 3a751524a1..f52fe28744 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DescriptionElementParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DescriptionElementParser.java
@@ -23,7 +23,6 @@
 /**
  * Bean definition parser for description elements of test actions.
  *
- * @author Christoph Deppisch
  */
 public abstract class DescriptionElementParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DirectEndpointAdapterParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DirectEndpointAdapterParser.java
index 905690aedb..bc2e39bd20 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DirectEndpointAdapterParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DirectEndpointAdapterParser.java
@@ -32,7 +32,6 @@
 
 /**
  * Parses endpoint adapter bean definition for direct endpoint adapter.
- * @author Christoph Deppisch
  * @since 3.0
  */
 public class DirectEndpointAdapterParser extends AbstractBeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DirectEndpointParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DirectEndpointParser.java
index c5b9b77b1d..f75e895947 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DirectEndpointParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DirectEndpointParser.java
@@ -24,7 +24,6 @@
 /**
  * Simple endpoint parser.
  *
- * @author Christoph Deppisch
  * @since 3.0
  */
 public class DirectEndpointParser extends AbstractDirectEndpointParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DirectSyncEndpointParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DirectSyncEndpointParser.java
index 3a2c87187c..9df4866bca 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DirectSyncEndpointParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/DirectSyncEndpointParser.java
@@ -28,7 +28,6 @@
 /**
  * Bean definition parser for synchronous message queue endpoint components.
  *
- * @author Christoph Deppisch
  * @since 3.0
  */
 public class DirectSyncEndpointParser extends AbstractDirectEndpointParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/EchoActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/EchoActionParser.java
index 9ac8bb0b99..24ac438139 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/EchoActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/EchoActionParser.java
@@ -27,7 +27,6 @@
 /**
  * Bean definition parser for echo action in test case.
  *
- * @author Christoph Deppisch
  */
 public class EchoActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/EmptyResponseEndpointAdapterParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/EmptyResponseEndpointAdapterParser.java
index 896c5a2cf0..8ce6459b44 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/EmptyResponseEndpointAdapterParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/EmptyResponseEndpointAdapterParser.java
@@ -29,7 +29,6 @@
 
 /**
  * Creates empty response producing endpoint adapter.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class EmptyResponseEndpointAdapterParser extends AbstractBeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/FailActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/FailActionParser.java
index ab56113d15..b32fbe5ab0 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/FailActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/FailActionParser.java
@@ -27,7 +27,6 @@
 /**
  * Bean definition parser for fail action in test case.
  *
- * @author Christoph Deppisch
  */
 public class FailActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/FunctionLibraryParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/FunctionLibraryParser.java
index c6e9b0d187..b8e3249850 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/FunctionLibraryParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/FunctionLibraryParser.java
@@ -27,7 +27,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class FunctionLibraryParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/GlobalVariablesParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/GlobalVariablesParser.java
index ece67d6e8a..ebf4e7325a 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/GlobalVariablesParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/GlobalVariablesParser.java
@@ -32,7 +32,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class GlobalVariablesParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/InputActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/InputActionParser.java
index e6f90306e4..f45fe78e0f 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/InputActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/InputActionParser.java
@@ -27,7 +27,6 @@
 /**
  * Bean definition parser for input action in test case.
  *
- * @author Christoph Deppisch
  */
 public class InputActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/IterateParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/IterateParser.java
index 9c7405c9cc..1e84bb7b53 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/IterateParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/IterateParser.java
@@ -25,7 +25,6 @@
 /**
  * Bean definition parser for assert action in test case.
  *
- * @author Christoph Deppisch
  */
 public class IterateParser extends AbstractIterationTestActionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/JavaActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/JavaActionParser.java
index fe7e79bd84..f1849e5ab8 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/JavaActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/JavaActionParser.java
@@ -38,7 +38,6 @@
 /**
  * Bean definition parser for java action in test case.
  *
- * @author Christoph Deppisch
  */
 public class JavaActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/LoadPropertiesActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/LoadPropertiesActionParser.java
index 05b3b879dd..9f79c094fe 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/LoadPropertiesActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/LoadPropertiesActionParser.java
@@ -29,7 +29,6 @@
 /**
  * Bean definition parser for load-properties action in test case.
  *
- * @author Christoph Deppisch
  */
 public class LoadPropertiesActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/MessageSelectorParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/MessageSelectorParser.java
index 484561e98f..3915446b70 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/MessageSelectorParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/MessageSelectorParser.java
@@ -25,7 +25,6 @@
 /**
  * Bean definition parser for message selector elements of test actions.
  *
- * @author Christoph Deppisch
  */
 public abstract class MessageSelectorParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/MessageValidatorRegistryParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/MessageValidatorRegistryParser.java
index 4a70ed0bc7..7403bf8865 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/MessageValidatorRegistryParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/MessageValidatorRegistryParser.java
@@ -27,7 +27,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class MessageValidatorRegistryParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/NamespaceContextParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/NamespaceContextParser.java
index fd39b80527..d3ed2a1a95 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/NamespaceContextParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/NamespaceContextParser.java
@@ -27,7 +27,6 @@
 import java.util.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class NamespaceContextParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ParallelParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ParallelParser.java
index 7062a6b2d2..ea46920f40 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ParallelParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ParallelParser.java
@@ -26,7 +26,6 @@
 /**
  * Bean definition parser for parallel container in test case.
  *
- * @author Christoph Deppisch
  */
 public class ParallelParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/PayloadElementParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/PayloadElementParser.java
index b04b33ca90..9a9c8471ac 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/PayloadElementParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/PayloadElementParser.java
@@ -35,7 +35,6 @@
  * Bean definition parser for payload element used in message
  * elements in send and receive action.
  *
- * @author Christoph Deppisch
  */
 public abstract class PayloadElementParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/PrintActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/PrintActionParser.java
index 411ca4be21..5255f70bcb 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/PrintActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/PrintActionParser.java
@@ -25,7 +25,6 @@
  * Bean definition parser for print action in test case.
  * Delegates to echo action parser.
  *
- * @author Christoph Deppisch
  */
 public class PrintActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/PurgeEndpointActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/PurgeEndpointActionParser.java
index 7482a9d63a..9915546c9b 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/PurgeEndpointActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/PurgeEndpointActionParser.java
@@ -38,7 +38,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class PurgeEndpointActionParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ReceiveMessageActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ReceiveMessageActionParser.java
index 056a228526..7959f2a9d9 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ReceiveMessageActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ReceiveMessageActionParser.java
@@ -56,7 +56,6 @@
 /**
  * Bean definition parser for receive action in test case.
  *
- * @author Christoph Deppisch
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public class ReceiveMessageActionParser extends AbstractMessageActionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ReceiveTimeoutActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ReceiveTimeoutActionParser.java
index 319d229b43..2f81dafab2 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ReceiveTimeoutActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ReceiveTimeoutActionParser.java
@@ -33,7 +33,6 @@
 /**
  * Bean definition parser for receive-timeout action in test case.
  *
- * @author Christoph Deppisch
  */
 public class ReceiveTimeoutActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/RepeatOnErrorUntilTrueParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/RepeatOnErrorUntilTrueParser.java
index 1a7ddd92b8..24adf579db 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/RepeatOnErrorUntilTrueParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/RepeatOnErrorUntilTrueParser.java
@@ -25,7 +25,6 @@
 /**
  * Bean definition parser for repeat-on-error-until-true container in test case.
  *
- * @author Christoph Deppisch
  */
 public class RepeatOnErrorUntilTrueParser extends AbstractIterationTestActionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/RepeatUntilTrueParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/RepeatUntilTrueParser.java
index 62ab92a0f4..512a63d505 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/RepeatUntilTrueParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/RepeatUntilTrueParser.java
@@ -24,7 +24,6 @@
 /**
  * Bean definition parser for repeat-until-true container in test case.
  *
- * @author Christoph Deppisch
  */
 public class RepeatUntilTrueParser extends AbstractIterationTestActionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/RequestDispatchingEndpointAdapterParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/RequestDispatchingEndpointAdapterParser.java
index 2540f37bd3..51455ae93e 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/RequestDispatchingEndpointAdapterParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/RequestDispatchingEndpointAdapterParser.java
@@ -33,7 +33,6 @@
 
 /**
  * Parses dispatching endpoint adapter components.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class RequestDispatchingEndpointAdapterParser extends AbstractBeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SchemaParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SchemaParser.java
index d858ae01a0..461bbfbc73 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SchemaParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SchemaParser.java
@@ -31,7 +31,6 @@
 /**
  * Bean definition parser for schema configuration.
  *
- * @author Martin.Maher
  * @since 1.3.1
  */
 public class SchemaParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SchemaRepositoryParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SchemaRepositoryParser.java
index 6bf2e58366..98c9e95cec 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SchemaRepositoryParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SchemaRepositoryParser.java
@@ -37,7 +37,6 @@
 /**
  * Bean definition parser for schema-repository configuration.
  *
- * @author Martin.Maher
  * @since 1.3.1
  */
 public class SchemaRepositoryParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SendMessageActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SendMessageActionParser.java
index e9a718522b..ec3f5ee57f 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SendMessageActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SendMessageActionParser.java
@@ -36,7 +36,6 @@
 /**
  * Bean definition parser for send action in test case.
  *
- * @author Christoph Deppisch
  */
 public class SendMessageActionParser extends AbstractMessageActionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceAfterSuiteParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceAfterSuiteParser.java
index a3e2309989..a4a3f8f65d 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceAfterSuiteParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceAfterSuiteParser.java
@@ -20,7 +20,6 @@
 import org.citrusframework.container.SequenceAfterSuite;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class SequenceAfterSuiteParser extends AbstractSuiteActionContainerParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceAfterTestParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceAfterTestParser.java
index ee843c1a61..1b2360ced6 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceAfterTestParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceAfterTestParser.java
@@ -19,7 +19,6 @@
 import org.citrusframework.container.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class SequenceAfterTestParser extends AbstractTestBoundaryActionContainerParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceBeforeSuiteParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceBeforeSuiteParser.java
index 989b69b0d3..9a45389c7a 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceBeforeSuiteParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceBeforeSuiteParser.java
@@ -20,7 +20,6 @@
 import org.citrusframework.container.SequenceBeforeSuite;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class SequenceBeforeSuiteParser  extends AbstractSuiteActionContainerParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceBeforeTestParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceBeforeTestParser.java
index c7f3104b69..c2ed3285de 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceBeforeTestParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceBeforeTestParser.java
@@ -20,7 +20,6 @@
 import org.citrusframework.container.SequenceBeforeTest;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class SequenceBeforeTestParser extends AbstractTestBoundaryActionContainerParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceParser.java
index cb263e6515..c0776e9e15 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SequenceParser.java
@@ -26,7 +26,6 @@
 /**
  * Bean definition parser for sequential container in test case.
  *
- * @author Christoph Deppisch
  */
 public class SequenceParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SleepActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SleepActionParser.java
index ae6fd6941d..4eb315b82f 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SleepActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/SleepActionParser.java
@@ -29,7 +29,6 @@
 /**
  * Bean definition parser for sleep action in test case.
  *
- * @author Christoph Deppisch
  */
 public class SleepActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StartServerActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StartServerActionParser.java
index ca78f49b93..898c0b2cce 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StartServerActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StartServerActionParser.java
@@ -31,7 +31,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.2
  */
 public class StartServerActionParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StaticResponseEndpointAdapterParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StaticResponseEndpointAdapterParser.java
index f3d5c4d02f..986aeef683 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StaticResponseEndpointAdapterParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StaticResponseEndpointAdapterParser.java
@@ -38,7 +38,6 @@
 
 /**
  * Endpoint adapter parser configures bean definition for static response producing component.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class StaticResponseEndpointAdapterParser extends AbstractBeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StopServerActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StopServerActionParser.java
index 62a2a3126e..6310de499f 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StopServerActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StopServerActionParser.java
@@ -31,7 +31,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.2
  */
 public class StopServerActionParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StopTimeActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StopTimeActionParser.java
index 8d44f2e4cd..63cb8f4a03 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StopTimeActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StopTimeActionParser.java
@@ -27,7 +27,6 @@
 /**
  * Bean definition parser for time action in test case.
  *
- * @author Christoph Deppisch
  */
 public class StopTimeActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StopTimerParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StopTimerParser.java
index 32d9617ccb..63adceb3d8 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StopTimerParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/StopTimerParser.java
@@ -27,7 +27,6 @@
 /**
  * Parses the Stop-Timer bean definition.
  *
- * @author Martin Maher
  * @since 2.5
  */
 public class StopTimerParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TemplateParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TemplateParser.java
index 474d967950..13273ab250 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TemplateParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TemplateParser.java
@@ -32,7 +32,6 @@
 /**
  * Bean definition parser for template definition in test case.
  *
- * @author Christoph Deppisch
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public class TemplateParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestActorParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestActorParser.java
index 6d748e7764..b51f22eafb 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestActorParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestActorParser.java
@@ -28,7 +28,6 @@
 /**
  * Bean definition parser for test actor in configuration context.
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public class TestActorParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestCaseParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestCaseParser.java
index e4dc64007f..4a87570e1d 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestCaseParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TestCaseParser.java
@@ -21,7 +21,6 @@
 /**
  * Bean definition parser for test case.
  *
- * @author Christoph Deppisch
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 public class TestCaseParser extends BaseTestCaseParser<DefaultTestCase> {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TimeoutProducingEndpointAdapterParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TimeoutProducingEndpointAdapterParser.java
index 2d77f55edf..2523133237 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TimeoutProducingEndpointAdapterParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TimeoutProducingEndpointAdapterParser.java
@@ -29,7 +29,6 @@
 
 /**
  * Timeout producing endpoint adapter bean definition parser.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class TimeoutProducingEndpointAdapterParser extends AbstractBeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TimerParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TimerParser.java
index 85981caa54..34fc6382e8 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TimerParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TimerParser.java
@@ -27,7 +27,6 @@
 /**
  * Parses the Timer container bean definition.
  *
- * @author Martin Maher
  * @since 2.5
  */
 public class TimerParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TraceVariablesActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TraceVariablesActionParser.java
index 4342ad827e..557aaa408c 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TraceVariablesActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TraceVariablesActionParser.java
@@ -30,7 +30,6 @@
 /**
  * Bean definition parser for trace-variables action in test case.
  *
- * @author Christoph Deppisch
  */
 public class TraceVariablesActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TransformActionParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TransformActionParser.java
index 47557a2e21..5e4fcd0e30 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TransformActionParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/TransformActionParser.java
@@ -28,7 +28,6 @@
 /**
  * Bean definition parser for transform action in test case.
  *
- * @author Philipp Komninos
  */
 public class TransformActionParser implements BeanDefinitionParser {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ValidationMatcherLibraryParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ValidationMatcherLibraryParser.java
index 9bbe777372..ed016418c5 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ValidationMatcherLibraryParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/ValidationMatcherLibraryParser.java
@@ -27,7 +27,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class ValidationMatcherLibraryParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/WaitParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/WaitParser.java
index 583b8b9000..7f709fdc00 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/WaitParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/WaitParser.java
@@ -38,7 +38,6 @@
 /**
  * Bean definition parser for wait action in test case.
  *
- * @author Martin Maher
  * @since 2.4
  */
 public class WaitParser implements BeanDefinitionParser {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/parser/CitrusXmlConfigParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/parser/CitrusXmlConfigParser.java
index b1d4167800..72fb4ef8ca 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/parser/CitrusXmlConfigParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/parser/CitrusXmlConfigParser.java
@@ -25,9 +25,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public interface CitrusXmlConfigParser {
 
     /** Logger */
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/parser/ScriptMessageBuilderParser.java b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/parser/ScriptMessageBuilderParser.java
index 7402624b95..723e1d5ca7 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/config/xml/parser/ScriptMessageBuilderParser.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/config/xml/parser/ScriptMessageBuilderParser.java
@@ -20,9 +20,6 @@
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
-/**
- * @author Christoph Deppisch
- */
 public interface ScriptMessageBuilderParser {
 
     /**
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/context/SpringBeanReferenceResolver.java b/core/citrus-spring/src/main/java/org/citrusframework/context/SpringBeanReferenceResolver.java
index ac0b7f828f..641716e76e 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/context/SpringBeanReferenceResolver.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/context/SpringBeanReferenceResolver.java
@@ -37,7 +37,6 @@
 /**
  * Spring bean reference resolver operates on given application context to resolve bean references.
  *
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class SpringBeanReferenceResolver implements ReferenceResolver, ApplicationContextAware {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/context/TestContextFactoryBean.java b/core/citrus-spring/src/main/java/org/citrusframework/context/TestContextFactoryBean.java
index 6174e01757..23865fc752 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/context/TestContextFactoryBean.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/context/TestContextFactoryBean.java
@@ -47,7 +47,6 @@
  * Factory bean implementation taking care of {@link FunctionRegistry} and {@link GlobalVariables}. Enriches a test context factory delegate with
  * components coming from Spring application context. In addition to that adds application context reference to the test context when building new instances.
  *
- * @author Christoph Deppisch
  */
 public class TestContextFactoryBean extends TestContextFactory implements FactoryBean<TestContext>, InitializingBean, ApplicationContextAware {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/context/resolver/MarshallerAliasResolver.java b/core/citrus-spring/src/main/java/org/citrusframework/context/resolver/MarshallerAliasResolver.java
index 860fa0708a..d4a9207284 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/context/resolver/MarshallerAliasResolver.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/context/resolver/MarshallerAliasResolver.java
@@ -21,9 +21,6 @@
 import org.citrusframework.xml.MarshallerAdapter;
 import org.springframework.oxm.Unmarshaller;
 
-/**
- * @author Christoph Deppisch
- */
 public class MarshallerAliasResolver implements TypeAliasResolver<Marshaller, org.springframework.oxm.Marshaller> {
 
     @Override
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/context/resolver/UnmarshallerAliasResolver.java b/core/citrus-spring/src/main/java/org/citrusframework/context/resolver/UnmarshallerAliasResolver.java
index 5471208540..1377da9088 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/context/resolver/UnmarshallerAliasResolver.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/context/resolver/UnmarshallerAliasResolver.java
@@ -21,9 +21,6 @@
 import org.citrusframework.xml.Unmarshaller;
 import org.springframework.oxm.Marshaller;
 
-/**
- * @author Christoph Deppisch
- */
 public class UnmarshallerAliasResolver implements TypeAliasResolver<Unmarshaller, org.springframework.oxm.Unmarshaller> {
 
     @Override
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/endpoint/adapter/TestBehaviorExecutingEndpointAdapter.java b/core/citrus-spring/src/main/java/org/citrusframework/endpoint/adapter/TestBehaviorExecutingEndpointAdapter.java
index 3a3d437c43..ce594872a1 100755
--- a/core/citrus-spring/src/main/java/org/citrusframework/endpoint/adapter/TestBehaviorExecutingEndpointAdapter.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/endpoint/adapter/TestBehaviorExecutingEndpointAdapter.java
@@ -29,7 +29,6 @@
  * Test executing endpoint adapter specialization executes a Java DSL test designer or test runner loaded from
  * Spring application context by bean name mapping.
  *
- * @author Christoph Deppisch
  * @since 1.3.1
  */
 public class TestBehaviorExecutingEndpointAdapter extends XmlTestExecutingEndpointAdapter {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/endpoint/adapter/XmlTestExecutingEndpointAdapter.java b/core/citrus-spring/src/main/java/org/citrusframework/endpoint/adapter/XmlTestExecutingEndpointAdapter.java
index 84b6916c7f..6ad7271da7 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/endpoint/adapter/XmlTestExecutingEndpointAdapter.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/endpoint/adapter/XmlTestExecutingEndpointAdapter.java
@@ -45,7 +45,6 @@
  * Special request dispatching endpoint adapter invokes XML test case for each incoming message. Incoming message is
  * passed to test case via normal in memory message queue connection as usual.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class XmlTestExecutingEndpointAdapter extends RequestDispatchingEndpointAdapter implements InitializingBean, BeanNameAware, ApplicationContextAware {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/endpoint/adapter/mapping/ContextLoadingMappingStrategy.java b/core/citrus-spring/src/main/java/org/citrusframework/endpoint/adapter/mapping/ContextLoadingMappingStrategy.java
index b68b51d100..d0e1ff1be7 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/endpoint/adapter/mapping/ContextLoadingMappingStrategy.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/endpoint/adapter/mapping/ContextLoadingMappingStrategy.java
@@ -28,7 +28,6 @@
  * Endpoint adapter mapping strategy loads new Spring Application contexts defined by one or more locations
  * and tries to find matching Spring bean with given name or id.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ContextLoadingMappingStrategy implements EndpointAdapterMappingStrategy {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/functions/DefaultFunctionLibraryFactory.java b/core/citrus-spring/src/main/java/org/citrusframework/functions/DefaultFunctionLibraryFactory.java
index bf534ead89..9c88d9bc48 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/functions/DefaultFunctionLibraryFactory.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/functions/DefaultFunctionLibraryFactory.java
@@ -23,9 +23,6 @@
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.Environment;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultFunctionLibraryFactory implements FactoryBean<DefaultFunctionLibrary>, ApplicationContextAware, EnvironmentAware {
 
     private ApplicationContext applicationContext;
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/functions/FunctionConfig.java b/core/citrus-spring/src/main/java/org/citrusframework/functions/FunctionConfig.java
index 25f103398e..ad8eb1be9c 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/functions/FunctionConfig.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/functions/FunctionConfig.java
@@ -20,7 +20,6 @@
 import org.springframework.context.annotation.Configuration;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 @Configuration
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/functions/FunctionRegistryFactory.java b/core/citrus-spring/src/main/java/org/citrusframework/functions/FunctionRegistryFactory.java
index 952bd24c7f..998162e5dc 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/functions/FunctionRegistryFactory.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/functions/FunctionRegistryFactory.java
@@ -26,7 +26,6 @@
  * The default function library is also added via Spring bean reference. This is why this registry explicitly doe not use default registry
  * in order to not duplicate the default function library.
  *
- * @author Christoph Deppisch
  */
 public class FunctionRegistryFactory implements FactoryBean<FunctionRegistry>, ApplicationContextAware {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/functions/core/EnvironmentPropertyFunction.java b/core/citrus-spring/src/main/java/org/citrusframework/functions/core/EnvironmentPropertyFunction.java
index 9b975ef116..adde5502aa 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/functions/core/EnvironmentPropertyFunction.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/functions/core/EnvironmentPropertyFunction.java
@@ -29,7 +29,6 @@
 /**
  * Function to get environment variable settings.
  *
- * @author Christoph Deppisch
  */
 public class EnvironmentPropertyFunction implements Function, EnvironmentAware {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/io/CitrusResourceEditor.java b/core/citrus-spring/src/main/java/org/citrusframework/io/CitrusResourceEditor.java
index 44f8c04203..baf7da0a26 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/io/CitrusResourceEditor.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/io/CitrusResourceEditor.java
@@ -33,7 +33,6 @@
  * Delegates to a {@link Resources} to do the {@link Resource} creation. The implementation follows the
  * implementation of {@link org.springframework.core.io.ResourceEditor}.
  *
- * @author Thorsten Schlathoelter
  * @since 4.0
  */
 public class CitrusResourceEditor extends PropertyEditorSupport {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/model/testcase/core/ReceiveActionType.java b/core/citrus-spring/src/main/java/org/citrusframework/model/testcase/core/ReceiveActionType.java
index 3dbad61b23..cfb497c980 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/model/testcase/core/ReceiveActionType.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/model/testcase/core/ReceiveActionType.java
@@ -19,7 +19,6 @@
 import org.citrusframework.model.testcase.core.ReceiveModel;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class ReceiveActionType extends ReceiveModel {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/model/testcase/core/SendActionType.java b/core/citrus-spring/src/main/java/org/citrusframework/model/testcase/core/SendActionType.java
index 8937497ec4..5581a08c88 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/model/testcase/core/SendActionType.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/model/testcase/core/SendActionType.java
@@ -19,7 +19,6 @@
 import org.citrusframework.model.testcase.core.SendModel;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class SendActionType extends SendModel {
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/report/MessageListenersFactory.java b/core/citrus-spring/src/main/java/org/citrusframework/report/MessageListenersFactory.java
index 6f56ff12ec..483096bae1 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/report/MessageListenersFactory.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/report/MessageListenersFactory.java
@@ -24,7 +24,6 @@
 /**
  * Factory bean automatically adds all message listeners that live in the Spring bean application context.
  *
- * @author Christoph Deppisch
  */
 public class MessageListenersFactory implements FactoryBean<MessageListeners>, ApplicationContextAware {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/report/TestActionListenersFactory.java b/core/citrus-spring/src/main/java/org/citrusframework/report/TestActionListenersFactory.java
index 02de33a939..e7d0d6f2c1 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/report/TestActionListenersFactory.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/report/TestActionListenersFactory.java
@@ -24,7 +24,6 @@
 /**
  * Factory bean automatically adds all test action listeners that live in the Spring bean application context.
  *
- * @author Christoph Deppisch
  */
 public class TestActionListenersFactory implements FactoryBean<TestActionListeners>, ApplicationContextAware {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/report/TestListenersFactory.java b/core/citrus-spring/src/main/java/org/citrusframework/report/TestListenersFactory.java
index 5c4568c5bf..bf6c82c0fc 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/report/TestListenersFactory.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/report/TestListenersFactory.java
@@ -24,7 +24,6 @@
 /**
  * Factory bean automatically adds all test listeners that live in the Spring bean application context.
  *
- * @author Christoph Deppisch
  */
 public class TestListenersFactory implements FactoryBean<TestListeners>, ApplicationContextAware {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/report/TestSuiteListenersFactory.java b/core/citrus-spring/src/main/java/org/citrusframework/report/TestSuiteListenersFactory.java
index 425ee9d2b0..92c37a9398 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/report/TestSuiteListenersFactory.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/report/TestSuiteListenersFactory.java
@@ -24,7 +24,6 @@
 /**
  * Factory bean automatically adds all test suite listeners that live in the Spring bean application context.
  *
- * @author Christoph Deppisch
  */
 public class TestSuiteListenersFactory implements FactoryBean<TestSuiteListeners>, ApplicationContextAware {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/reporter/ReporterConfig.java b/core/citrus-spring/src/main/java/org/citrusframework/reporter/ReporterConfig.java
index 96adfb96d4..4a25533d61 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/reporter/ReporterConfig.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/reporter/ReporterConfig.java
@@ -22,9 +22,6 @@
 import org.springframework.context.annotation.*;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
-/**
- * @author Christoph Deppisch
- */
 @Configuration
 public class ReporterConfig {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/reporter/TestReportersFactory.java b/core/citrus-spring/src/main/java/org/citrusframework/reporter/TestReportersFactory.java
index 39999f0edc..92292e4bb3 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/reporter/TestReportersFactory.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/reporter/TestReportersFactory.java
@@ -28,7 +28,6 @@
  * The default test reporters get also added via Spring bean reference. This is why this registry explicitly does not use default reporter
  * in order to not duplicate those.
  *
- * @author Christoph Deppisch
  */
 public class TestReportersFactory implements FactoryBean<TestReporters>, ApplicationContextAware {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/util/SpringBeanTypeConverter.java b/core/citrus-spring/src/main/java/org/citrusframework/util/SpringBeanTypeConverter.java
index 157d4ff558..67c32c0be1 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/util/SpringBeanTypeConverter.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/util/SpringBeanTypeConverter.java
@@ -35,9 +35,6 @@
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
-/**
- * @author Christoph Deppisch
- */
 public final class SpringBeanTypeConverter extends DefaultTypeConverter {
 
     /** Logger */
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/validation/MessageValidatorConfig.java b/core/citrus-spring/src/main/java/org/citrusframework/validation/MessageValidatorConfig.java
index c6af828d86..331cb82a62 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/validation/MessageValidatorConfig.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/validation/MessageValidatorConfig.java
@@ -32,7 +32,6 @@
  * Configuration loads message validator registry via factory bean and automatically adds all validators as Spring beans
  * in factory post processor.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 @Configuration
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/validation/MessageValidatorRegistryFactory.java b/core/citrus-spring/src/main/java/org/citrusframework/validation/MessageValidatorRegistryFactory.java
index dce3a271da..961756c017 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/validation/MessageValidatorRegistryFactory.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/validation/MessageValidatorRegistryFactory.java
@@ -26,7 +26,6 @@
  * The validators that are located in the Spring bean application context may overwrite existing default message validators that
  * have the same name.
  *
- * @author Christoph Deppisch
  */
 public class MessageValidatorRegistryFactory implements FactoryBean<MessageValidatorRegistry>, ApplicationContextAware {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/validation/interceptor/MessageProcessorsFactory.java b/core/citrus-spring/src/main/java/org/citrusframework/validation/interceptor/MessageProcessorsFactory.java
index 2f98b5c26a..8e6965920f 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/validation/interceptor/MessageProcessorsFactory.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/validation/interceptor/MessageProcessorsFactory.java
@@ -29,7 +29,6 @@
  * The default validation matcher library is also added via Spring bean reference. This is why this registry explicitly doe not use default registry
  * in order to not duplicate the default validation matcher library.
  *
- * @author Christoph Deppisch
  */
 public class MessageProcessorsFactory implements FactoryBean<MessageProcessors>, ApplicationContextAware {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherConfig.java b/core/citrus-spring/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherConfig.java
index 1199aa7050..d78f40c903 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherConfig.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherConfig.java
@@ -20,7 +20,6 @@
 import org.springframework.context.annotation.Configuration;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 @Configuration
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherRegistryFactory.java b/core/citrus-spring/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherRegistryFactory.java
index db757131a3..fb47378545 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherRegistryFactory.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/validation/matcher/ValidationMatcherRegistryFactory.java
@@ -26,7 +26,6 @@
  * The default validation matcher library is also added via Spring bean reference. This is why this registry explicitly doe not use default registry
  * in order to not duplicate the default validation matcher library.
  *
- * @author Christoph Deppisch
  */
 public class ValidationMatcherRegistryFactory implements FactoryBean<ValidationMatcherRegistry>, ApplicationContextAware {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/variable/GlobalVariablesPropertyLoader.java b/core/citrus-spring/src/main/java/org/citrusframework/variable/GlobalVariablesPropertyLoader.java
index 9a4b5ea8d0..ad70028756 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/variable/GlobalVariablesPropertyLoader.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/variable/GlobalVariablesPropertyLoader.java
@@ -36,7 +36,6 @@
 /**
  * Loads properties from an external property file and creates global test variables.
  *
- * @author Christoph Deppisch
  */
 public class GlobalVariablesPropertyLoader implements InitializingBean {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/xml/MarshallerAdapter.java b/core/citrus-spring/src/main/java/org/citrusframework/xml/MarshallerAdapter.java
index 0bc40105ca..6b6f25b9cd 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/xml/MarshallerAdapter.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/xml/MarshallerAdapter.java
@@ -26,7 +26,6 @@
 
 /**
  * Marshaller delegates to given Spring Oxm marshaller.
- * @author Christoph Deppisch
  */
 public class MarshallerAdapter implements org.citrusframework.xml.Marshaller, org.citrusframework.xml.Unmarshaller {
 
diff --git a/core/citrus-spring/src/main/java/org/citrusframework/xml/SpringMarshallerAdapter.java b/core/citrus-spring/src/main/java/org/citrusframework/xml/SpringMarshallerAdapter.java
index 09e1545fef..9d65a4b204 100644
--- a/core/citrus-spring/src/main/java/org/citrusframework/xml/SpringMarshallerAdapter.java
+++ b/core/citrus-spring/src/main/java/org/citrusframework/xml/SpringMarshallerAdapter.java
@@ -26,7 +26,6 @@
 
 /**
  * Spring Oxm marshaller delegates to given internal marshaller.
- * @author Christoph Deppisch
  */
 public class SpringMarshallerAdapter implements org.springframework.oxm.Marshaller, org.springframework.oxm.Unmarshaller {
 
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/BeanDefinitionParserTestSupport.java b/core/citrus-spring/src/test/java/org/citrusframework/BeanDefinitionParserTestSupport.java
index f2538ff1af..563493dc6d 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/BeanDefinitionParserTestSupport.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/BeanDefinitionParserTestSupport.java
@@ -31,9 +31,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeSuite;
 
-/**
- * @author Christoph Deppisch
- */
 @ContextConfiguration(classes = CitrusSpringConfig.class)
 public class BeanDefinitionParserTestSupport extends AbstractBeanDefinitionParserTest {
 
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/CitrusSpringContextProviderTest.java b/core/citrus-spring/src/test/java/org/citrusframework/CitrusSpringContextProviderTest.java
index 2e3e439dbd..760cf63171 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/CitrusSpringContextProviderTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/CitrusSpringContextProviderTest.java
@@ -19,9 +19,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CitrusSpringContextProviderTest {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/TestSuiteTest.java b/core/citrus-spring/src/test/java/org/citrusframework/TestSuiteTest.java
index f286847499..61213c5dbd 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/TestSuiteTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/TestSuiteTest.java
@@ -53,9 +53,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestSuiteTest extends AbstractTestNGUnitTest {
 
     @Mock
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/UnitTestSupport.java b/core/citrus-spring/src/test/java/org/citrusframework/UnitTestSupport.java
index 0c5460f334..4538ead0fa 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/UnitTestSupport.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/UnitTestSupport.java
@@ -31,9 +31,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeSuite;
 
-/**
- * @author Christoph Deppisch
- */
 @ContextConfiguration(classes = CitrusSpringConfig.class)
 public class UnitTestSupport extends AbstractTestNGUnitTest {
 
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/actions/CustomTestAction.java b/core/citrus-spring/src/test/java/org/citrusframework/actions/CustomTestAction.java
index 40fef40c82..b7e9dac90b 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/actions/CustomTestAction.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/actions/CustomTestAction.java
@@ -23,7 +23,6 @@
 import org.testng.Assert;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class CustomTestAction extends AbstractTestAction {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/common/TestLoaderTest.java b/core/citrus-spring/src/test/java/org/citrusframework/common/TestLoaderTest.java
index a3384f0fa9..504fc54fc3 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/common/TestLoaderTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/common/TestLoaderTest.java
@@ -19,9 +19,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestLoaderTest {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/CustomBeanConfig.java b/core/citrus-spring/src/test/java/org/citrusframework/config/CustomBeanConfig.java
index 0eca5489d8..c95c51dd23 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/CustomBeanConfig.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/CustomBeanConfig.java
@@ -24,7 +24,6 @@
 import org.springframework.context.annotation.Configuration;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 @Configuration
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/util/BeanDefinitionParserUtilsTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/util/BeanDefinitionParserUtilsTest.java
index 8820d093ed..403f408a57 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/util/BeanDefinitionParserUtilsTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/util/BeanDefinitionParserUtilsTest.java
@@ -23,9 +23,6 @@
 
 import org.citrusframework.testng.AbstractTestNGUnitTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class BeanDefinitionParserUtilsTest extends AbstractTestNGUnitTest {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ActionParserTest.java
index 5288168831..bbad3062da 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ActionParserTest.java
@@ -25,9 +25,6 @@
 import org.citrusframework.actions.EchoAction;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class ActionParserTest extends AbstractActionParserTest<TestAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/AntRunActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/AntRunActionParserTest.java
index 720f56a884..e0597866d9 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/AntRunActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/AntRunActionParserTest.java
@@ -23,9 +23,6 @@
 import org.citrusframework.actions.AntRunAction;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class AntRunActionParserTest extends AbstractActionParserTest<AntRunAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/AssertParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/AssertParserTest.java
index 1bf188d27d..84198f9735 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/AssertParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/AssertParserTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class AssertParserTest extends AbstractActionParserTest<org.citrusframework.container.Assert> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/AsyncParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/AsyncParserTest.java
index 5de3ac0a6f..c7d5eec5c1 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/AsyncParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/AsyncParserTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AsyncParserTest extends AbstractActionParserTest<Async> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CallTemplateParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CallTemplateParserTest.java
index a6ebb455c2..d8c29563b7 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CallTemplateParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CallTemplateParserTest.java
@@ -24,9 +24,6 @@
 import org.citrusframework.container.Template;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class CallTemplateParserTest extends AbstractActionParserTest<Template> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CatchParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CatchParserTest.java
index c4531b2345..4b90d258cf 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CatchParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CatchParserTest.java
@@ -24,9 +24,6 @@
 import org.citrusframework.container.Catch;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class CatchParserTest extends AbstractActionParserTest<Catch> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ConditionalParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ConditionalParserTest.java
index 9a916e866b..671c3a4f9d 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ConditionalParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ConditionalParserTest.java
@@ -23,7 +23,6 @@
 import org.citrusframework.testng.AbstractActionParserTest;
 
 /**
- * @author Matthias Beil
  * @since 1.2
  */
 public class ConditionalParserTest extends AbstractActionParserTest<Conditional> {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CreateVariablesActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CreateVariablesActionParserTest.java
index a80ef72014..388f84531b 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CreateVariablesActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CreateVariablesActionParserTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.actions.CreateVariablesAction;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class CreateVariablesActionParserTest extends AbstractActionParserTest<CreateVariablesAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CustomTestCaseParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CustomTestCaseParserTest.java
index 2a2fa2caa4..f2afae6854 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CustomTestCaseParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/CustomTestCaseParserTest.java
@@ -31,9 +31,6 @@
 
 import java.io.*;
 
-/**
- * @author Thorsten Schlatoelter
- */
 public class CustomTestCaseParserTest extends AbstractActionParserTest<EchoAction> {
 
     @BeforeClass
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/EchoActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/EchoActionParserTest.java
index 806ae1ac93..b9f8e5bf1d 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/EchoActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/EchoActionParserTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.actions.EchoAction;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class EchoActionParserTest extends AbstractActionParserTest<EchoAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/EmptyResponseEndpointAdapterParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/EmptyResponseEndpointAdapterParserTest.java
index 08ae9efd3d..adfdf2716f 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/EmptyResponseEndpointAdapterParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/EmptyResponseEndpointAdapterParserTest.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class EmptyResponseEndpointAdapterParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/FailActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/FailActionParserTest.java
index 8bd68751ff..2ec8f08497 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/FailActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/FailActionParserTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.actions.FailAction;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class FailActionParserTest extends AbstractActionParserTest<FailAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/FunctionLibraryParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/FunctionLibraryParserTest.java
index c1165c89d1..98422ff540 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/FunctionLibraryParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/FunctionLibraryParserTest.java
@@ -30,7 +30,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class FunctionLibraryParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/GlobalVariablesParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/GlobalVariablesParserTest.java
index edee2a45bf..fd133ec543 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/GlobalVariablesParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/GlobalVariablesParserTest.java
@@ -25,9 +25,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class GlobalVariablesParserTest extends BeanDefinitionParserTestSupport {
 
     @BeforeClass
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/InputActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/InputActionParserTest.java
index a9e380af5a..be7277eb12 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/InputActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/InputActionParserTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.actions.InputAction;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class InputActionParserTest extends AbstractActionParserTest<InputAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/IterateParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/IterateParserTest.java
index f917987910..02d8f2a780 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/IterateParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/IterateParserTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.container.Iterate;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class IterateParserTest extends AbstractActionParserTest<Iterate> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/JavaActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/JavaActionParserTest.java
index db8557a049..582a87ba3f 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/JavaActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/JavaActionParserTest.java
@@ -24,9 +24,6 @@
 import org.citrusframework.testng.AbstractActionParserTest;
 import org.citrusframework.util.InvocationDummy;
 
-/**
- * @author Christoph Deppisch
- */
 public class JavaActionParserTest extends AbstractActionParserTest<JavaAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/LoadPropertiesActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/LoadPropertiesActionParserTest.java
index c93450118e..566f1910b0 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/LoadPropertiesActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/LoadPropertiesActionParserTest.java
@@ -23,9 +23,6 @@
 import org.citrusframework.actions.LoadPropertiesAction;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class LoadPropertiesActionParserTest extends AbstractActionParserTest<LoadPropertiesAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/MessageValidatorRegistryParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/MessageValidatorRegistryParserTest.java
index b512b9e3ca..8d3ef65a3e 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/MessageValidatorRegistryParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/MessageValidatorRegistryParserTest.java
@@ -25,7 +25,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class MessageValidatorRegistryParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ParallelParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ParallelParserTest.java
index c490c226d1..0e4127fc19 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ParallelParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ParallelParserTest.java
@@ -23,9 +23,6 @@
 import org.citrusframework.container.Parallel;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class ParallelParserTest extends AbstractActionParserTest<Parallel> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/PurgeEndpointActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/PurgeEndpointActionParserTest.java
index 2b7ce1bef1..6f883c4898 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/PurgeEndpointActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/PurgeEndpointActionParserTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class PurgeEndpointActionParserTest extends AbstractActionParserTest<PurgeEndpointAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ReceiveMessageActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ReceiveMessageActionParserTest.java
index 833efb178b..f3e34389a5 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ReceiveMessageActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ReceiveMessageActionParserTest.java
@@ -36,9 +36,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageActionParserTest extends AbstractActionParserTest<ReceiveMessageAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ReceiveTimeoutActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ReceiveTimeoutActionParserTest.java
index 8fcd9a801e..9bed46c735 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ReceiveTimeoutActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ReceiveTimeoutActionParserTest.java
@@ -24,9 +24,6 @@
 import org.citrusframework.actions.ReceiveTimeoutAction;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveTimeoutActionParserTest extends AbstractActionParserTest<ReceiveTimeoutAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/RepeatOnErrorUntilTrueParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/RepeatOnErrorUntilTrueParserTest.java
index d3aa7dd8f1..f414f9b97c 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/RepeatOnErrorUntilTrueParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/RepeatOnErrorUntilTrueParserTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.container.RepeatOnErrorUntilTrue;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class RepeatOnErrorUntilTrueParserTest extends AbstractActionParserTest<RepeatOnErrorUntilTrue> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/RepeatUntilTrueParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/RepeatUntilTrueParserTest.java
index 68e3bfcab7..78d3873f65 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/RepeatUntilTrueParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/RepeatUntilTrueParserTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.container.RepeatUntilTrue;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class RepeatUntilTrueParserTest extends AbstractActionParserTest<RepeatUntilTrue> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/RequestDispatchingEndpointAdapterParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/RequestDispatchingEndpointAdapterParserTest.java
index f5584b1fbe..6aa1719ba6 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/RequestDispatchingEndpointAdapterParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/RequestDispatchingEndpointAdapterParserTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RequestDispatchingEndpointAdapterParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SendMessageActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SendMessageActionParserTest.java
index 4678e98532..e0ea8026e8 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SendMessageActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SendMessageActionParserTest.java
@@ -28,9 +28,6 @@
 
 import java.io.IOException;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendMessageActionParserTest extends AbstractActionParserTest<SendMessageAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceAfterSuiteParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceAfterSuiteParserTest.java
index a671b85f6b..b543c2e4c7 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceAfterSuiteParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceAfterSuiteParserTest.java
@@ -28,7 +28,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class SequenceAfterSuiteParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceAfterTestParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceAfterTestParserTest.java
index 5ca9a1d119..b30460e66f 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceAfterTestParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceAfterTestParserTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class SequenceAfterTestParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceBeforeSuiteParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceBeforeSuiteParserTest.java
index cf4f8fa4f5..c32cbe0b48 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceBeforeSuiteParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceBeforeSuiteParserTest.java
@@ -28,7 +28,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class SequenceBeforeSuiteParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceBeforeTestParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceBeforeTestParserTest.java
index e005b6548b..d99b2fce15 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceBeforeTestParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceBeforeTestParserTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class SequenceBeforeTestParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceParserTest.java
index 9c2cf22500..023087eeb6 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SequenceParserTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.container.Sequence;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class SequenceParserTest extends AbstractActionParserTest<Sequence> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SleepActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SleepActionParserTest.java
index b2afb2b07e..88de89e44c 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SleepActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/SleepActionParserTest.java
@@ -24,9 +24,6 @@
 import org.citrusframework.actions.SleepAction;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class SleepActionParserTest extends AbstractActionParserTest<SleepAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StartServerActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StartServerActionParserTest.java
index 720036d6ad..ef93d3776d 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StartServerActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StartServerActionParserTest.java
@@ -23,7 +23,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.2
  */
 public class StartServerActionParserTest extends AbstractActionParserTest<StartServerAction> {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StaticResponseEndpointAdapterParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StaticResponseEndpointAdapterParserTest.java
index ec3ee7d374..0bc311a05e 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StaticResponseEndpointAdapterParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StaticResponseEndpointAdapterParserTest.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class StaticResponseEndpointAdapterParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StopServerActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StopServerActionParserTest.java
index e0f7487106..b44075ac9d 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StopServerActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StopServerActionParserTest.java
@@ -23,7 +23,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.2
  */
 public class StopServerActionParserTest extends AbstractActionParserTest<StopServerAction> {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StopTimeActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StopTimeActionParserTest.java
index abad3aac8c..31c598cbb4 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StopTimeActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StopTimeActionParserTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.actions.StopTimeAction;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopTimeActionParserTest extends AbstractActionParserTest<StopTimeAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StopTimerParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StopTimerParserTest.java
index a70067b9ea..dbe8998a98 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StopTimerParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/StopTimerParserTest.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class StopTimerParserTest extends AbstractActionParserTest<StopTimerAction> {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TemplateParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TemplateParserTest.java
index e42babf07f..3953e25f79 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TemplateParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TemplateParserTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TemplateParserTest extends AbstractActionParserTest<Template> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TestCaseParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TestCaseParserTest.java
index e13e4d102a..b95be7717e 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TestCaseParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TestCaseParserTest.java
@@ -25,7 +25,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class TestCaseParserTest extends AbstractActionParserTest<EchoAction> {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TimeoutProducingEndpointAdapterParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TimeoutProducingEndpointAdapterParserTest.java
index 65b5ef65c0..fd302dbe2b 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TimeoutProducingEndpointAdapterParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TimeoutProducingEndpointAdapterParserTest.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class TimeoutProducingEndpointAdapterParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TimerParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TimerParserTest.java
index 269ef59a45..b397e704cf 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TimerParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TimerParserTest.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class TimerParserTest extends AbstractActionParserTest<Timer> {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TraceVariablesActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TraceVariablesActionParserTest.java
index 8b2cda674e..9b8de8d00b 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TraceVariablesActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TraceVariablesActionParserTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.actions.TraceVariablesAction;
 import org.citrusframework.testng.AbstractActionParserTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class TraceVariablesActionParserTest extends AbstractActionParserTest<TraceVariablesAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TransformActionParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TransformActionParserTest.java
index ae4294df57..59c31a8cf4 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TransformActionParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/TransformActionParserTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TransformActionParserTest extends AbstractActionParserTest<TransformAction> {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ValidationMatcherLibraryParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ValidationMatcherLibraryParserTest.java
index 0087a16c5d..f12a2c4186 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ValidationMatcherLibraryParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/ValidationMatcherLibraryParserTest.java
@@ -30,7 +30,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class ValidationMatcherLibraryParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/WaitParserTest.java b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/WaitParserTest.java
index 57bc34df58..247aa96343 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/config/xml/WaitParserTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/config/xml/WaitParserTest.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Martin Maher
  * @since 2.4
  */
 public class WaitParserTest extends AbstractActionParserTest<Wait> {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/context/SpringBeanReferenceResolverTest.java b/core/citrus-spring/src/test/java/org/citrusframework/context/SpringBeanReferenceResolverTest.java
index 8fccea9f89..beff07ea6a 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/context/SpringBeanReferenceResolverTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/context/SpringBeanReferenceResolverTest.java
@@ -26,9 +26,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SpringBeanReferenceResolverTest extends UnitTestSupport {
 
     private SpringBeanReferenceResolver resolver;
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/endpoint/adapter/mapping/ContextLoadingMappingStrategyTest.java b/core/citrus-spring/src/test/java/org/citrusframework/endpoint/adapter/mapping/ContextLoadingMappingStrategyTest.java
index 0c329235a3..693097ea60 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/endpoint/adapter/mapping/ContextLoadingMappingStrategyTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/endpoint/adapter/mapping/ContextLoadingMappingStrategyTest.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ContextLoadingMappingStrategyTest {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/functions/CustomFunction.java b/core/citrus-spring/src/test/java/org/citrusframework/functions/CustomFunction.java
index 7950b9c93e..d4e5ce74ec 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/functions/CustomFunction.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/functions/CustomFunction.java
@@ -25,7 +25,6 @@
 import org.testng.Assert;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class CustomFunction implements Function {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/functions/DefaultFunctionLibraryFactoryTest.java b/core/citrus-spring/src/test/java/org/citrusframework/functions/DefaultFunctionLibraryFactoryTest.java
index 2e036f9fef..184579a77f 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/functions/DefaultFunctionLibraryFactoryTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/functions/DefaultFunctionLibraryFactoryTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DefaultFunctionLibraryFactoryTest extends UnitTestSupport {
 
     @Autowired
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/functions/core/EnvironmentPropertyFunctionTest.java b/core/citrus-spring/src/test/java/org/citrusframework/functions/core/EnvironmentPropertyFunctionTest.java
index 79864fd034..7d98266f26 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/functions/core/EnvironmentPropertyFunctionTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/functions/core/EnvironmentPropertyFunctionTest.java
@@ -33,7 +33,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class EnvironmentPropertyFunctionTest extends AbstractTestNGUnitTest {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/util/InvocationDummy.java b/core/citrus-spring/src/test/java/org/citrusframework/util/InvocationDummy.java
index 68de3c9e18..8cf2d5e467 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/util/InvocationDummy.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/util/InvocationDummy.java
@@ -19,9 +19,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public class InvocationDummy {
 
     /**
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/util/SpringBeanTypeConverterTest.java b/core/citrus-spring/src/test/java/org/citrusframework/util/SpringBeanTypeConverterTest.java
index eb19b75be0..0ebe7330c3 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/util/SpringBeanTypeConverterTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/util/SpringBeanTypeConverterTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SpringBeanTypeConverterTest {
 
     private final SpringBeanTypeConverter converter = SpringBeanTypeConverter.INSTANCE;
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/util/TypeConverterTest.java b/core/citrus-spring/src/test/java/org/citrusframework/util/TypeConverterTest.java
index 63786a144d..c06f16f47a 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/util/TypeConverterTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/util/TypeConverterTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TypeConverterTest {
 
     @Test
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/validation/matcher/CustomValidationMatcher.java b/core/citrus-spring/src/test/java/org/citrusframework/validation/matcher/CustomValidationMatcher.java
index 1745bad2c9..4b6ad29b49 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/validation/matcher/CustomValidationMatcher.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/validation/matcher/CustomValidationMatcher.java
@@ -26,7 +26,6 @@
 import org.testng.Assert;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class CustomValidationMatcher implements ValidationMatcher {
diff --git a/core/citrus-spring/src/test/java/org/citrusframework/variable/GlobalVariablesPropertyLoaderTest.java b/core/citrus-spring/src/test/java/org/citrusframework/variable/GlobalVariablesPropertyLoaderTest.java
index b1a9f7932b..d71f2f9f89 100644
--- a/core/citrus-spring/src/test/java/org/citrusframework/variable/GlobalVariablesPropertyLoaderTest.java
+++ b/core/citrus-spring/src/test/java/org/citrusframework/variable/GlobalVariablesPropertyLoaderTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class GlobalVariablesPropertyLoaderTest extends UnitTestSupport {
 
     @Test
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/AbstractCamelRouteAction.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/AbstractCamelRouteAction.java
index e116ac3e93..be3c13942e 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/AbstractCamelRouteAction.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/AbstractCamelRouteAction.java
@@ -29,7 +29,6 @@
 import org.citrusframework.util.ObjectHelper;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public abstract class AbstractCamelRouteAction extends AbstractTestAction {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CamelActionBuilder.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CamelActionBuilder.java
index edbbf7cf95..f9d1cba643 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CamelActionBuilder.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CamelActionBuilder.java
@@ -24,9 +24,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.util.ObjectHelper;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelActionBuilder implements TestActionBuilder.DelegatingTestActionBuilder<TestAction>, ReferenceResolverAware {
 
     private CamelContext camelContext;
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CamelControlBusAction.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CamelControlBusAction.java
index 546536e2ed..538bf61db0 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CamelControlBusAction.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CamelControlBusAction.java
@@ -30,7 +30,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class CamelControlBusAction extends AbstractCamelRouteAction {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CreateCamelRouteAction.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CreateCamelRouteAction.java
index 2a213c9b90..c33a624490 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CreateCamelRouteAction.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/CreateCamelRouteAction.java
@@ -32,7 +32,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class CreateCamelRouteAction extends AbstractCamelRouteAction {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/RemoveCamelRouteAction.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/RemoveCamelRouteAction.java
index d6dcf4de30..8d6205b6b3 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/RemoveCamelRouteAction.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/RemoveCamelRouteAction.java
@@ -23,7 +23,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class RemoveCamelRouteAction extends AbstractCamelRouteAction {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/StartCamelRouteAction.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/StartCamelRouteAction.java
index 46e9659950..ecfc5ea439 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/StartCamelRouteAction.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/StartCamelRouteAction.java
@@ -23,7 +23,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class StartCamelRouteAction extends AbstractCamelRouteAction {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/StopCamelRouteAction.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/StopCamelRouteAction.java
index acae51a1b0..0da44fffc8 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/StopCamelRouteAction.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/actions/StopCamelRouteAction.java
@@ -23,7 +23,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class StopCamelRouteAction extends AbstractCamelRouteAction {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelEndpointConfig.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelEndpointConfig.java
index 818bbe67af..07eef1b6ab 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelEndpointConfig.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelEndpointConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelEndpointConfigParser.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelEndpointConfigParser.java
index dba8d37424..e91e28a3a2 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelEndpointConfigParser.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelEndpointConfigParser.java
@@ -25,9 +25,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.util.StringUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelEndpointConfigParser implements AnnotationConfigParser<CamelEndpointConfig, CamelEndpoint> {
 
     @Override
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelSyncEndpointConfig.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelSyncEndpointConfig.java
index c3c151f44b..6e7eb00802 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelSyncEndpointConfig.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelSyncEndpointConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelSyncEndpointConfigParser.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelSyncEndpointConfigParser.java
index 9e89408401..36397aacc1 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelSyncEndpointConfigParser.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/annotation/CamelSyncEndpointConfigParser.java
@@ -26,9 +26,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.util.StringUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelSyncEndpointConfigParser implements AnnotationConfigParser<CamelSyncEndpointConfig, CamelSyncEndpoint> {
 
     @Override
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/handler/CitrusCamelConfigNamespaceHandler.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/handler/CitrusCamelConfigNamespaceHandler.java
index 5a5a8bde82..85fd158cca 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/handler/CitrusCamelConfigNamespaceHandler.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/handler/CitrusCamelConfigNamespaceHandler.java
@@ -21,7 +21,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CitrusCamelConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/handler/CitrusCamelTestcaseNamespaceHandler.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/handler/CitrusCamelTestcaseNamespaceHandler.java
index d1be99f87f..3bd7170f8a 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/handler/CitrusCamelTestcaseNamespaceHandler.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/handler/CitrusCamelTestcaseNamespaceHandler.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class CitrusCamelTestcaseNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/AbstractCamelRouteActionParser.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/AbstractCamelRouteActionParser.java
index c35c37a93e..3e0fed78b9 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/AbstractCamelRouteActionParser.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/AbstractCamelRouteActionParser.java
@@ -30,7 +30,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public abstract class AbstractCamelRouteActionParser implements BeanDefinitionParser {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CamelControlBusActionParser.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CamelControlBusActionParser.java
index 21f14ecad2..dd540e4ad8 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CamelControlBusActionParser.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CamelControlBusActionParser.java
@@ -25,7 +25,6 @@
 /**
  * Bean definition parser for starting Camel routes action in test case.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class CamelControlBusActionParser extends AbstractCamelRouteActionParser {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CamelEndpointParser.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CamelEndpointParser.java
index 76d7e47ded..5a1be94b96 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CamelEndpointParser.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CamelEndpointParser.java
@@ -27,7 +27,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelEndpointParser extends AbstractEndpointParser {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CamelSyncEndpointParser.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CamelSyncEndpointParser.java
index a8593577f8..db0ecb1c1a 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CamelSyncEndpointParser.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CamelSyncEndpointParser.java
@@ -26,7 +26,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelSyncEndpointParser extends CamelEndpointParser {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CreateCamelRouteActionParser.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CreateCamelRouteActionParser.java
index 387b26ce05..e2a3e2e849 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CreateCamelRouteActionParser.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/CreateCamelRouteActionParser.java
@@ -26,7 +26,6 @@
 /**
  * Bean definition parser for creating Camel routes action in test case.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class CreateCamelRouteActionParser extends AbstractCamelRouteActionParser {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/RemoveCamelRouteActionParser.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/RemoveCamelRouteActionParser.java
index b0a461439f..fc5d0f5c9d 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/RemoveCamelRouteActionParser.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/RemoveCamelRouteActionParser.java
@@ -28,7 +28,6 @@
 /**
  * Bean definition parser for starting Camel routes action in test case.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class RemoveCamelRouteActionParser extends AbstractCamelRouteActionParser {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/StartCamelRouteActionParser.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/StartCamelRouteActionParser.java
index 09fa89831c..9ac2d82d3f 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/StartCamelRouteActionParser.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/StartCamelRouteActionParser.java
@@ -28,7 +28,6 @@
 /**
  * Bean definition parser for starting Camel routes action in test case.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class StartCamelRouteActionParser extends AbstractCamelRouteActionParser {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/StopCamelRouteActionParser.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/StopCamelRouteActionParser.java
index c8de4dce34..be4f4866c4 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/StopCamelRouteActionParser.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/config/xml/StopCamelRouteActionParser.java
@@ -28,7 +28,6 @@
 /**
  * Bean definition parser for starting Camel routes action in test case.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class StopCamelRouteActionParser extends AbstractCamelRouteActionParser {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/dsl/CamelContextAware.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/dsl/CamelContextAware.java
index 7aa16aa618..faf5c999c5 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/dsl/CamelContextAware.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/dsl/CamelContextAware.java
@@ -18,9 +18,6 @@
 
 import org.apache.camel.CamelContext;
 
-/**
- * @author Christoph Deppisch
- */
 public interface CamelContextAware<T> {
 
     T camelContext(CamelContext camelContext);
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/dsl/CamelSupport.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/dsl/CamelSupport.java
index eaf8e8f546..ba3fb73a3a 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/dsl/CamelSupport.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/dsl/CamelSupport.java
@@ -37,7 +37,6 @@
 
 /**
  * Support class combining all available Apache Camel Java DSL capabilities.
- * @author Christoph Deppisch
  */
 public class CamelSupport {
 
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/dsl/EndpointBuilderFactorySupport.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/dsl/EndpointBuilderFactorySupport.java
index 5184684b9d..366629b813 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/dsl/EndpointBuilderFactorySupport.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/dsl/EndpointBuilderFactorySupport.java
@@ -18,8 +18,5 @@
 
 import org.apache.camel.builder.endpoint.EndpointBuilderFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public class EndpointBuilderFactorySupport implements EndpointBuilderFactory {
 }
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelConsumer.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelConsumer.java
index 4c631b90a0..9ef430c804 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelConsumer.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelConsumer.java
@@ -29,7 +29,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelConsumer implements Consumer {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpoint.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpoint.java
index 50d8d28dba..b936d93bc8 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpoint.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpoint.java
@@ -21,7 +21,6 @@
 import org.citrusframework.messaging.Producer;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelEndpoint extends AbstractEndpoint {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpointBuilder.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpointBuilder.java
index d0bd0c9e9b..645675a3ca 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpointBuilder.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpointBuilder.java
@@ -22,9 +22,6 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelEndpointBuilder extends AbstractEndpointBuilder<CamelEndpoint> {
 
     /** Endpoint target */
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpointComponent.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpointComponent.java
index f92e3af275..6a3cf05a0a 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpointComponent.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpointComponent.java
@@ -25,7 +25,6 @@
 import org.apache.camel.impl.DefaultCamelContext;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpointConfiguration.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpointConfiguration.java
index 2cbe5e13ca..5357486452 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpointConfiguration.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpointConfiguration.java
@@ -21,7 +21,6 @@
 import org.apache.camel.*;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelEndpointConfiguration extends AbstractEndpointConfiguration {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpoints.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpoints.java
index c3d45fd5da..ee8020573f 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpoints.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelEndpoints.java
@@ -18,9 +18,6 @@
 
 import org.citrusframework.endpoint.builder.AsyncSyncEndpointBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class CamelEndpoints extends AsyncSyncEndpointBuilder<CamelEndpointBuilder, CamelSyncEndpointBuilder> {
     /**
      * Private constructor setting the sync and async builder implementation.
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelProducer.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelProducer.java
index e4e7c5030e..3121d80426 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelProducer.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelProducer.java
@@ -26,7 +26,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelProducer implements Producer {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncConsumer.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncConsumer.java
index 1ede45f2d6..4c95e663c7 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncConsumer.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncConsumer.java
@@ -33,7 +33,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelSyncConsumer extends CamelConsumer implements ReplyProducer {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncEndpoint.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncEndpoint.java
index 3975eb2b1e..6809c65d7a 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncEndpoint.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncEndpoint.java
@@ -20,7 +20,6 @@
 import org.citrusframework.messaging.Producer;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelSyncEndpoint extends CamelEndpoint {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncEndpointBuilder.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncEndpointBuilder.java
index 8934d12582..4106d660c2 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncEndpointBuilder.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncEndpointBuilder.java
@@ -23,7 +23,6 @@
 import org.apache.camel.Endpoint;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class CamelSyncEndpointBuilder extends AbstractEndpointBuilder<CamelSyncEndpoint> {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncEndpointConfiguration.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncEndpointConfiguration.java
index 5dca152b5d..fc5b8d257b 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncEndpointConfiguration.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncEndpointConfiguration.java
@@ -21,7 +21,6 @@
 import org.citrusframework.message.MessageCorrelator;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelSyncEndpointConfiguration extends CamelEndpointConfiguration implements PollableEndpointConfiguration {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncProducer.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncProducer.java
index ca34aeb3e5..8a4fa3e154 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncProducer.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/endpoint/CamelSyncProducer.java
@@ -32,7 +32,6 @@
  * Reply message is correlated and stored in correlation manager. This way test cases are able to receive synchronous
  * message asynchronously at later time.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelSyncProducer extends CamelProducer implements ReplyConsumer {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelDataFormatMessageProcessor.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelDataFormatMessageProcessor.java
index d17df110bb..3f4f0b72bf 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelDataFormatMessageProcessor.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelDataFormatMessageProcessor.java
@@ -36,7 +36,6 @@
 /**
  * Camel message processor working with data formats to marshal/unmarshal the message body.
  *
- * @author Christoph Deppisch
  */
 public class CamelDataFormatMessageProcessor extends CamelMessageProcessor {
 
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelMessageConverter.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelMessageConverter.java
index fba88f770c..d90a7d0450 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelMessageConverter.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelMessageConverter.java
@@ -30,7 +30,6 @@
  * Message converter able to read Camel exchange and create proper Spring Integration message
  * for internal use.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelMessageConverter implements MessageConverter<Exchange, Exchange, CamelEndpointConfiguration> {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelMessageHeaders.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelMessageHeaders.java
index 06d0598df7..9b08cb0563 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelMessageHeaders.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelMessageHeaders.java
@@ -19,7 +19,6 @@
 import org.citrusframework.message.MessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public abstract class CamelMessageHeaders {
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelMessageProcessor.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelMessageProcessor.java
index 7febcf6dac..89dd31ea0c 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelMessageProcessor.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelMessageProcessor.java
@@ -36,7 +36,6 @@
  * Message processor delegates to Apache Camel processor and sets the message header and body from the processed Camel
  * exchange.
  *
- * @author Christoph Deppisch
  */
 public class CamelMessageProcessor implements MessageProcessor {
 
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelRouteProcessor.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelRouteProcessor.java
index d3ffca68b8..ec45c17a97 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelRouteProcessor.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelRouteProcessor.java
@@ -34,7 +34,6 @@
  * Message processor builds new route from given processor definition and delegates to the Apache Camel route.
  * Sets the message header and body from the processed Camel exchange.
  *
- * @author Christoph Deppisch
  */
 public class CamelRouteProcessor extends CamelMessageProcessor {
 
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelTransformMessageProcessor.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelTransformMessageProcessor.java
index a01ec6b1a3..3ccc021452 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelTransformMessageProcessor.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/message/CamelTransformMessageProcessor.java
@@ -23,7 +23,6 @@
 /**
  * Camel message processor performs transformation on message headers and body.
  *
- * @author Christoph Deppisch
  */
 public class CamelTransformMessageProcessor extends CamelMessageProcessor {
 
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/util/CamelTypeConverter.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/util/CamelTypeConverter.java
index 029381f712..0c8e14c925 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/util/CamelTypeConverter.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/util/CamelTypeConverter.java
@@ -20,9 +20,6 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.impl.engine.SimpleCamelContext;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelTypeConverter extends DefaultTypeConverter {
 
     public static CamelTypeConverter INSTANCE = new CamelTypeConverter();
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/xml/Camel.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/xml/Camel.java
index 43d630c0f6..889314eae8 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/xml/Camel.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/xml/Camel.java
@@ -38,9 +38,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "camel")
 public class Camel implements TestActionBuilder<TestAction>, ReferenceResolverAware {
 
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/yaml/Camel.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/yaml/Camel.java
index c933a9307f..86cdeecf3c 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/yaml/Camel.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/yaml/Camel.java
@@ -25,9 +25,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 public class Camel implements TestActionBuilder<TestAction>, ReferenceResolverAware {
 
     private CamelRouteActionBuilderWrapper<?> delegate;
diff --git a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/yaml/ControlBus.java b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/yaml/ControlBus.java
index 18ffc783c7..afbbc4b2f3 100644
--- a/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/yaml/ControlBus.java
+++ b/endpoints/citrus-camel/src/main/java/org/citrusframework/camel/yaml/ControlBus.java
@@ -18,9 +18,6 @@
 
 import org.citrusframework.camel.actions.CamelControlBusAction;
 
-/**
- * @author Christoph Deppisch
- */
 public class ControlBus implements CamelRouteActionBuilderWrapper<CamelControlBusAction.Builder> {
 
     private final CamelControlBusAction.Builder builder = new CamelControlBusAction.Builder();
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/UnitTestSupport.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/UnitTestSupport.java
index 8dcaa86650..b9e2920ada 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/UnitTestSupport.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/UnitTestSupport.java
@@ -20,9 +20,6 @@
 import org.citrusframework.context.TestContextFactory;
 import org.testng.annotations.BeforeMethod;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport {
 
     protected TestContextFactory testContextFactory;
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/CamelActionBuilderTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/CamelActionBuilderTest.java
index d4d0541a25..f2c9cc059c 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/CamelActionBuilderTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/CamelActionBuilderTest.java
@@ -31,9 +31,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelActionBuilderTest {
 
     private CamelActionBuilder fixture;
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/dsl/CamelRouteTestActionRunnerTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/dsl/CamelRouteTestActionRunnerTest.java
index 735ad89d38..8fd3a67328 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/dsl/CamelRouteTestActionRunnerTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/actions/dsl/CamelRouteTestActionRunnerTest.java
@@ -34,7 +34,6 @@
 import static org.citrusframework.camel.dsl.CamelSupport.camel;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class CamelRouteTestActionRunnerTest extends UnitTestSupport {
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/annotation/CamelEndpointConfigParserTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/annotation/CamelEndpointConfigParserTest.java
index 6343c72280..81d4008b9a 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/annotation/CamelEndpointConfigParserTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/annotation/CamelEndpointConfigParserTest.java
@@ -38,9 +38,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelEndpointConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/annotation/CamelSyncEndpointConfigParserTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/annotation/CamelSyncEndpointConfigParserTest.java
index b6a4174537..96d17ab8af 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/annotation/CamelSyncEndpointConfigParserTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/annotation/CamelSyncEndpointConfigParserTest.java
@@ -36,9 +36,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelSyncEndpointConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/xml/CamelEndpointParserTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/xml/CamelEndpointParserTest.java
index 1fe9b71603..dd2c829ab4 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/xml/CamelEndpointParserTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/xml/CamelEndpointParserTest.java
@@ -25,7 +25,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelEndpointParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/xml/CamelSyncEndpointParserTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/xml/CamelSyncEndpointParserTest.java
index 6ceb4529c0..1d721f5da2 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/xml/CamelSyncEndpointParserTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/config/xml/CamelSyncEndpointParserTest.java
@@ -26,7 +26,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelSyncEndpointParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointComponentTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointComponentTest.java
index 8a28620dc5..35c15cef85 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointComponentTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointComponentTest.java
@@ -36,7 +36,6 @@
 
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelEndpointComponentTest {
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointTest.java
index 12cf0383a7..f53f6914a5 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointTest.java
@@ -39,7 +39,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelEndpointTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointsTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointsTest.java
index 0710843708..be2cb427e9 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointsTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelEndpointsTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelSyncEndpointTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelSyncEndpointTest.java
index 32b845ab97..980ac181dd 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelSyncEndpointTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/endpoint/CamelSyncEndpointTest.java
@@ -37,7 +37,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelSyncEndpointTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/AbstractGroovyActionDslTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/AbstractGroovyActionDslTest.java
index 591d22cd5e..ea0de7d341 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/AbstractGroovyActionDslTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/AbstractGroovyActionDslTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractGroovyActionDslTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/ControlBusTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/ControlBusTest.java
index b87744a34b..a174ca6d6e 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/ControlBusTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/ControlBusTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ControlBusTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/CreateRoutesTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/CreateRoutesTest.java
index e1c4cf3f29..dbc441445d 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/CreateRoutesTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/CreateRoutesTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CreateRoutesTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/RemoveRoutesTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/RemoveRoutesTest.java
index 7cc9de6e52..acd7429861 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/RemoveRoutesTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/RemoveRoutesTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RemoveRoutesTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/StartRoutesTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/StartRoutesTest.java
index d5204d27b0..c4b7ec0462 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/StartRoutesTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/StartRoutesTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StartRoutesTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/StopRoutesTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/StopRoutesTest.java
index 8192998158..ae49430d4c 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/StopRoutesTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/groovy/StopRoutesTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopRoutesTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelControlbusIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelControlbusIT.java
index 9dc0ba4916..187d9a2c66 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelControlbusIT.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelControlbusIT.java
@@ -31,9 +31,6 @@
 import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.direct;
 import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.seda;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelControlbusIT extends TestNGCitrusSpringSupport {
 
     @Autowired
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelDataFormatIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelDataFormatIT.java
index f0cf731562..f01e521219 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelDataFormatIT.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelDataFormatIT.java
@@ -28,9 +28,6 @@
 import static org.citrusframework.camel.dsl.CamelSupport.camel;
 import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.seda;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelDataFormatIT extends TestNGCitrusSpringSupport {
 
     @Autowired
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointExceptionIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointExceptionIT.java
index 7fb0f8b126..38e0cd2216 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointExceptionIT.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointExceptionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointFactoryIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointFactoryIT.java
index 06d00ed9ff..c28411425e 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointFactoryIT.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointFactoryIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointIT.java
index 27a0d6c240..584ab86076 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointIT.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelEndpointIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelProcessorIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelProcessorIT.java
index 7d1dc32236..6b8b3f75a7 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelProcessorIT.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelProcessorIT.java
@@ -28,9 +28,6 @@
 import static org.citrusframework.camel.dsl.CamelSupport.camel;
 import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.seda;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelProcessorIT extends TestNGCitrusSpringSupport {
 
     @Autowired
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteActionIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteActionIT.java
index 88d6315c9f..7f2b157f72 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteActionIT.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteActionIT.java
@@ -32,9 +32,6 @@
 import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.direct;
 import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.seda;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelRouteActionIT extends TestNGCitrusSpringSupport {
 
     @Autowired
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteDefinitionIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteDefinitionIT.java
index 6020335e28..022786b437 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteDefinitionIT.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteDefinitionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteIT.java
index f83f308fcd..56d71e4f3c 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteIT.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteIT.java
@@ -26,7 +26,6 @@
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class CamelRouteIT extends TestNGCitrusSupport {
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteProcessorIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteProcessorIT.java
index 962100fff9..42cc349caa 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteProcessorIT.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelRouteProcessorIT.java
@@ -33,9 +33,6 @@
 import static org.apache.camel.builder.Builder.simple;
 import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.seda;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelRouteProcessorIT extends TestNGCitrusSpringSupport {
 
     @Autowired
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelSyncEndpointIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelSyncEndpointIT.java
index 8bd04212ec..6be59f9585 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelSyncEndpointIT.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelSyncEndpointIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelTransformIT.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelTransformIT.java
index 89415d8ee3..7a54904e92 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelTransformIT.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/integration/CamelTransformIT.java
@@ -28,9 +28,6 @@
 import static org.citrusframework.camel.dsl.CamelSupport.camel;
 import static org.apache.camel.builder.endpoint.StaticEndpointBuilders.seda;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelTransformIT extends TestNGCitrusSpringSupport {
 
     @Autowired
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelDataFormatMessageProcessorTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelDataFormatMessageProcessorTest.java
index 9133a3477c..397d5335d5 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelDataFormatMessageProcessorTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelDataFormatMessageProcessorTest.java
@@ -33,9 +33,6 @@
 import static org.citrusframework.camel.message.CamelDataFormatMessageProcessor.Builder.marshal;
 import static org.citrusframework.camel.message.CamelDataFormatMessageProcessor.Builder.unmarshal;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelDataFormatMessageProcessorTest extends AbstractTestNGUnitTest {
 
     private final CamelContext camelContext = new DefaultCamelContext();
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelMessageConverterTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelMessageConverterTest.java
index 20aa9047aa..21fc875f24 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelMessageConverterTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelMessageConverterTest.java
@@ -38,7 +38,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CamelMessageConverterTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelMessageProcessorTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelMessageProcessorTest.java
index 0c7c0a27eb..800f775922 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelMessageProcessorTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelMessageProcessorTest.java
@@ -33,9 +33,6 @@
 
 import static org.citrusframework.camel.message.CamelMessageProcessor.Builder.process;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelMessageProcessorTest extends AbstractTestNGUnitTest {
 
     private final CamelContext camelContext = new DefaultCamelContext();
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelTransformMessageProcessorTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelTransformMessageProcessorTest.java
index f4ed0609b1..db7c7fc462 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelTransformMessageProcessorTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/message/CamelTransformMessageProcessorTest.java
@@ -33,9 +33,6 @@
 
 import static org.citrusframework.camel.message.CamelTransformMessageProcessor.Builder.transform;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelTransformMessageProcessorTest extends AbstractTestNGUnitTest {
 
     private final CamelContext camelContext = new DefaultCamelContext();
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/util/CamelTypeConverterTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/util/CamelTypeConverterTest.java
index df4ce5907f..e359636291 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/util/CamelTypeConverterTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/util/CamelTypeConverterTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CamelTypeConverterTest {
 
     private final CamelTypeConverter typeConverter = CamelTypeConverter.INSTANCE;
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/util/TypeConverterTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/util/TypeConverterTest.java
index 24eae4ee26..bd4fb00182 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/util/TypeConverterTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/util/TypeConverterTest.java
@@ -27,9 +27,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TypeConverterTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/AbstractXmlActionTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/AbstractXmlActionTest.java
index b4cc74d268..630f60a35c 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/AbstractXmlActionTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/AbstractXmlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractXmlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/ControlBusTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/ControlBusTest.java
index 8ecef62f28..c7e8b04b3e 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/ControlBusTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/ControlBusTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ControlBusTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/CreateRoutesTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/CreateRoutesTest.java
index 08b51712c6..ee10f8c9c0 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/CreateRoutesTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/CreateRoutesTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CreateRoutesTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/RemoveRoutesTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/RemoveRoutesTest.java
index b859e1ea7b..f4406900c9 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/RemoveRoutesTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/RemoveRoutesTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RemoveRoutesTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/StartRoutesTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/StartRoutesTest.java
index e438734df0..47c6f39e2a 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/StartRoutesTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/StartRoutesTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StartRoutesTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/StopRoutesTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/StopRoutesTest.java
index 30a1dd6bec..e73e777be5 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/StopRoutesTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/xml/StopRoutesTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopRoutesTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/AbstractYamlActionTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/AbstractYamlActionTest.java
index 8ef9d64be6..d2f91ac312 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/AbstractYamlActionTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/AbstractYamlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractYamlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/ControlBusTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/ControlBusTest.java
index 42c9e310f2..c6efc50bf9 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/ControlBusTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/ControlBusTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ControlBusTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/CreateRoutesTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/CreateRoutesTest.java
index d53db4ce95..457c59275f 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/CreateRoutesTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/CreateRoutesTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CreateRoutesTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/RemoveRouteTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/RemoveRouteTest.java
index 32a17887e1..6df8a209f7 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/RemoveRouteTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/RemoveRouteTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RemoveRouteTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/StartRouteTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/StartRouteTest.java
index b3515efdb2..9df057186b 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/StartRouteTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/StartRouteTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StartRouteTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/StopRouteTest.java b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/StopRouteTest.java
index e533ca5c96..2e86bbd844 100644
--- a/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/StopRouteTest.java
+++ b/endpoints/citrus-camel/src/test/java/org/citrusframework/camel/yaml/StopRouteTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopRouteTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/FtpSettings.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/FtpSettings.java
index 61abe603b6..9e61f9bba9 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/FtpSettings.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/FtpSettings.java
@@ -18,9 +18,6 @@
 
 import org.citrusframework.message.MessageType;
 
-/**
- * @author Christoph Deppisch
- */
 public class FtpSettings {
 
     private static final String FTP_PROPERTY_PREFIX = "citrus.ftp.";
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpClient.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpClient.java
index 5473f7c44d..0d28153023 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpClient.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpClient.java
@@ -66,7 +66,6 @@
 import static org.apache.commons.net.ftp.FTPReply.FILE_ACTION_OK;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class FtpClient extends AbstractEndpoint implements Producer, ReplyConsumer, InitializingPhase, ShutdownPhase {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpClientBuilder.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpClientBuilder.java
index 8672318618..676390827a 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpClientBuilder.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpClientBuilder.java
@@ -21,7 +21,6 @@
 import org.citrusframework.message.MessageCorrelator;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class FtpClientBuilder extends AbstractEndpointBuilder<FtpClient> {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpEndpointComponent.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpEndpointComponent.java
index b672eca13b..583d3feac0 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpEndpointComponent.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpEndpointComponent.java
@@ -24,7 +24,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class FtpEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpEndpointConfiguration.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpEndpointConfiguration.java
index 83cfd37b58..32fe3c7c03 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpEndpointConfiguration.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/FtpEndpointConfiguration.java
@@ -27,7 +27,6 @@
 import org.apache.commons.net.ftp.FTPCmd;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class FtpEndpointConfiguration extends AbstractPollableEndpointConfiguration {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpClient.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpClient.java
index b51ae9c437..b29117b472 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpClient.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpClient.java
@@ -43,7 +43,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class ScpClient extends SftpClient {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpClientBuilder.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpClientBuilder.java
index a94cdbac3b..c0ff4188d8 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpClientBuilder.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpClientBuilder.java
@@ -21,7 +21,6 @@
 import org.citrusframework.message.MessageCorrelator;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class ScpClientBuilder extends AbstractEndpointBuilder<ScpClient> {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpEndpointConfiguration.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpEndpointConfiguration.java
index 9ff3256e57..22290870d5 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpEndpointConfiguration.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/ScpEndpointConfiguration.java
@@ -20,7 +20,6 @@
 import java.io.PrintStream;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class ScpEndpointConfiguration extends SftpEndpointConfiguration {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpClient.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpClient.java
index 9a133defa8..1c146e2343 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpClient.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpClient.java
@@ -56,7 +56,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class SftpClient extends FtpClient {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpClientBuilder.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpClientBuilder.java
index 877f8b48f8..4e46fd4bf3 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpClientBuilder.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpClientBuilder.java
@@ -23,7 +23,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class SftpClientBuilder extends AbstractEndpointBuilder<SftpClient> {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpEndpointComponent.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpEndpointComponent.java
index fe79d678bb..76e6a1f96a 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpEndpointComponent.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpEndpointComponent.java
@@ -24,7 +24,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class SftpEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpEndpointConfiguration.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpEndpointConfiguration.java
index 0738068376..2015f28ee7 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpEndpointConfiguration.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/client/SftpEndpointConfiguration.java
@@ -19,7 +19,6 @@
 import java.util.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class SftpEndpointConfiguration extends FtpEndpointConfiguration {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpClientConfig.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpClientConfig.java
index d3537fd03a..ea094be738 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpClientConfig.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpClientConfig.java
@@ -25,7 +25,6 @@
 import org.citrusframework.message.ErrorHandlingStrategy;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpClientConfigParser.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpClientConfigParser.java
index 733b00b296..ca3544115d 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpClientConfigParser.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpClientConfigParser.java
@@ -25,7 +25,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class FtpClientConfigParser implements AnnotationConfigParser<FtpClientConfig, FtpClient> {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpServerConfig.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpServerConfig.java
index ff9f658545..e2534927e0 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpServerConfig.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpServerConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpServerConfigParser.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpServerConfigParser.java
index 9ef37c47d1..61d14601b2 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpServerConfigParser.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/FtpServerConfigParser.java
@@ -27,7 +27,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class FtpServerConfigParser implements AnnotationConfigParser<FtpServerConfig, FtpServer> {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/ScpClientConfig.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/ScpClientConfig.java
index e0c41ffc1f..4fb20622ba 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/ScpClientConfig.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/ScpClientConfig.java
@@ -25,7 +25,6 @@
 import org.citrusframework.message.ErrorHandlingStrategy;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/ScpClientConfigParser.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/ScpClientConfigParser.java
index b99b040d90..1f8b854a2e 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/ScpClientConfigParser.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/ScpClientConfigParser.java
@@ -25,7 +25,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class ScpClientConfigParser implements AnnotationConfigParser<ScpClientConfig, ScpClient> {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpClientConfig.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpClientConfig.java
index 48881de133..3bb62766dd 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpClientConfig.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpClientConfig.java
@@ -25,7 +25,6 @@
 import org.citrusframework.message.ErrorHandlingStrategy;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpClientConfigParser.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpClientConfigParser.java
index 7db5725569..84e3618b39 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpClientConfigParser.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpClientConfigParser.java
@@ -27,7 +27,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class SftpClientConfigParser implements AnnotationConfigParser<SftpClientConfig, SftpClient> {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpServerConfig.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpServerConfig.java
index 12a9f9c7a4..3fbbf72e20 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpServerConfig.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpServerConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpServerConfigParser.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpServerConfigParser.java
index 40ebfebb28..63783deafd 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpServerConfigParser.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/annotation/SftpServerConfigParser.java
@@ -25,7 +25,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class SftpServerConfigParser implements AnnotationConfigParser<SftpServerConfig, SftpServer> {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/handler/CitrusFtpConfigNamespaceHandler.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/handler/CitrusFtpConfigNamespaceHandler.java
index 0e53673d65..abb6ed202e 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/handler/CitrusFtpConfigNamespaceHandler.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/handler/CitrusFtpConfigNamespaceHandler.java
@@ -21,7 +21,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class CitrusFtpConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/handler/CitrusScpConfigNamespaceHandler.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/handler/CitrusScpConfigNamespaceHandler.java
index 10917830da..1cf0413377 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/handler/CitrusScpConfigNamespaceHandler.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/handler/CitrusScpConfigNamespaceHandler.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class CitrusScpConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/handler/CitrusSftpConfigNamespaceHandler.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/handler/CitrusSftpConfigNamespaceHandler.java
index 69c3efb310..d877e61ea1 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/handler/CitrusSftpConfigNamespaceHandler.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/handler/CitrusSftpConfigNamespaceHandler.java
@@ -21,7 +21,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class CitrusSftpConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/FtpClientParser.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/FtpClientParser.java
index c3195a5fc2..52c3bc3d54 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/FtpClientParser.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/FtpClientParser.java
@@ -28,7 +28,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class FtpClientParser extends AbstractEndpointParser {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/FtpServerParser.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/FtpServerParser.java
index 96c6943f2d..a8b93ebadd 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/FtpServerParser.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/FtpServerParser.java
@@ -26,7 +26,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class FtpServerParser extends AbstractServerParser {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/ScpClientParser.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/ScpClientParser.java
index 888e564b5b..b5d3dbb242 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/ScpClientParser.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/ScpClientParser.java
@@ -26,7 +26,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class ScpClientParser extends SftpClientParser {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/SftpClientParser.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/SftpClientParser.java
index 3bef5d7b18..28a8e24d0e 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/SftpClientParser.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/SftpClientParser.java
@@ -26,7 +26,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class SftpClientParser extends FtpClientParser {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/SftpServerParser.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/SftpServerParser.java
index 309bfc13d1..13400b2cbb 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/SftpServerParser.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/config/xml/SftpServerParser.java
@@ -28,7 +28,6 @@
 /**
  * Parser for the configuration of an SSH server
  *
- * @author Roland Huss, Christoph Deppisch
  */
 public class SftpServerParser extends SshServerParser {
 
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/endpoint/builder/FtpEndpoints.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/endpoint/builder/FtpEndpoints.java
index e3ed16babf..ac91bdd4cb 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/endpoint/builder/FtpEndpoints.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/endpoint/builder/FtpEndpoints.java
@@ -20,9 +20,6 @@
 import org.citrusframework.ftp.client.FtpClientBuilder;
 import org.citrusframework.ftp.server.FtpServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class FtpEndpoints extends ClientServerEndpointBuilder<FtpClientBuilder, FtpServerBuilder> {
     /**
      * Private constructor setting the client and server builder implementation.
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/endpoint/builder/ScpEndpoints.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/endpoint/builder/ScpEndpoints.java
index 4a3f185268..40c8af1f84 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/endpoint/builder/ScpEndpoints.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/endpoint/builder/ScpEndpoints.java
@@ -20,9 +20,6 @@
 import org.citrusframework.ftp.client.ScpClientBuilder;
 import org.citrusframework.ftp.server.SftpServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class ScpEndpoints extends ClientServerEndpointBuilder<ScpClientBuilder, SftpServerBuilder> {
     /**
      * Private constructor setting the client and server builder implementation.
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/endpoint/builder/SftpEndpoints.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/endpoint/builder/SftpEndpoints.java
index 48efe09de6..e7ff904ea5 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/endpoint/builder/SftpEndpoints.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/endpoint/builder/SftpEndpoints.java
@@ -20,9 +20,6 @@
 import org.citrusframework.ftp.client.SftpClientBuilder;
 import org.citrusframework.ftp.server.SftpServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class SftpEndpoints extends ClientServerEndpointBuilder<SftpClientBuilder, SftpServerBuilder> {
     /**
      * Private constructor setting the client and server builder implementation.
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/message/FtpMarshaller.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/message/FtpMarshaller.java
index c2c14d4c97..33b349cd39 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/message/FtpMarshaller.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/message/FtpMarshaller.java
@@ -50,7 +50,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class FtpMarshaller implements Marshaller, Unmarshaller {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/message/FtpMessage.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/message/FtpMessage.java
index a6206dedb5..335205fd4e 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/message/FtpMessage.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/message/FtpMessage.java
@@ -43,7 +43,6 @@
 import org.citrusframework.xml.StringSource;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class FtpMessage extends DefaultMessage {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/message/FtpMessageHeaders.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/message/FtpMessageHeaders.java
index cd1f3c6847..2803aa3690 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/message/FtpMessageHeaders.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/message/FtpMessageHeaders.java
@@ -19,7 +19,6 @@
 import org.citrusframework.message.MessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public final class FtpMessageHeaders {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/FtpServer.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/FtpServer.java
index 1fa21801a2..e652a009e5 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/FtpServer.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/FtpServer.java
@@ -32,7 +32,6 @@
 import org.citrusframework.spi.Resource;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class FtpServer extends AbstractServer {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/FtpServerBuilder.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/FtpServerBuilder.java
index e519b34012..f0d6d66916 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/FtpServerBuilder.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/FtpServerBuilder.java
@@ -25,7 +25,6 @@
 import org.citrusframework.spi.Resource;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class FtpServerBuilder extends AbstractServerBuilder<FtpServer, FtpServerBuilder> {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/FtpServerFtpLet.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/FtpServerFtpLet.java
index 344cf21719..242fcb34fc 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/FtpServerFtpLet.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/FtpServerFtpLet.java
@@ -47,7 +47,6 @@
  *
  * Test case can manage the Ftp command result by providing a Ftp result message.
  *
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class FtpServerFtpLet implements Ftplet {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/SftpServer.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/SftpServer.java
index 762181ba28..49210bba85 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/SftpServer.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/SftpServer.java
@@ -43,7 +43,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class SftpServer extends SshServer implements ScpTransferEventListener, SftpEventListener {
diff --git a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/SftpServerBuilder.java b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/SftpServerBuilder.java
index e6fa45bd8b..f3299e137c 100644
--- a/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/SftpServerBuilder.java
+++ b/endpoints/citrus-ftp/src/main/java/org/citrusframework/ftp/server/SftpServerBuilder.java
@@ -22,7 +22,6 @@
 import org.citrusframework.server.AbstractServerBuilder;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class SftpServerBuilder extends AbstractServerBuilder<SftpServer, SftpServerBuilder> {
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/AbstractFtpClientTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/AbstractFtpClientTest.java
index d94300e76f..eb90676c50 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/AbstractFtpClientTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/AbstractFtpClientTest.java
@@ -28,7 +28,6 @@
 import static org.testng.Assert.assertTrue;
 
 /**
- * @author Georgi Todorov
  * @since 2.7.5
  */
 public abstract class AbstractFtpClientTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/FtpClientTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/FtpClientTest.java
index d84214acea..e049785f23 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/FtpClientTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/FtpClientTest.java
@@ -57,7 +57,6 @@
 import static org.testng.Assert.assertTrue;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class FtpClientTest extends AbstractFtpClientTest {
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/SftpClientTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/SftpClientTest.java
index 3959de880d..e44d4b01b6 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/SftpClientTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/client/SftpClientTest.java
@@ -52,7 +52,6 @@
 import static org.testng.Assert.assertTrue;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class SftpClientTest extends AbstractFtpClientTest {
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/FtpClientConfigParserTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/FtpClientConfigParserTest.java
index e12756258a..422435b5f9 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/FtpClientConfigParserTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/FtpClientConfigParserTest.java
@@ -45,9 +45,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class FtpClientConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "ftpClient1")
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/FtpServerConfigParserTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/FtpServerConfigParserTest.java
index 0e2716c68d..a0e3ada34a 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/FtpServerConfigParserTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/FtpServerConfigParserTest.java
@@ -37,9 +37,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class FtpServerConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "ftpServer1")
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/ScpClientConfigParserTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/ScpClientConfigParserTest.java
index 91df087a76..35d6de37d8 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/ScpClientConfigParserTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/ScpClientConfigParserTest.java
@@ -35,9 +35,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ScpClientConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "scpClient1")
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/SftpClientConfigParserTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/SftpClientConfigParserTest.java
index 7aebcf8a91..8569b2b3eb 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/SftpClientConfigParserTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/SftpClientConfigParserTest.java
@@ -38,9 +38,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SftpClientConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "sftpClient1")
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/SftpServerConfigParserTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/SftpServerConfigParserTest.java
index 92bb414372..9df1b46f77 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/SftpServerConfigParserTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/annotation/SftpServerConfigParserTest.java
@@ -35,9 +35,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SftpServerConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "sftpServer1")
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/FtpClientParserTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/FtpClientParserTest.java
index d4c702f24a..3b2522feaa 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/FtpClientParserTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/FtpClientParserTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class FtpClientParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/FtpServerParserTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/FtpServerParserTest.java
index 628277ac53..3c7aa14254 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/FtpServerParserTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/FtpServerParserTest.java
@@ -35,7 +35,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class FtpServerParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/ScpClientParserTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/ScpClientParserTest.java
index b3df3bbe2c..c403d200b2 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/ScpClientParserTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/ScpClientParserTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class ScpClientParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/SftpClientParserTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/SftpClientParserTest.java
index adc86979c5..6a66c52f40 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/SftpClientParserTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/SftpClientParserTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class SftpClientParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/SftpServerParserTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/SftpServerParserTest.java
index 94b26101ce..2c0f33198b 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/SftpServerParserTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/config/xml/SftpServerParserTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Roland Huss, Christoph Deppisch
- */
 public class SftpServerParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/endpoint/builder/FtpEndpointsTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/endpoint/builder/FtpEndpointsTest.java
index 4e0da02b80..fb4bb71f17 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/endpoint/builder/FtpEndpointsTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/endpoint/builder/FtpEndpointsTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class FtpEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/endpoint/builder/ScpEndpointsTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/endpoint/builder/ScpEndpointsTest.java
index 0d43d9ac1a..71c2fbc62c 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/endpoint/builder/ScpEndpointsTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/endpoint/builder/ScpEndpointsTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ScpEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/endpoint/builder/SftpEndpointsTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/endpoint/builder/SftpEndpointsTest.java
index 4f115f1035..9124eecc05 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/endpoint/builder/SftpEndpointsTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/endpoint/builder/SftpEndpointsTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SftpEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpClientServerIT.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpClientServerIT.java
index 148c1df39b..fd5182de1b 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpClientServerIT.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpClientServerIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 @Test
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpDynamicEndpointIT.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpDynamicEndpointIT.java
index f5767b76fe..698a1f6fea 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpDynamicEndpointIT.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpDynamicEndpointIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 @Test
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpFileActionIT.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpFileActionIT.java
index a57a3bd5e6..4755a4ebf5 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpFileActionIT.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpFileActionIT.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 @Test
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpLoginIT.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpLoginIT.java
index 7cd55fe9de..ee69e42fec 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpLoginIT.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/integration/FtpLoginIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 @Test
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/server/FtpServerFtpLetTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/server/FtpServerFtpLetTest.java
index 5a037da9f6..14701f1997 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/server/FtpServerFtpLetTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/server/FtpServerFtpLetTest.java
@@ -30,7 +30,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class FtpServerFtpLetTest {
diff --git a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/server/FtpServerTest.java b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/server/FtpServerTest.java
index b4b23d6951..934435f045 100644
--- a/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/server/FtpServerTest.java
+++ b/endpoints/citrus-ftp/src/test/java/org/citrusframework/ftp/server/FtpServerTest.java
@@ -21,7 +21,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class FtpServerTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpActionBuilder.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpActionBuilder.java
index e579a449d5..c787c7f823 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpActionBuilder.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpActionBuilder.java
@@ -26,7 +26,6 @@
 /**
  * Action executes http client and server operations.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class HttpActionBuilder extends AbstractReferenceResolverAwareTestActionBuilder<TestAction> {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpClientActionBuilder.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpClientActionBuilder.java
index eb9323c3cf..e7822398d7 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpClientActionBuilder.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpClientActionBuilder.java
@@ -28,7 +28,6 @@
 /**
  * Action executes http client operations such as sending requests and receiving responses.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class HttpClientActionBuilder extends AbstractReferenceResolverAwareTestActionBuilder<TestAction> {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpClientRequestActionBuilder.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpClientRequestActionBuilder.java
index 0284674ef1..cced421b22 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpClientRequestActionBuilder.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpClientRequestActionBuilder.java
@@ -29,7 +29,6 @@
 import org.springframework.util.MultiValueMap;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class HttpClientRequestActionBuilder extends SendMessageAction.SendMessageActionBuilder<SendMessageAction, HttpClientRequestActionBuilder.HttpMessageBuilderSupport, HttpClientRequestActionBuilder> {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpClientResponseActionBuilder.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpClientResponseActionBuilder.java
index 959af70245..292caf3016 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpClientResponseActionBuilder.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpClientResponseActionBuilder.java
@@ -29,7 +29,6 @@
 import java.util.Optional;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class HttpClientResponseActionBuilder extends ReceiveMessageAction.ReceiveMessageActionBuilder<ReceiveMessageAction, HttpClientResponseActionBuilder.HttpMessageBuilderSupport, HttpClientResponseActionBuilder> {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpServerActionBuilder.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpServerActionBuilder.java
index 0996a978bb..41ee21ef16 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpServerActionBuilder.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpServerActionBuilder.java
@@ -37,7 +37,6 @@
 /**
  * Action executes http server operations such as receiving requests and sending response messages.
  *
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class HttpServerActionBuilder extends AbstractReferenceResolverAwareTestActionBuilder<TestAction> {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpServerRequestActionBuilder.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpServerRequestActionBuilder.java
index d9b70efc64..39f22cc090 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpServerRequestActionBuilder.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpServerRequestActionBuilder.java
@@ -31,7 +31,6 @@
 import org.springframework.util.MultiValueMap;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class HttpServerRequestActionBuilder extends ReceiveMessageAction.ReceiveMessageActionBuilder<ReceiveMessageAction, HttpServerRequestActionBuilder.HttpMessageBuilderSupport, HttpServerRequestActionBuilder> {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpServerResponseActionBuilder.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpServerResponseActionBuilder.java
index 99233ef9e2..e0610ce5d0 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpServerResponseActionBuilder.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/actions/HttpServerResponseActionBuilder.java
@@ -29,7 +29,6 @@
 import org.springframework.http.HttpStatusCode;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class HttpServerResponseActionBuilder extends SendMessageAction.SendMessageActionBuilder<SendMessageAction, HttpServerResponseActionBuilder.HttpMessageBuilderSupport, HttpServerResponseActionBuilder> {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/BasicAuthClientHttpRequestFactory.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/BasicAuthClientHttpRequestFactory.java
index 42fdec2358..ca1bc5c774 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/BasicAuthClientHttpRequestFactory.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/BasicAuthClientHttpRequestFactory.java
@@ -40,7 +40,6 @@
  * Factory bean constructing a client request factory with
  * user credentials for basic authentication.
  *
- * @author Christoph Deppisch
  * @since 1.2
  */
 public class BasicAuthClientHttpRequestFactory implements FactoryBean<HttpComponentsClientHttpRequestFactory>, InitializingPhase {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpClient.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpClient.java
index 47462d00e7..d0dafba86c 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpClient.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpClient.java
@@ -44,7 +44,6 @@
  * Http client sends messages via Http protocol to some Http server instance, defined by a request endpoint url. Synchronous response
  * messages are cached in local memory and receive operations are able to fetch responses from this cache later on.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class HttpClient extends AbstractEndpoint implements Producer, ReplyConsumer {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpClientBuilder.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpClientBuilder.java
index 2458eb05cf..2956cc6599 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpClientBuilder.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpClientBuilder.java
@@ -34,7 +34,6 @@
 import org.springframework.web.client.RestTemplate;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class HttpClientBuilder extends AbstractEndpointBuilder<HttpClient> {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpEndpointComponent.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpEndpointComponent.java
index a9dee2a13d..45f56a4cd5 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpEndpointComponent.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpEndpointComponent.java
@@ -27,7 +27,6 @@
 /**
  * Component creates proper HTTP client endpoint from endpoint uri resource and parameters.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class HttpEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpEndpointConfiguration.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpEndpointConfiguration.java
index e9f7ffd1cf..172acc9d7d 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpEndpointConfiguration.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpEndpointConfiguration.java
@@ -43,7 +43,6 @@
 import org.springframework.web.client.RestTemplate;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class HttpEndpointConfiguration extends AbstractPollableEndpointConfiguration {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpErrorPropagatingException.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpErrorPropagatingException.java
index b63df18e5d..3f331def5e 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpErrorPropagatingException.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpErrorPropagatingException.java
@@ -23,7 +23,6 @@
 import org.springframework.web.client.HttpClientErrorException;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class HttpErrorPropagatingException extends HttpClientErrorException {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpResponseErrorHandler.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpResponseErrorHandler.java
index 183fbc96e9..c6c3cd2ce2 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpResponseErrorHandler.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpResponseErrorHandler.java
@@ -24,7 +24,6 @@
 import org.springframework.web.client.DefaultResponseErrorHandler;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class HttpResponseErrorHandler extends DefaultResponseErrorHandler {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpsEndpointComponent.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpsEndpointComponent.java
index b01967a608..31a7e613aa 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpsEndpointComponent.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/client/HttpsEndpointComponent.java
@@ -19,7 +19,6 @@
 /**
  * Component creates proper HTTP client endpoint from endpoint uri resource and parameters.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class HttpsEndpointComponent extends HttpEndpointComponent {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpClientConfig.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpClientConfig.java
index 00452855f3..38c356fe9e 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpClientConfig.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpClientConfig.java
@@ -26,7 +26,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpClientConfigParser.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpClientConfigParser.java
index 25cb6ad2b8..e1e68353db 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpClientConfigParser.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpClientConfigParser.java
@@ -39,7 +39,6 @@
 import org.springframework.web.client.RestTemplate;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class HttpClientConfigParser implements AnnotationConfigParser<HttpClientConfig, HttpClient> {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpServerConfig.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpServerConfig.java
index 426777e948..8546808ad3 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpServerConfig.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpServerConfig.java
@@ -25,7 +25,6 @@
 import org.springframework.http.HttpStatus;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpServerConfigParser.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpServerConfigParser.java
index a7f9cc2bf7..9f25698a24 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpServerConfigParser.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/annotation/HttpServerConfigParser.java
@@ -43,7 +43,6 @@
 import static org.citrusframework.util.StringUtils.hasText;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class HttpServerConfigParser implements AnnotationConfigParser<HttpServerConfig, HttpServer> {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/handler/CitrusHttpConfigNamespaceHandler.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/handler/CitrusHttpConfigNamespaceHandler.java
index d6fe94e565..311f5ec941 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/handler/CitrusHttpConfigNamespaceHandler.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/handler/CitrusHttpConfigNamespaceHandler.java
@@ -23,7 +23,6 @@
 /**
  * Namespace handler implementation for components in Citrus http namespace.
  *
- * @author Christoph Deppisch
  */
 public class CitrusHttpConfigNamespaceHandler extends NamespaceHandlerSupport {
 
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/handler/CitrusHttpTestcaseNamespaceHandler.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/handler/CitrusHttpTestcaseNamespaceHandler.java
index 7a13b63325..c05279517f 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/handler/CitrusHttpTestcaseNamespaceHandler.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/handler/CitrusHttpTestcaseNamespaceHandler.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class CitrusHttpTestcaseNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpClientParser.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpClientParser.java
index 7c9ab7bc38..827221eb93 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpClientParser.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpClientParser.java
@@ -33,7 +33,6 @@
 
 /**
  * Http client parser sets properties on bean definition for client component.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class HttpClientParser extends AbstractEndpointParser {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpReceiveRequestActionParser.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpReceiveRequestActionParser.java
index b30b04a76a..59ad94a5ac 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpReceiveRequestActionParser.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpReceiveRequestActionParser.java
@@ -40,7 +40,6 @@
 import static java.lang.Boolean.parseBoolean;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class HttpReceiveRequestActionParser extends ReceiveMessageActionParser {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpReceiveResponseActionParser.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpReceiveResponseActionParser.java
index 0e640e70a0..3d8ce1b216 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpReceiveResponseActionParser.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpReceiveResponseActionParser.java
@@ -42,7 +42,6 @@
 import static org.springframework.util.xml.DomUtils.getChildElementsByTagName;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class HttpReceiveResponseActionParser extends ReceiveMessageActionParser {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpSendRequestActionParser.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpSendRequestActionParser.java
index 2924d5bd77..028d3c17f9 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpSendRequestActionParser.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpSendRequestActionParser.java
@@ -38,7 +38,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class HttpSendRequestActionParser extends SendMessageActionParser {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpSendResponseActionParser.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpSendResponseActionParser.java
index bf8e88efca..809024d9a8 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpSendResponseActionParser.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpSendResponseActionParser.java
@@ -37,7 +37,6 @@
 import static org.citrusframework.util.StringUtils.hasText;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class HttpSendResponseActionParser extends SendMessageActionParser {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpServerParser.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpServerParser.java
index 3a611517b1..96fc7040d7 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpServerParser.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/config/xml/HttpServerParser.java
@@ -27,7 +27,6 @@
 /**
  * Parser for Http server implementation in Citrus http namespace.
  *
- * @author Christoph Deppisch
  */
 public class HttpServerParser extends AbstractServerParser {
 
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/controller/HttpMessageController.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/controller/HttpMessageController.java
index 7616ebc651..9e3bb54f1d 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/controller/HttpMessageController.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/controller/HttpMessageController.java
@@ -46,7 +46,6 @@
  * Message controller implementation handling all incoming requests by forwarding to a message
  * handler for further processing.
  *
- * @author Christoph Deppisch
  */
 @Controller
 @RequestMapping("/*")
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/endpoint/builder/HttpEndpoints.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/endpoint/builder/HttpEndpoints.java
index 9f8b549dce..c776db8356 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/endpoint/builder/HttpEndpoints.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/endpoint/builder/HttpEndpoints.java
@@ -20,9 +20,6 @@
 import org.citrusframework.http.client.HttpClientBuilder;
 import org.citrusframework.http.server.HttpServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class HttpEndpoints extends ClientServerEndpointBuilder<HttpClientBuilder, HttpServerBuilder> {
     /**
      * Private constructor setting the client and server builder implementation.
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/DelegatingHandlerInterceptor.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/DelegatingHandlerInterceptor.java
index 5a8c5228bf..1a9ff617bc 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/DelegatingHandlerInterceptor.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/DelegatingHandlerInterceptor.java
@@ -27,7 +27,6 @@
 /**
  * Interceptor implementation delegates to list of other handler interceptors.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class DelegatingHandlerInterceptor implements HandlerInterceptor {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/LoggingClientInterceptor.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/LoggingClientInterceptor.java
index e524502118..aba6e7ac25 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/LoggingClientInterceptor.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/LoggingClientInterceptor.java
@@ -42,7 +42,6 @@
 /**
  * Simple logging interceptor writes Http request and response messages to the console.
  *
- * @author Christoph Deppisch
  * @since 1.2
  */
 public class LoggingClientInterceptor implements ClientHttpRequestInterceptor {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/LoggingHandlerInterceptor.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/LoggingHandlerInterceptor.java
index 0bb7265381..d8288b6c39 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/LoggingHandlerInterceptor.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/LoggingHandlerInterceptor.java
@@ -42,7 +42,6 @@
  * Interceptor is capable of informing message tracing test listener on the request and response
  * messages arriving and leaving Citrus.
  *
- * @author Christoph Deppisch
  * @since 1.2
  */
 public class LoggingHandlerInterceptor implements HandlerInterceptor {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/MappedInterceptorAdapter.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/MappedInterceptorAdapter.java
index 170d14b72c..48cd81eb21 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/MappedInterceptorAdapter.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/interceptor/MappedInterceptorAdapter.java
@@ -26,7 +26,6 @@
  * Adapter for {@link org.springframework.web.servlet.handler.MappedInterceptor} conditionally applies interceptor
  * based on request url and path matcher.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class MappedInterceptorAdapter implements HandlerInterceptor {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/DelegatingHttpEntityMessageConverter.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/DelegatingHttpEntityMessageConverter.java
index c1ac931f73..2cdc527837 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/DelegatingHttpEntityMessageConverter.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/DelegatingHttpEntityMessageConverter.java
@@ -39,7 +39,6 @@
 import static org.springframework.http.MediaType.valueOf;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class DelegatingHttpEntityMessageConverter extends AbstractHttpMessageConverter<Object> {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessage.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessage.java
index 9445c64406..972758fd74 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessage.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessage.java
@@ -43,7 +43,6 @@
 import static java.lang.Integer.parseInt;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class HttpMessage extends DefaultMessage {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageHeaders.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageHeaders.java
index 6c6cd9724b..ba2c5aaf9e 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageHeaders.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageHeaders.java
@@ -18,9 +18,6 @@
 
 import org.citrusframework.message.MessageHeaders;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class HttpMessageHeaders {
 
     /**
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageUtils.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageUtils.java
index 12a4b9f6cd..47b42c3195 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageUtils.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpMessageUtils.java
@@ -20,7 +20,6 @@
 import org.citrusframework.message.MessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public final class HttpMessageUtils {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpQueryParamHeaderValidator.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpQueryParamHeaderValidator.java
index 0c17139a68..2988291f2c 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpQueryParamHeaderValidator.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/message/HttpQueryParamHeaderValidator.java
@@ -29,7 +29,6 @@
 import org.citrusframework.validation.matcher.ValidationMatcherUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class HttpQueryParamHeaderValidator extends DefaultHeaderValidator {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/model/Control.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/model/Control.java
index 98abdadd10..d5af54a159 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/model/Control.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/model/Control.java
@@ -18,9 +18,6 @@
 
 import jakarta.xml.bind.annotation.*;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
         "value"
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/model/FormData.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/model/FormData.java
index ad8a952e81..a63f7b6681 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/model/FormData.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/model/FormData.java
@@ -26,9 +26,6 @@
 import jakarta.xml.bind.annotation.XmlSeeAlso;
 import jakarta.xml.bind.annotation.XmlType;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
         "contentType",
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/model/FormMarshaller.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/model/FormMarshaller.java
index 8109d4a3aa..d080713a7f 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/model/FormMarshaller.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/model/FormMarshaller.java
@@ -26,9 +26,6 @@
 import org.citrusframework.xml.Marshaller;
 import org.citrusframework.xml.Unmarshaller;
 
-/**
- * @author Christoph Deppisch
- */
 public class FormMarshaller implements Marshaller, Unmarshaller {
 
     private final Jaxb2Marshaller marshaller;
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/security/BasicAuthConstraint.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/security/BasicAuthConstraint.java
index f1223a7e1b..cc87e7006e 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/security/BasicAuthConstraint.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/security/BasicAuthConstraint.java
@@ -29,7 +29,6 @@
  * Convenient constraint instantiation for basic authentication and multiple user roles. Access allowed only for
  * authenticated user with specific role(s).
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public class BasicAuthConstraint implements Constraint {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/security/SecurityHandlerFactory.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/security/SecurityHandlerFactory.java
index 5493f5f0f1..3ca964e599 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/security/SecurityHandlerFactory.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/security/SecurityHandlerFactory.java
@@ -42,7 +42,6 @@
  * Factory bean constructs a security handler for usage in Jetty servlet container. Security handler
  * holds one to many constraints and a set of users known to a user login service for authentication.
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public class SecurityHandlerFactory implements FactoryBean<SecurityHandler>, InitializingPhase {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/security/User.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/security/User.java
index 28cd05a4e1..d54852d2f0 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/security/User.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/security/User.java
@@ -21,7 +21,6 @@
 /**
  * User model object for easy instantiation in Spring application context.
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public class User {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/AbstractHttpServerBuilder.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/AbstractHttpServerBuilder.java
index 1d197f9ee6..709906102f 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/AbstractHttpServerBuilder.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/AbstractHttpServerBuilder.java
@@ -31,9 +31,6 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractHttpServerBuilder<T extends HttpServer, B extends AbstractHttpServerBuilder<T, B>> extends AbstractServerBuilder<T, B> {
 
     /**
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/HttpServer.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/HttpServer.java
index 1a33ea5393..dc71774c66 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/HttpServer.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/HttpServer.java
@@ -60,7 +60,6 @@
  * Simple Http server implementation starting an embedded Jetty server instance with
  * Spring Application context support. Incoming requests are handled with Spring MVC.
  *
- * @author Christoph Deppisch
  * @since 2007
  */
 public class HttpServer extends AbstractServer {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/HttpServerBuilder.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/HttpServerBuilder.java
index d3243c4a7b..29bf2de7b6 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/HttpServerBuilder.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/HttpServerBuilder.java
@@ -17,7 +17,6 @@
 package org.citrusframework.http.server;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class HttpServerBuilder extends AbstractHttpServerBuilder<HttpServer, HttpServerBuilder> {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/HttpServerSettings.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/HttpServerSettings.java
index 4571a0ad04..5cf3401aef 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/HttpServerSettings.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/server/HttpServerSettings.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.http.server;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpServerSettings {
 
     private static final String RESPONSE_CACHE_SIZE_PROPERTY = "citrus.http.server.response.cache.size";
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/CitrusDispatcherServlet.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/CitrusDispatcherServlet.java
index 001c30cf6a..2631ca1db3 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/CitrusDispatcherServlet.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/CitrusDispatcherServlet.java
@@ -43,7 +43,6 @@
  * Citrus dispatcher servlet extends Spring's message dispatcher servlet and just
  * adds optional configuration settings for default mapping strategies and so on.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class CitrusDispatcherServlet extends DispatcherServlet {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/GzipHttpServletRequestWrapper.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/GzipHttpServletRequestWrapper.java
index cbb7974d3f..d0419db283 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/GzipHttpServletRequestWrapper.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/GzipHttpServletRequestWrapper.java
@@ -30,7 +30,6 @@
  * Request wrapper wraps gzip input stream with unzipped stream. Read operations on that stream are
  * automatically decompressed with gzip encoding.
  *
- * @author Christoph Deppisch
  * @since 2.7.10
  */
 public class GzipHttpServletRequestWrapper extends HttpServletRequestWrapper {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/GzipHttpServletResponseWrapper.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/GzipHttpServletResponseWrapper.java
index 4bdd1e7aaf..ac9a5f0ca1 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/GzipHttpServletResponseWrapper.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/GzipHttpServletResponseWrapper.java
@@ -33,7 +33,6 @@
  * Response wrapper wraps response output stream with gzip output stream. Write operations on that stream are
  * automatically compressed with gzip encoding.
  *
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class GzipHttpServletResponseWrapper extends HttpServletResponseWrapper {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/GzipServletFilter.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/GzipServletFilter.java
index 02644d1a95..7a6b788bb2 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/GzipServletFilter.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/GzipServletFilter.java
@@ -30,7 +30,6 @@
  * and compression on response body when applicable. Only applies gzip request decompression on requests with Content-Encoding="gzip".
  * Only applies gzip response compression on requests with Accept-Encoding="gzip".
  *
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class GzipServletFilter extends OncePerRequestFilter {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/RequestCachingServletFilter.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/RequestCachingServletFilter.java
index 6a042ce392..299ae1f34a 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/RequestCachingServletFilter.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/servlet/RequestCachingServletFilter.java
@@ -30,7 +30,6 @@
  * For logging and tracing reasons we introduce a servlet request wrapper caching
  * the request data.
  *
- * @author Christoph Deppisch
  * @since 1.2
  */
 public class RequestCachingServletFilter extends OncePerRequestFilter {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/validation/FormUrlEncodedMessageValidator.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/validation/FormUrlEncodedMessageValidator.java
index 4806fa6c15..1619c97b3b 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/validation/FormUrlEncodedMessageValidator.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/validation/FormUrlEncodedMessageValidator.java
@@ -49,7 +49,6 @@
 /**
  * Validates x-www-form-urlencoded HTML form data content by marshalling form fields to Xml representation.
  *
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class FormUrlEncodedMessageValidator implements MessageValidator<ValidationContext> {
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/xml/Http.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/xml/Http.java
index 4cb8b18c22..30c69ca065 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/xml/Http.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/xml/Http.java
@@ -46,9 +46,6 @@
 import org.citrusframework.xml.actions.Receive;
 import org.citrusframework.xml.actions.Send;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "http")
 public class Http implements TestActionBuilder<TestAction>, ReferenceResolverAware {
 
diff --git a/endpoints/citrus-http/src/main/java/org/citrusframework/http/yaml/Http.java b/endpoints/citrus-http/src/main/java/org/citrusframework/http/yaml/Http.java
index 91724b46a9..418de9bc2f 100644
--- a/endpoints/citrus-http/src/main/java/org/citrusframework/http/yaml/Http.java
+++ b/endpoints/citrus-http/src/main/java/org/citrusframework/http/yaml/Http.java
@@ -40,9 +40,6 @@
 import org.citrusframework.yaml.actions.Receive;
 import org.citrusframework.yaml.actions.Send;
 
-/**
- * @author Christoph Deppisch
- */
 public class Http implements TestActionBuilder<TestAction>, ReferenceResolverAware {
 
     private TestActionBuilder<?> builder;
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/NoopMessageProcessor.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/NoopMessageProcessor.java
index 16261400d1..d911c4a233 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/NoopMessageProcessor.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/NoopMessageProcessor.java
@@ -20,9 +20,6 @@
 import org.citrusframework.message.Message;
 import org.citrusframework.message.MessageProcessor;
 
-/**
- * @author Christoph Deppisch
- */
 public class NoopMessageProcessor implements MessageProcessor {
 
     @Override
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/NoopVariableExtractor.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/NoopVariableExtractor.java
index 2618a33d60..2c302114f8 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/NoopVariableExtractor.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/NoopVariableExtractor.java
@@ -22,9 +22,6 @@
 import org.citrusframework.message.Message;
 import org.citrusframework.variable.VariableExtractor;
 
-/**
- * @author Christoph Deppisch
- */
 public class NoopVariableExtractor implements VariableExtractor {
     @Override
     public void extractVariables(Message message, TestContext context) {
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/UnitTestSupport.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/UnitTestSupport.java
index b238ce29ea..ee46aa49b7 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/UnitTestSupport.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/UnitTestSupport.java
@@ -21,9 +21,6 @@
 import org.citrusframework.validation.xml.DomXmlMessageValidator;
 import org.testng.annotations.BeforeMethod;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport {
 
     protected TestContextFactory testContextFactory;
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/actions/HttpActionBuilderTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/actions/HttpActionBuilderTest.java
index dc331ac23b..fbdb92e66e 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/actions/HttpActionBuilderTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/actions/HttpActionBuilderTest.java
@@ -26,9 +26,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpActionBuilderTest {
 
     private HttpActionBuilder fixture;
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/actions/dsl/ReceiveHttpMessageTestActionBuilderTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/actions/dsl/ReceiveHttpMessageTestActionBuilderTest.java
index c0f92509bf..66f6c597a9 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/actions/dsl/ReceiveHttpMessageTestActionBuilderTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/actions/dsl/ReceiveHttpMessageTestActionBuilderTest.java
@@ -46,9 +46,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveHttpMessageTestActionBuilderTest extends UnitTestSupport {
 
     private final SelectiveConsumer messageConsumer = Mockito.mock(SelectiveConsumer.class);
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/actions/dsl/SendHttpMessageTestActionBuilderTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/actions/dsl/SendHttpMessageTestActionBuilderTest.java
index 9c1f36da85..da9ed0aea9 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/actions/dsl/SendHttpMessageTestActionBuilderTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/actions/dsl/SendHttpMessageTestActionBuilderTest.java
@@ -44,9 +44,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendHttpMessageTestActionBuilderTest extends UnitTestSupport {
 
     private final HttpClient httpClient = Mockito.mock(HttpClient.class);
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/BasicAuthClientRequestFactoryTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/BasicAuthClientRequestFactoryTest.java
index c5ff002673..722a6159dd 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/BasicAuthClientRequestFactoryTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/BasicAuthClientRequestFactoryTest.java
@@ -27,9 +27,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class BasicAuthClientRequestFactoryTest extends AbstractTestNGUnitTest {
 
     @Autowired
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpClientTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpClientTest.java
index de2d271218..25f2753d2a 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpClientTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpClientTest.java
@@ -50,9 +50,6 @@
 import static java.util.Collections.singletonList;
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpClientTest extends AbstractTestNGUnitTest {
 
     private final String requestBody = "<TestRequest><Message>Hello Citrus!</Message></TestRequest>";
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpEndpointComponentTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpEndpointComponentTest.java
index 167facc40c..e51c6099a3 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpEndpointComponentTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpEndpointComponentTest.java
@@ -37,9 +37,6 @@
 import static org.mockito.Mockito.when;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpEndpointComponentTest {
 
     private ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpsEndpointComponentTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpsEndpointComponentTest.java
index a8233d3db9..aeec6f52c1 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpsEndpointComponentTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/client/HttpsEndpointComponentTest.java
@@ -37,9 +37,6 @@
 import static org.mockito.Mockito.when;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpsEndpointComponentTest {
 
     private ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/annotation/HttpClientConfigParserTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/annotation/HttpClientConfigParserTest.java
index 5cb416a056..485a541638 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/annotation/HttpClientConfigParserTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/annotation/HttpClientConfigParserTest.java
@@ -55,9 +55,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpClientConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "httpClient1")
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/annotation/HttpServerConfigParserTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/annotation/HttpServerConfigParserTest.java
index 91e1c4f642..ee40fcce37 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/annotation/HttpServerConfigParserTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/annotation/HttpServerConfigParserTest.java
@@ -57,9 +57,6 @@
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpServerConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "httpServer1")
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/xml/HttpClientParserTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/xml/HttpClientParserTest.java
index d30b0ae960..b90fe89b97 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/xml/HttpClientParserTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/xml/HttpClientParserTest.java
@@ -33,9 +33,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpClientParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/xml/HttpServerParserTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/xml/HttpServerParserTest.java
index 24ece52577..a5655bad8f 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/xml/HttpServerParserTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/config/xml/HttpServerParserTest.java
@@ -42,9 +42,6 @@
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpServerParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/endpoint/builder/HttpEndpointsTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/endpoint/builder/HttpEndpointsTest.java
index d127e4cc59..3062a7c60e 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/endpoint/builder/HttpEndpointsTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/endpoint/builder/HttpEndpointsTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/groovy/AbstractGroovyActionDslTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/groovy/AbstractGroovyActionDslTest.java
index 40f6e7479b..3a20cd69ba 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/groovy/AbstractGroovyActionDslTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/groovy/AbstractGroovyActionDslTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractGroovyActionDslTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/groovy/HttpClientTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/groovy/HttpClientTest.java
index 1ee05e2ad7..35775e19c5 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/groovy/HttpClientTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/groovy/HttpClientTest.java
@@ -60,9 +60,6 @@
 
 import static org.citrusframework.http.endpoint.builder.HttpEndpoints.http;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpClientTest extends AbstractGroovyActionDslTest {
 
     @BindToRegistry
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/groovy/HttpServerTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/groovy/HttpServerTest.java
index 387626ac16..6c84f13dff 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/groovy/HttpServerTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/groovy/HttpServerTest.java
@@ -51,9 +51,6 @@
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 import static org.citrusframework.http.endpoint.builder.HttpEndpoints.http;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpServerTest extends AbstractGroovyActionDslTest {
 
     @BindToRegistry
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/CustomMessageValidatorIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/CustomMessageValidatorIT.java
index fd9017616f..4e16d3ab33 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/CustomMessageValidatorIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/CustomMessageValidatorIT.java
@@ -37,7 +37,6 @@
 import static org.citrusframework.http.actions.HttpActionBuilder.http;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class CustomMessageValidatorIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/FormUrlEncodedIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/FormUrlEncodedIT.java
index 55ee8468e9..b557314635 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/FormUrlEncodedIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/FormUrlEncodedIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class FormUrlEncodedIT extends TestNGCitrusSpringSupport {
 
     @Test
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpBasicAuthJavaIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpBasicAuthJavaIT.java
index 8edd7a96b7..0969900f75 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpBasicAuthJavaIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpBasicAuthJavaIT.java
@@ -30,9 +30,6 @@
 import static org.citrusframework.http.security.HttpAuthentication.basic;
 import static org.citrusframework.util.SocketUtils.findAvailableTcpPort;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpBasicAuthJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientIT.java
index fcf1451517..4df244a937 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpClientIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientSideGzipJavaIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientSideGzipJavaIT.java
index 44e6e8f5f3..435cd75eb9 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientSideGzipJavaIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientSideGzipJavaIT.java
@@ -30,9 +30,6 @@
 
 import static org.citrusframework.http.actions.HttpActionBuilder.http;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpClientSideGzipJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTemplateIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTemplateIT.java
index 0521f5eb41..720d9ce9c7 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTemplateIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTemplateIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpClientTemplateIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTimeoutIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTimeoutIT.java
index 8c9e03d06c..6b3e50faee 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTimeoutIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpClientTimeoutIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpClientTimeoutIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpCookiesJavaIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpCookiesJavaIT.java
index 0b42dd48f8..0bc93c4296 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpCookiesJavaIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpCookiesJavaIT.java
@@ -25,9 +25,6 @@
 
 import static org.citrusframework.http.actions.HttpActionBuilder.http;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpCookiesJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpEndpointFactoryIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpEndpointFactoryIT.java
index 4beaabfa2f..b8ef100388 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpEndpointFactoryIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpEndpointFactoryIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 @Test
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpFormUrlEncodedIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpFormUrlEncodedIT.java
index 856e07314e..7193b08c3c 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpFormUrlEncodedIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpFormUrlEncodedIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpFormUrlEncodedIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpGzipEncodedIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpGzipEncodedIT.java
index c3631b5dde..301ba11e6d 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpGzipEncodedIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpGzipEncodedIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpGzipEncodedIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMessageControllerIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMessageControllerIT.java
index 79c88dcce4..c08f68796e 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMessageControllerIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMessageControllerIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpMessageControllerIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMessageControllerJavaIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMessageControllerJavaIT.java
index 85311cbc1a..b3f7d5a4eb 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMessageControllerJavaIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMessageControllerJavaIT.java
@@ -28,9 +28,6 @@
 import static org.citrusframework.container.Sequence.Builder.sequential;
 import static org.citrusframework.http.actions.HttpActionBuilder.http;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpMessageControllerJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMultipartFileUploadJavaIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMultipartFileUploadJavaIT.java
index 56b944d59b..ffae8c5bac 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMultipartFileUploadJavaIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpMultipartFileUploadJavaIT.java
@@ -28,9 +28,6 @@
 
 import static org.citrusframework.http.actions.HttpActionBuilder.http;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpMultipartFileUploadJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpSecureConnectionJavaIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpSecureConnectionJavaIT.java
index 654817c9d1..64d67d29ce 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpSecureConnectionJavaIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpSecureConnectionJavaIT.java
@@ -32,9 +32,6 @@
 
 import static org.citrusframework.http.actions.HttpActionBuilder.http;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpSecureConnectionJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerBinaryJavaIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerBinaryJavaIT.java
index fb54bdeaab..c995f4abed 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerBinaryJavaIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerBinaryJavaIT.java
@@ -38,9 +38,6 @@
 import static org.citrusframework.container.FinallySequence.Builder.doFinally;
 import static org.citrusframework.http.actions.HttpActionBuilder.http;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpServerBinaryJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerIT.java
index acc077cfd0..4c974edbdb 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpServerIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJavaIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJavaIT.java
index 38e2795b93..f8f7fa2720 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJavaIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJavaIT.java
@@ -27,9 +27,6 @@
 import static org.citrusframework.dsl.MessageSupport.MessageHeaderSupport.fromHeaders;
 import static org.citrusframework.http.actions.HttpActionBuilder.http;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpServerJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJmsIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJmsIT.java
index c88609df35..60266d6553 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJmsIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerJmsIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class HttpServerJmsIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerStandaloneJavaIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerStandaloneJavaIT.java
index 286604a1c6..41e79ac3ce 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerStandaloneJavaIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerStandaloneJavaIT.java
@@ -28,9 +28,6 @@
 import static org.citrusframework.container.Assert.Builder.assertException;
 import static org.citrusframework.http.actions.HttpActionBuilder.http;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpServerStandaloneJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerZipFileJavaIT.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerZipFileJavaIT.java
index a722298138..e6a7b15561 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerZipFileJavaIT.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/integration/HttpServerZipFileJavaIT.java
@@ -26,9 +26,6 @@
 
 import static org.citrusframework.http.actions.HttpActionBuilder.http;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class HttpServerZipFileJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/DelegatingHttpEntityMessageConverterTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/DelegatingHttpEntityMessageConverterTest.java
index baea4c595e..e3e8547c76 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/DelegatingHttpEntityMessageConverterTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/DelegatingHttpEntityMessageConverterTest.java
@@ -30,7 +30,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class DelegatingHttpEntityMessageConverterTest {
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpMessageUtilsTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpMessageUtilsTest.java
index d8f9099a11..92edb71fe9 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpMessageUtilsTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpMessageUtilsTest.java
@@ -30,7 +30,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class HttpMessageUtilsTest {
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpQueryParamHeaderValidatorTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpQueryParamHeaderValidatorTest.java
index ab9ec471c1..ab37efc1c5 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpQueryParamHeaderValidatorTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/message/HttpQueryParamHeaderValidatorTest.java
@@ -28,7 +28,6 @@
 import static org.hamcrest.Matchers.is;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class HttpQueryParamHeaderValidatorTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/server/HttpServerTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/server/HttpServerTest.java
index b062aef690..3ae80d3754 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/server/HttpServerTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/server/HttpServerTest.java
@@ -46,7 +46,6 @@
 
 /**
  * Simple unit test for HttpServer
- * @author jza
  */
 public class HttpServerTest extends AbstractTestNGUnitTest {
 
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/CitrusDispatcherServletTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/CitrusDispatcherServletTest.java
index 70f0addb5f..849f597a64 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/CitrusDispatcherServletTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/CitrusDispatcherServletTest.java
@@ -39,7 +39,6 @@
 
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class CitrusDispatcherServletTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/GzipServletFilterTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/GzipServletFilterTest.java
index 578456e34a..e728fcf988 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/GzipServletFilterTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/GzipServletFilterTest.java
@@ -42,7 +42,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class GzipServletFilterTest {
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/RequestCachingServletFilterTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/RequestCachingServletFilterTest.java
index d07d897a70..9ddd272d28 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/RequestCachingServletFilterTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/servlet/RequestCachingServletFilterTest.java
@@ -34,7 +34,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class RequestCachingServletFilterTest {
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/validation/FormUrlEncodedMessageValidatorTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/validation/FormUrlEncodedMessageValidatorTest.java
index f8b2a9c6e4..a04201ad93 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/validation/FormUrlEncodedMessageValidatorTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/validation/FormUrlEncodedMessageValidatorTest.java
@@ -29,9 +29,6 @@
 import org.citrusframework.validation.xml.XmlMessageValidationContext;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class FormUrlEncodedMessageValidatorTest extends AbstractTestNGUnitTest {
 
     /** Class under test */
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/xml/AbstractXmlActionTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/xml/AbstractXmlActionTest.java
index 28f1852f33..82b0008065 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/xml/AbstractXmlActionTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/xml/AbstractXmlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractXmlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/xml/HttpClientTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/xml/HttpClientTest.java
index b3fa8f6cd5..dbc1f7261e 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/xml/HttpClientTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/xml/HttpClientTest.java
@@ -61,9 +61,6 @@
 
 import static org.citrusframework.http.endpoint.builder.HttpEndpoints.http;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpClientTest extends AbstractXmlActionTest {
 
     @BindToRegistry
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/xml/HttpServerTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/xml/HttpServerTest.java
index 60a7619f32..e93239ae73 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/xml/HttpServerTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/xml/HttpServerTest.java
@@ -51,9 +51,6 @@
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 import static org.citrusframework.http.endpoint.builder.HttpEndpoints.http;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpServerTest extends AbstractXmlActionTest {
 
     @BindToRegistry
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/yaml/AbstractYamlActionTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/yaml/AbstractYamlActionTest.java
index c3f159d888..44a69a829a 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/yaml/AbstractYamlActionTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/yaml/AbstractYamlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractYamlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/yaml/HttpClientTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/yaml/HttpClientTest.java
index 1cb4c073b4..d17d4deb6d 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/yaml/HttpClientTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/yaml/HttpClientTest.java
@@ -61,9 +61,6 @@
 
 import static org.citrusframework.http.endpoint.builder.HttpEndpoints.http;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpClientTest extends AbstractYamlActionTest {
 
     @BindToRegistry
diff --git a/endpoints/citrus-http/src/test/java/org/citrusframework/http/yaml/HttpServerTest.java b/endpoints/citrus-http/src/test/java/org/citrusframework/http/yaml/HttpServerTest.java
index 7fc4a10ad1..9645b3b747 100644
--- a/endpoints/citrus-http/src/test/java/org/citrusframework/http/yaml/HttpServerTest.java
+++ b/endpoints/citrus-http/src/test/java/org/citrusframework/http/yaml/HttpServerTest.java
@@ -51,9 +51,6 @@
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 import static org.citrusframework.http.endpoint.builder.HttpEndpoints.http;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpServerTest extends AbstractYamlActionTest {
 
     @BindToRegistry
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/actions/PurgeJmsQueuesAction.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/actions/PurgeJmsQueuesAction.java
index 56ff3005f6..ba6de91105 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/actions/PurgeJmsQueuesAction.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/actions/PurgeJmsQueuesAction.java
@@ -49,7 +49,6 @@
  * Consumer will continue to receive messages until message receive timeout is reached,
  * so no messages are left.
  *
- * @author Christoph Deppisch
  * @since 2007
  */
 public class PurgeJmsQueuesAction extends AbstractTestAction {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsEndpointConfig.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsEndpointConfig.java
index eecd7d1233..3dcb9ec36e 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsEndpointConfig.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsEndpointConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsEndpointConfigParser.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsEndpointConfigParser.java
index 106f953f25..83f69c37f4 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsEndpointConfigParser.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsEndpointConfigParser.java
@@ -31,7 +31,6 @@
 import org.springframework.jms.support.destination.DestinationResolver;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmsEndpointConfigParser implements AnnotationConfigParser<JmsEndpointConfig, JmsEndpoint> {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsSyncEndpointConfig.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsSyncEndpointConfig.java
index 4e37a5918d..296ecdaf5f 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsSyncEndpointConfig.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsSyncEndpointConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsSyncEndpointConfigParser.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsSyncEndpointConfigParser.java
index 81e9f632e4..fa6feee379 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsSyncEndpointConfigParser.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/annotation/JmsSyncEndpointConfigParser.java
@@ -32,7 +32,6 @@
 import org.springframework.jms.support.destination.DestinationResolver;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmsSyncEndpointConfigParser implements AnnotationConfigParser<JmsSyncEndpointConfig, JmsSyncEndpoint> {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/handler/CitrusJmsConfigNamespaceHandler.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/handler/CitrusJmsConfigNamespaceHandler.java
index 39b9426917..cef4dbf534 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/handler/CitrusJmsConfigNamespaceHandler.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/handler/CitrusJmsConfigNamespaceHandler.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class CitrusJmsConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/handler/CitrusJmsTestcaseNamespaceHandler.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/handler/CitrusJmsTestcaseNamespaceHandler.java
index f2321139b7..60e17e19b2 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/handler/CitrusJmsTestcaseNamespaceHandler.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/handler/CitrusJmsTestcaseNamespaceHandler.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class CitrusJmsTestcaseNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/AbstractJmsEndpointParser.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/AbstractJmsEndpointParser.java
index 3c2c40d873..23e07fac61 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/AbstractJmsEndpointParser.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/AbstractJmsEndpointParser.java
@@ -27,7 +27,6 @@
  * Abstract base class for JMS endpoint configuration. Parser creates endpoint bean definitions setting
  * properties and property references.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public abstract class AbstractJmsEndpointParser extends AbstractEndpointParser {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/JmsEndpointAdapterParser.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/JmsEndpointAdapterParser.java
index aceb153325..9df9f3bb17 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/JmsEndpointAdapterParser.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/JmsEndpointAdapterParser.java
@@ -32,7 +32,6 @@
 
 /**
  * Bean definition parser creates JMS endpoint adapter component.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JmsEndpointAdapterParser extends AbstractBeanDefinitionParser {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/JmsEndpointParser.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/JmsEndpointParser.java
index 8679c06ae8..7ef02e8fed 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/JmsEndpointParser.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/JmsEndpointParser.java
@@ -28,7 +28,6 @@
 /**
  * Bean definition parser for JMS endpoint component.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JmsEndpointParser extends AbstractJmsEndpointParser {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/JmsSyncEndpointParser.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/JmsSyncEndpointParser.java
index 2241152b3a..28ba42e17d 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/JmsSyncEndpointParser.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/JmsSyncEndpointParser.java
@@ -28,7 +28,6 @@
 /**
  * Bean definition parser for synchronous JMS endpoint components.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JmsSyncEndpointParser extends AbstractJmsEndpointParser {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/PurgeJmsQueuesActionParser.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/PurgeJmsQueuesActionParser.java
index c1ab5fa7bd..9ab7444b05 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/PurgeJmsQueuesActionParser.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/config/xml/PurgeJmsQueuesActionParser.java
@@ -38,7 +38,6 @@
 /**
  * Bean definition parser for purge-jms-queues action in test case.
  *
- * @author Christoph Deppisch
  */
 public class PurgeJmsQueuesActionParser implements BeanDefinitionParser {
 
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsConsumer.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsConsumer.java
index 9bf851b868..77c9b281d5 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsConsumer.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsConsumer.java
@@ -27,7 +27,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JmsConsumer extends AbstractSelectiveMessageConsumer {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpoint.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpoint.java
index 647699491f..94396978a9 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpoint.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpoint.java
@@ -31,7 +31,6 @@
  * Jms message endpoint capable of sending/receiving messages from Jms message destination. Either uses a Jms connection factory or
  * a Spring Jms template to connect with Jms destinations.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JmsEndpoint extends AbstractEndpoint implements InitializingPhase, ShutdownPhase, ReferenceResolverAware {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointAdapter.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointAdapter.java
index a9c5dd835a..a06f0ad27a 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointAdapter.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointAdapter.java
@@ -30,7 +30,6 @@
  * on reply destination. Provides jms endpoint for clients to connect to destinations in order to provide proper
  * response message.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JmsEndpointAdapter extends AbstractEndpointAdapter {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointBuilder.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointBuilder.java
index 0376b415df..7a0e28da0c 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointBuilder.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointBuilder.java
@@ -26,7 +26,6 @@
 import org.springframework.jms.support.destination.DestinationResolver;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmsEndpointBuilder extends AbstractEndpointBuilder<JmsEndpoint> {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointComponent.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointComponent.java
index dcf80e09a9..c279c02dc3 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointComponent.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointComponent.java
@@ -29,7 +29,6 @@
  *
  * Further endpoint parameters such as connectionFactory get passed to the endpoint configuration.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class JmsEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointConfiguration.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointConfiguration.java
index ef74965088..defe941c31 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointConfiguration.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpointConfiguration.java
@@ -35,7 +35,6 @@
 import org.springframework.jms.support.destination.DestinationResolver;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JmsEndpointConfiguration extends AbstractPollableEndpointConfiguration {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpoints.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpoints.java
index 4cd853ed03..8bf4daf313 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpoints.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsEndpoints.java
@@ -18,9 +18,6 @@
 
 import org.citrusframework.endpoint.builder.AsyncSyncEndpointBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class JmsEndpoints extends AsyncSyncEndpointBuilder<JmsEndpointBuilder, JmsSyncEndpointBuilder> {
     /**
      * Private constructor setting the sync and async builder implementation.
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsProducer.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsProducer.java
index e86dfe7373..b490869ca5 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsProducer.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsProducer.java
@@ -27,7 +27,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JmsProducer implements Producer {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncConsumer.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncConsumer.java
index 5c0705b401..02edad0b3b 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncConsumer.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncConsumer.java
@@ -28,7 +28,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JmsSyncConsumer extends JmsConsumer implements ReplyProducer {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncEndpoint.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncEndpoint.java
index acb84217fc..2569a2d0f0 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncEndpoint.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncEndpoint.java
@@ -24,7 +24,6 @@
  * Synchronous Jms message endpoint. When sending messages endpoint sets replyTo message header and waits for synchronous response.
  * When receiving messages endpoint reads replyTo header from incoming request and sends synchronous response back.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JmsSyncEndpoint extends JmsEndpoint implements ShutdownPhase {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncEndpointBuilder.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncEndpointBuilder.java
index ee84e1bf4e..89acc23a2a 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncEndpointBuilder.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncEndpointBuilder.java
@@ -27,7 +27,6 @@
 import org.springframework.jms.support.destination.DestinationResolver;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmsSyncEndpointBuilder extends AbstractEndpointBuilder<JmsSyncEndpoint> {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncEndpointConfiguration.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncEndpointConfiguration.java
index 01c00f7943..495ee12352 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncEndpointConfiguration.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncEndpointConfiguration.java
@@ -26,7 +26,6 @@
  * Endpoint configuration sets additional synchronous message handling properties such as
  * reply destination and message correlator.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JmsSyncEndpointConfiguration extends JmsEndpointConfiguration implements PollableEndpointConfiguration {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncProducer.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncProducer.java
index b1d6b1eb9e..8477409dc4 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncProducer.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsSyncProducer.java
@@ -36,7 +36,6 @@
 import org.springframework.jms.support.destination.DynamicDestinationResolver;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JmsSyncProducer extends JmsProducer implements ReplyConsumer {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsTopicSubscriber.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsTopicSubscriber.java
index f60b1800eb..fbdb8d1804 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsTopicSubscriber.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/JmsTopicSubscriber.java
@@ -44,7 +44,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class JmsTopicSubscriber extends JmsConsumer implements Runnable {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/resolver/DynamicDestinationNameResolver.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/resolver/DynamicDestinationNameResolver.java
index d109f5e13f..0215271269 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/resolver/DynamicDestinationNameResolver.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/endpoint/resolver/DynamicDestinationNameResolver.java
@@ -25,7 +25,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class DynamicDestinationNameResolver implements EndpointUriResolver {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessage.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessage.java
index 470e8c01e0..2ccd3c6ae9 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessage.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessage.java
@@ -22,7 +22,6 @@
 import jakarta.jms.Destination;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class JmsMessage extends DefaultMessage {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessageConverter.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessageConverter.java
index 6915608ad1..f9bcf1f118 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessageConverter.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessageConverter.java
@@ -41,7 +41,6 @@
  * messages and vice versa. Converter combines message converting logic and header mapping.
  * Usually the message's payload is extracted to the JMS message payload and default JMS headers are mapped.
  *
- * @author Christoph Deppisch
  */
 public class JmsMessageConverter implements MessageConverter<jakarta.jms.Message, jakarta.jms.Message, JmsEndpointConfiguration> {
 
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessageHeaderMapper.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessageHeaderMapper.java
index 4c5aba3712..ca44b4ade1 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessageHeaderMapper.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessageHeaderMapper.java
@@ -28,7 +28,6 @@
  * Citrus JMS header mapper translates internal message headers to Spring integration message headers and
  * vice versa.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class JmsMessageHeaderMapper extends SimpleJmsHeaderMapper {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessageHeaders.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessageHeaders.java
index 883dc091dd..4574291742 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessageHeaders.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/JmsMessageHeaders.java
@@ -19,7 +19,6 @@
 import org.citrusframework.message.MessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public final class JmsMessageHeaders {
diff --git a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/SoapJmsMessageConverter.java b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/SoapJmsMessageConverter.java
index f9456e1ab8..c0b84413d8 100644
--- a/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/SoapJmsMessageConverter.java
+++ b/endpoints/citrus-jms/src/main/java/org/citrusframework/jms/message/SoapJmsMessageConverter.java
@@ -53,7 +53,6 @@
  *
  * Converter also takes care on special SOAP message headers such as SOAP action.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class SoapJmsMessageConverter extends JmsMessageConverter implements InitializingPhase, ReferenceResolverAware {
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/UnitTestSupport.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/UnitTestSupport.java
index e733c616a9..4cbbacd50d 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/UnitTestSupport.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/UnitTestSupport.java
@@ -20,9 +20,6 @@
 import org.citrusframework.context.TestContextFactory;
 import org.testng.annotations.BeforeMethod;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport {
 
     protected TestContextFactory testContextFactory;
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/actions/PurgeJmsQueuesActionTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/actions/PurgeJmsQueuesActionTest.java
index 1a44d4fd8b..b3ab1db4bb 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/actions/PurgeJmsQueuesActionTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/actions/PurgeJmsQueuesActionTest.java
@@ -41,9 +41,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class PurgeJmsQueuesActionTest extends AbstractTestNGUnitTest {
 
     private final ConnectionFactory connectionFactory = Mockito.mock(ConnectionFactory.class);
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/actions/dsl/PurgeJmsQueueTestActionBuilderTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/actions/dsl/PurgeJmsQueueTestActionBuilderTest.java
index 23b73d11ee..3b39355f6b 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/actions/dsl/PurgeJmsQueueTestActionBuilderTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/actions/dsl/PurgeJmsQueueTestActionBuilderTest.java
@@ -38,7 +38,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class PurgeJmsQueueTestActionBuilderTest extends UnitTestSupport {
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/annotation/JmsEndpointConfigParserTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/annotation/JmsEndpointConfigParserTest.java
index 59bf52f2de..2342814dbe 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/annotation/JmsEndpointConfigParserTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/annotation/JmsEndpointConfigParserTest.java
@@ -51,9 +51,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsEndpointConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/annotation/JmsSyncEndpointConfigParserTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/annotation/JmsSyncEndpointConfigParserTest.java
index 15638d0b51..72c85fa08c 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/annotation/JmsSyncEndpointConfigParserTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/annotation/JmsSyncEndpointConfigParserTest.java
@@ -41,9 +41,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsSyncEndpointConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/JmsEndpointAdapterParserTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/JmsEndpointAdapterParserTest.java
index 2d0bf7702a..36d494f6ff 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/JmsEndpointAdapterParserTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/JmsEndpointAdapterParserTest.java
@@ -26,7 +26,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JmsEndpointAdapterParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/JmsEndpointParserTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/JmsEndpointParserTest.java
index 70d3dcd478..5a74fdd26b 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/JmsEndpointParserTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/JmsEndpointParserTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsEndpointParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/JmsSyncEndpointParserTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/JmsSyncEndpointParserTest.java
index 61ccc6cdd1..1a946439c4 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/JmsSyncEndpointParserTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/JmsSyncEndpointParserTest.java
@@ -26,9 +26,6 @@
 
 import java.util.Map;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsSyncEndpointParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/PurgeJmsQueuesActionParserTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/PurgeJmsQueuesActionParserTest.java
index 9bde2df677..8a30be34fd 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/PurgeJmsQueuesActionParserTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/config/xml/PurgeJmsQueuesActionParserTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class PurgeJmsQueuesActionParserTest extends AbstractActionParserTest<PurgeJmsQueuesAction> {
 
     @Test
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointAdapterTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointAdapterTest.java
index 77952dc6b4..681819faed 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointAdapterTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointAdapterTest.java
@@ -43,9 +43,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsEndpointAdapterTest extends AbstractTestNGUnitTest {
 
     private ConnectionFactory connectionFactory = Mockito.mock(ConnectionFactory.class);
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointComponentTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointComponentTest.java
index ab955b289f..b55d3f3029 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointComponentTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointComponentTest.java
@@ -38,9 +38,6 @@
 import static org.mockito.Mockito.when;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsEndpointComponentTest {
 
     private ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointConsumerTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointConsumerTest.java
index 837992f7bc..95578958c9 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointConsumerTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointConsumerTest.java
@@ -42,9 +42,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsEndpointConsumerTest extends AbstractTestNGUnitTest {
 
     private ConnectionFactory connectionFactory = Mockito.mock(ConnectionFactory.class);
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointProducerTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointProducerTest.java
index 19ce156773..90819078fe 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointProducerTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointProducerTest.java
@@ -37,9 +37,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsEndpointProducerTest extends AbstractTestNGUnitTest {
 
     private final ConnectionFactory connectionFactory = Mockito.mock(ConnectionFactory.class);
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointSyncConsumerTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointSyncConsumerTest.java
index 7fb902aff0..e90e4c2260 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointSyncConsumerTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointSyncConsumerTest.java
@@ -42,9 +42,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsEndpointSyncConsumerTest extends AbstractTestNGUnitTest {
 
     private final ConnectionFactory connectionFactory = Mockito.mock(ConnectionFactory.class);
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointSyncProducerTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointSyncProducerTest.java
index 2552fd6c22..41ebe5e09c 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointSyncProducerTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointSyncProducerTest.java
@@ -43,9 +43,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsEndpointSyncProducerTest extends AbstractTestNGUnitTest {
 
     private final ConnectionFactory connectionFactory = Mockito.mock(ConnectionFactory.class);
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointsTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointsTest.java
index cadc6f970a..3aed6804a8 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointsTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsEndpointsTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsTopicSubscriberTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsTopicSubscriberTest.java
index 5dddd657eb..50b4ba56f4 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsTopicSubscriberTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/JmsTopicSubscriberTest.java
@@ -42,9 +42,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsTopicSubscriberTest extends AbstractTestNGUnitTest {
 
     @Mock
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/TextMessageImpl.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/TextMessageImpl.java
index a682e7e601..3b400497d5 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/TextMessageImpl.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/endpoint/TextMessageImpl.java
@@ -23,9 +23,6 @@
 import java.util.Map;
 import java.util.Vector;
 
-/**
- * @author Christoph Deppisch
- */
 public class TextMessageImpl implements TextMessage {
     private String payload;
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/groovy/AbstractGroovyActionDslTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/groovy/AbstractGroovyActionDslTest.java
index 925c8c1dcf..c3d9bb50cf 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/groovy/AbstractGroovyActionDslTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/groovy/AbstractGroovyActionDslTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractGroovyActionDslTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/groovy/PurgeQueuesTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/groovy/PurgeQueuesTest.java
index ebc82a34e6..a281f86cd2 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/groovy/PurgeQueuesTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/groovy/PurgeQueuesTest.java
@@ -39,9 +39,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class PurgeQueuesTest extends AbstractGroovyActionDslTest {
 
     @Mock
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsByteMessageIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsByteMessageIT.java
index a87867597c..7ba5b062cb 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsByteMessageIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsByteMessageIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsByteMessageIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsByteMessageJavaIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsByteMessageJavaIT.java
index a2bb7c1380..1b145eb57e 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsByteMessageJavaIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsByteMessageJavaIT.java
@@ -29,9 +29,6 @@
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 import static org.citrusframework.validation.interceptor.BinaryMessageProcessor.Builder.toBinary;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsByteMessageJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsCommunicationIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsCommunicationIT.java
index e1104398b7..2525b00c22 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsCommunicationIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsCommunicationIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class JmsCommunicationIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsCommunicationJavaIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsCommunicationJavaIT.java
index dfd6923fc7..055da692da 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsCommunicationJavaIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsCommunicationJavaIT.java
@@ -24,9 +24,6 @@
 import static org.citrusframework.actions.ReceiveMessageAction.Builder.receive;
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsCommunicationJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointFactoryIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointFactoryIT.java
index 6861eedc71..fe5b147fce 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointFactoryIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointFactoryIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 @Test
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointIT.java
index b6deb78cc9..fc42ad4e47 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsEndpointIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsEndpointIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsGzipMessageIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsGzipMessageIT.java
index 0f51a33025..ecfc275aa5 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsGzipMessageIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsGzipMessageIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsGzipMessageIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsGzipMessageJavaIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsGzipMessageJavaIT.java
index ff618ae102..955834d894 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsGzipMessageJavaIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsGzipMessageJavaIT.java
@@ -29,9 +29,6 @@
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 import static org.citrusframework.validation.interceptor.GzipMessageProcessor.Builder.toGzip;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsGzipMessageJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsMessageHeadersIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsMessageHeadersIT.java
index 423a4eed2a..41714e0f89 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsMessageHeadersIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsMessageHeadersIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsMessageHeadersIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSendReceiveIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSendReceiveIT.java
index 9a4007eb2d..c67827eb46 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSendReceiveIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSendReceiveIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsSendReceiveIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSendReceiveJavaIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSendReceiveJavaIT.java
index c44f4479a8..ab70d9774e 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSendReceiveJavaIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSendReceiveJavaIT.java
@@ -28,9 +28,6 @@
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 import static org.citrusframework.container.Assert.Builder.assertException;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsSendReceiveJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSoapIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSoapIT.java
index 5e918ad258..9a73b7165d 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSoapIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSoapIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 @Test
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncEndpointIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncEndpointIT.java
index 28ce9d485b..7ab04c53f5 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncEndpointIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncEndpointIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsSyncEndpointIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncSendReceiveIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncSendReceiveIT.java
index a2f87a6484..ec4b9450fc 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncSendReceiveIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncSendReceiveIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmsSyncSendReceiveIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncSendReceiveJavaIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncSendReceiveJavaIT.java
index 5cd951ae36..f688e314ec 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncSendReceiveJavaIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsSyncSendReceiveJavaIT.java
@@ -25,9 +25,6 @@
 import static org.citrusframework.actions.ReceiveMessageAction.Builder.receive;
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsSyncSendReceiveJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopic2IT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopic2IT.java
index 933af2068f..1b5dee0e47 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopic2IT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopic2IT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class JmsTopic2IT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicDurableSubscriberIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicDurableSubscriberIT.java
index b00c0458e7..bd5dabda65 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicDurableSubscriberIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicDurableSubscriberIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsTopicDurableSubscriberIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicIT.java
index db6cbbc1de..3c4101e21c 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsTopicIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicJavaIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicJavaIT.java
index 06eb029a40..2a60b2137f 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicJavaIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicJavaIT.java
@@ -26,9 +26,6 @@
 import static org.citrusframework.container.Parallel.Builder.parallel;
 import static org.citrusframework.container.Sequence.Builder.sequential;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsTopicJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicSubscriberIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicSubscriberIT.java
index 8e8c505762..92de0f6974 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicSubscriberIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/JmsTopicSubscriberIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class JmsTopicSubscriberIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/PurgeJmsQueuesIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/PurgeJmsQueuesIT.java
index 781de1f33b..dcc24acc43 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/PurgeJmsQueuesIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/PurgeJmsQueuesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class PurgeJmsQueuesIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/PurgeJmsQueuesJavaIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/PurgeJmsQueuesJavaIT.java
index 83a44502d4..3dfc77e0ec 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/PurgeJmsQueuesJavaIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/PurgeJmsQueuesJavaIT.java
@@ -27,9 +27,6 @@
 
 import static org.citrusframework.jms.actions.PurgeJmsQueuesAction.Builder.purgeQueues;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class PurgeJmsQueuesJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/ReceiveTimeoutIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/ReceiveTimeoutIT.java
index 70598d0298..35ec9f1a88 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/ReceiveTimeoutIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/ReceiveTimeoutIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class ReceiveTimeoutIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SendReplyToIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SendReplyToIT.java
index c99dc70b9b..f9420a1ef5 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SendReplyToIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SendReplyToIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class SendReplyToIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SendReplyToJavaIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SendReplyToJavaIT.java
index 34eb2a05cc..29306657ca 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SendReplyToJavaIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SendReplyToJavaIT.java
@@ -27,9 +27,6 @@
 import static org.citrusframework.container.Sequence.Builder.sequential;
 import static org.citrusframework.dsl.MessageSupport.MessageHeaderSupport.fromHeaders;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class SendReplyToJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsCommunicationIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsCommunicationIT.java
index fe1cf3e8d7..71f7451b1f 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsCommunicationIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsCommunicationIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class SyncJmsCommunicationIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsQueueJavaIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsQueueJavaIT.java
index 4de6333fb8..ac4c820345 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsQueueJavaIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsQueueJavaIT.java
@@ -23,9 +23,6 @@
 import static org.citrusframework.actions.ReceiveMessageAction.Builder.receive;
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class SyncJmsQueueJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsTopicCommunicationIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsTopicCommunicationIT.java
index b90ea0eed7..ed19e85aec 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsTopicCommunicationIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsTopicCommunicationIT.java
@@ -23,7 +23,6 @@
 import static org.citrusframework.common.TestLoader.SPRING;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class SyncJmsTopicCommunicationIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsTopicJavaIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsTopicJavaIT.java
index 1e13a7a050..c33f8224b5 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsTopicJavaIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/SyncJmsTopicJavaIT.java
@@ -26,9 +26,6 @@
 import static org.citrusframework.container.Parallel.Builder.parallel;
 import static org.citrusframework.container.Sequence.Builder.sequential;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class SyncJmsTopicJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/TemplateAdvancedIT.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/TemplateAdvancedIT.java
index 21e5644b24..c87d6e7f58 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/TemplateAdvancedIT.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/TemplateAdvancedIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TemplateAdvancedIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/AbstractMarshallingHelloService.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/AbstractMarshallingHelloService.java
index 30280f3a33..5af3eebe13 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/AbstractMarshallingHelloService.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/AbstractMarshallingHelloService.java
@@ -30,9 +30,6 @@
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractMarshallingHelloService implements HelloService {
 
     @Autowired
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/HelloService.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/HelloService.java
index 4e6e4d4aae..43e01967b4 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/HelloService.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/HelloService.java
@@ -20,9 +20,6 @@
 import org.citrusframework.jms.integration.service.model.HelloResponse;
 import org.springframework.messaging.Message;
 
-/**
- * @author Christoph Deppisch
- */
 public interface HelloService {
     /**
      * Handles hello request responding with proper hello response.
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/HelloServiceImpl.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/HelloServiceImpl.java
index ea971d3951..1ae57d982a 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/HelloServiceImpl.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/HelloServiceImpl.java
@@ -21,9 +21,6 @@
 import org.springframework.messaging.Message;
 import org.springframework.integration.support.MessageBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class HelloServiceImpl extends AbstractMarshallingHelloService {
 
     public Message<HelloResponse> sayHello(Message<HelloRequest> request) {
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/HelloSoapServiceImpl.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/HelloSoapServiceImpl.java
index 96193b8d7b..ce0866abe3 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/HelloSoapServiceImpl.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/HelloSoapServiceImpl.java
@@ -40,7 +40,6 @@
 import org.springframework.ws.soap.SoapMessageFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class HelloSoapServiceImpl {
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/LoggingInterceptor.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/LoggingInterceptor.java
index 765f3f5431..63f37626c8 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/LoggingInterceptor.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/integration/service/LoggingInterceptor.java
@@ -22,9 +22,6 @@
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.support.ChannelInterceptor;
 
-/**
- * @author Christoph Deppisch
- */
 public class LoggingInterceptor implements ChannelInterceptor {
     private static final Logger logger = LoggerFactory.getLogger(LoggingInterceptor.class);
 
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/xml/AbstractXmlActionTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/xml/AbstractXmlActionTest.java
index 3c298807ea..1c69c947c3 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/xml/AbstractXmlActionTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/xml/AbstractXmlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractXmlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/xml/PurgeQueuesTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/xml/PurgeQueuesTest.java
index 98afd5737f..9cf56c7e09 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/xml/PurgeQueuesTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/xml/PurgeQueuesTest.java
@@ -40,9 +40,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class PurgeQueuesTest extends AbstractXmlActionTest {
 
     @Mock
diff --git a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/yaml/AbstractYamlActionTest.java b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/yaml/AbstractYamlActionTest.java
index 4659092c06..5c99d3dbc5 100644
--- a/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/yaml/AbstractYamlActionTest.java
+++ b/endpoints/citrus-jms/src/test/java/org/citrusframework/jms/yaml/AbstractYamlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractYamlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/client/JmxClient.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/client/JmxClient.java
index 612d96b69e..358d16ffd4 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/client/JmxClient.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/client/JmxClient.java
@@ -55,7 +55,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxClient extends AbstractEndpoint implements Producer, ReplyConsumer, NotificationListener {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/client/JmxClientBuilder.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/client/JmxClientBuilder.java
index aeb617b715..ac9b2bfc94 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/client/JmxClientBuilder.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/client/JmxClientBuilder.java
@@ -23,7 +23,6 @@
 import javax.management.NotificationFilter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxClientBuilder extends AbstractEndpointBuilder<JmxClient> {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxClientConfig.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxClientConfig.java
index d573e1b3ff..46d700df8a 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxClientConfig.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxClientConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxClientConfigParser.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxClientConfigParser.java
index 7fe4132a72..47081a2124 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxClientConfigParser.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxClientConfigParser.java
@@ -28,7 +28,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxClientConfigParser implements AnnotationConfigParser<JmxClientConfig, JmxClient> {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxServerConfig.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxServerConfig.java
index 14cdcfaa14..7f8887fe6b 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxServerConfig.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxServerConfig.java
@@ -25,7 +25,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxServerConfigParser.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxServerConfigParser.java
index 281b54642b..3db9933698 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxServerConfigParser.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/JmxServerConfigParser.java
@@ -32,7 +32,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxServerConfigParser implements AnnotationConfigParser<JmxServerConfig, JmxServer> {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/MbeanAttribute.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/MbeanAttribute.java
index 4dd3dacce2..04ca28fb6a 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/MbeanAttribute.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/MbeanAttribute.java
@@ -17,7 +17,6 @@
 package org.citrusframework.jmx.config.annotation;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public @interface MbeanAttribute {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/MbeanConfig.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/MbeanConfig.java
index c162694cd6..cf73ce02fc 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/MbeanConfig.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/MbeanConfig.java
@@ -17,7 +17,6 @@
 package org.citrusframework.jmx.config.annotation;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public @interface MbeanConfig {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/MbeanOperation.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/MbeanOperation.java
index d5b8d79549..89743cd8af 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/MbeanOperation.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/annotation/MbeanOperation.java
@@ -17,7 +17,6 @@
 package org.citrusframework.jmx.config.annotation;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public @interface MbeanOperation {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/handler/CitrusJmxConfigNamespaceHandler.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/handler/CitrusJmxConfigNamespaceHandler.java
index 9bc7bd080c..e529251e98 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/handler/CitrusJmxConfigNamespaceHandler.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/handler/CitrusJmxConfigNamespaceHandler.java
@@ -21,7 +21,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class CitrusJmxConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/handler/CitrusJmxTestcaseNamespaceHandler.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/handler/CitrusJmxTestcaseNamespaceHandler.java
index ab446e0b81..3efa914dc7 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/handler/CitrusJmxTestcaseNamespaceHandler.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/handler/CitrusJmxTestcaseNamespaceHandler.java
@@ -19,7 +19,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class CitrusJmxTestcaseNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/xml/JmxClientParser.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/xml/JmxClientParser.java
index f5c7f05b71..27044d44d0 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/xml/JmxClientParser.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/xml/JmxClientParser.java
@@ -29,7 +29,6 @@
 /**
  * Bean definition parser for jmx client instance.
  *
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxClientParser extends AbstractEndpointParser {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/xml/JmxServerParser.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/xml/JmxServerParser.java
index 6c3e81dbf3..54baa1a7eb 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/xml/JmxServerParser.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/config/xml/JmxServerParser.java
@@ -32,7 +32,6 @@
 import java.util.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxServerParser extends AbstractServerParser {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/endpoint/JmxEndpointComponent.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/endpoint/JmxEndpointComponent.java
index 90f697d6bf..d1eedbb3c3 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/endpoint/JmxEndpointComponent.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/endpoint/JmxEndpointComponent.java
@@ -24,7 +24,6 @@
 import org.citrusframework.jmx.client.JmxClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/endpoint/JmxEndpointConfiguration.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/endpoint/JmxEndpointConfiguration.java
index 7755b79275..665c0a1a84 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/endpoint/JmxEndpointConfiguration.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/endpoint/JmxEndpointConfiguration.java
@@ -31,7 +31,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxEndpointConfiguration extends AbstractPollableEndpointConfiguration implements ReferenceResolverAware {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/endpoint/builder/JmxEndpoints.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/endpoint/builder/JmxEndpoints.java
index 120dedf871..413594ad6e 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/endpoint/builder/JmxEndpoints.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/endpoint/builder/JmxEndpoints.java
@@ -20,9 +20,6 @@
 import org.citrusframework.jmx.client.JmxClientBuilder;
 import org.citrusframework.jmx.server.JmxServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class JmxEndpoints extends ClientServerEndpointBuilder<JmxClientBuilder, JmxServerBuilder> {
 
     /**
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessage.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessage.java
index 62fc4b2291..dcee053ff1 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessage.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessage.java
@@ -25,7 +25,6 @@
 import org.citrusframework.xml.StringResult;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxMessage extends DefaultMessage {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessageConverter.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessageConverter.java
index 0416cedb87..14d7148d48 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessageConverter.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessageConverter.java
@@ -29,7 +29,6 @@
 import org.citrusframework.xml.StringResult;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxMessageConverter implements MessageConverter<ManagedBeanInvocation, ManagedBeanInvocation, JmxEndpointConfiguration> {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessageHeaders.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessageHeaders.java
index 742995d77e..297186f902 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessageHeaders.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/message/JmxMessageHeaders.java
@@ -19,7 +19,6 @@
 import org.citrusframework.message.MessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public abstract class JmxMessageHeaders {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/JmxMarshaller.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/JmxMarshaller.java
index 15c643d2b4..3cc9085a6c 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/JmxMarshaller.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/JmxMarshaller.java
@@ -27,7 +27,6 @@
 import org.citrusframework.xml.Unmarshaller;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxMarshaller implements Marshaller, Unmarshaller {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ManagedBeanDefinition.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ManagedBeanDefinition.java
index 6e8e692ed5..e386fd6a9e 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ManagedBeanDefinition.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ManagedBeanDefinition.java
@@ -34,7 +34,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class ManagedBeanDefinition {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ManagedBeanInvocation.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ManagedBeanInvocation.java
index 860d6c0bd9..a3804b479a 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ManagedBeanInvocation.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ManagedBeanInvocation.java
@@ -37,7 +37,6 @@
 import org.citrusframework.util.TypeConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ManagedBeanResult.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ManagedBeanResult.java
index 428c812193..dbee93a0f6 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ManagedBeanResult.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/ManagedBeanResult.java
@@ -35,7 +35,6 @@
 import org.citrusframework.util.TypeConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/OperationParam.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/OperationParam.java
index 2e0bb4273a..40e34d3ca9 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/OperationParam.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/model/OperationParam.java
@@ -19,7 +19,6 @@
 import jakarta.xml.bind.annotation.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/server/JmxEndpointMBean.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/server/JmxEndpointMBean.java
index c0f3ab6e40..0800207653 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/server/JmxEndpointMBean.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/server/JmxEndpointMBean.java
@@ -47,7 +47,6 @@
  *
  * This class supports managed bean operation invocation as well as read and write access to managed bean attributes.
  *
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxEndpointMBean implements DynamicMBean {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/server/JmxServer.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/server/JmxServer.java
index ca3ba73536..9980986235 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/server/JmxServer.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/server/JmxServer.java
@@ -32,7 +32,6 @@
 import java.util.List;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxServer extends AbstractServer {
diff --git a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/server/JmxServerBuilder.java b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/server/JmxServerBuilder.java
index b64aa01961..35db7ec1f2 100644
--- a/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/server/JmxServerBuilder.java
+++ b/endpoints/citrus-jmx/src/main/java/org/citrusframework/jmx/server/JmxServerBuilder.java
@@ -29,7 +29,6 @@
 import org.citrusframework.server.AbstractServerBuilder;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxServerBuilder extends AbstractServerBuilder<JmxServer, JmxServerBuilder> {
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/annotation/JmxClientConfigParserTest.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/annotation/JmxClientConfigParserTest.java
index 9a0cf15765..f5b55cbe4c 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/annotation/JmxClientConfigParserTest.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/annotation/JmxClientConfigParserTest.java
@@ -39,9 +39,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmxClientConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "jmxClient1")
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/annotation/JmxServerConfigParserTest.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/annotation/JmxServerConfigParserTest.java
index ce9b664066..3658165e1d 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/annotation/JmxServerConfigParserTest.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/annotation/JmxServerConfigParserTest.java
@@ -38,9 +38,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmxServerConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "jmxServer1")
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/xml/JmxClientParserTest.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/xml/JmxClientParserTest.java
index 08c7cf7bd2..068a802c2a 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/xml/JmxClientParserTest.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/xml/JmxClientParserTest.java
@@ -27,9 +27,6 @@
 import javax.management.NotificationFilter;
 import java.util.Map;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmxClientParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/xml/JmxServerParserTest.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/xml/JmxServerParserTest.java
index 182085808a..62576eba81 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/xml/JmxServerParserTest.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/config/xml/JmxServerParserTest.java
@@ -27,7 +27,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxServerParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/endpoint/JmxEndpointComponentTest.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/endpoint/JmxEndpointComponentTest.java
index eabc7cea73..b318fe825c 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/endpoint/JmxEndpointComponentTest.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/endpoint/JmxEndpointComponentTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JmxEndpointComponentTest {
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/endpoint/builder/JmxEndpointsTest.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/endpoint/builder/JmxEndpointsTest.java
index bb4c7c60e0..2cc932bcfa 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/endpoint/builder/JmxEndpointsTest.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/endpoint/builder/JmxEndpointsTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class JmxEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxClientIT.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxClientIT.java
index ed8555ff9f..dd3b34d98e 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxClientIT.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxClientIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Test
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxDynamicEndpointIT.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxDynamicEndpointIT.java
index bd658270c3..5e5b8b2c36 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxDynamicEndpointIT.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxDynamicEndpointIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Test
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxEndpointIT.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxEndpointIT.java
index f4482a5850..42693b979d 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxEndpointIT.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxEndpointIT.java
@@ -29,7 +29,6 @@
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Test
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxServerIT.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxServerIT.java
index f309f4e491..f3e8a17fee 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxServerIT.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/integration/JmxServerIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Test
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/HelloBean.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/HelloBean.java
index 6a792dff31..92f76a98a3 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/HelloBean.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/HelloBean.java
@@ -17,7 +17,6 @@
 package org.citrusframework.jmx.mbean;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public interface HelloBean {
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/HelloBeanImpl.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/HelloBeanImpl.java
index 59c3f6180f..bb0006ca6a 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/HelloBeanImpl.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/HelloBeanImpl.java
@@ -20,7 +20,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class HelloBeanImpl implements HelloBean {
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/NewsBean.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/NewsBean.java
index f81730c20e..2b2b2f0de4 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/NewsBean.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/NewsBean.java
@@ -17,7 +17,6 @@
 package org.citrusframework.jmx.mbean;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public interface NewsBean {
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/NewsBeanImpl.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/NewsBeanImpl.java
index f2d0cc8489..2737f4dc24 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/NewsBeanImpl.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/mbean/NewsBeanImpl.java
@@ -17,7 +17,6 @@
 package org.citrusframework.jmx.mbean;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class NewsBeanImpl implements NewsBean {
diff --git a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/model/ManagedBeanDefinitionTest.java b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/model/ManagedBeanDefinitionTest.java
index 417bb41e79..2c74e4fac3 100644
--- a/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/model/ManagedBeanDefinitionTest.java
+++ b/endpoints/citrus-jmx/src/test/java/org/citrusframework/jmx/model/ManagedBeanDefinitionTest.java
@@ -24,7 +24,6 @@
 import java.util.Arrays;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class ManagedBeanDefinitionTest {
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/annotation/KafkaEndpointConfig.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/annotation/KafkaEndpointConfig.java
index 55db6b920a..d53bd7ccbb 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/annotation/KafkaEndpointConfig.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/annotation/KafkaEndpointConfig.java
@@ -29,7 +29,6 @@
 import java.lang.annotation.Target;
 
 /**
- * @author Christoph Deppisch
  * @since 2.8
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/annotation/KafkaEndpointConfigParser.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/annotation/KafkaEndpointConfigParser.java
index 335c008378..e1dfd74849 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/annotation/KafkaEndpointConfigParser.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/annotation/KafkaEndpointConfigParser.java
@@ -29,7 +29,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.8
  */
 public class KafkaEndpointConfigParser implements AnnotationConfigParser<KafkaEndpointConfig, KafkaEndpoint> {
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/handler/CitrusKafkaConfigNamespaceHandler.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/handler/CitrusKafkaConfigNamespaceHandler.java
index 31bf6703eb..1606e5eae1 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/handler/CitrusKafkaConfigNamespaceHandler.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/handler/CitrusKafkaConfigNamespaceHandler.java
@@ -21,7 +21,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.8
  */
 public class CitrusKafkaConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/handler/CitrusKafkaTestcaseNamespaceHandler.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/handler/CitrusKafkaTestcaseNamespaceHandler.java
index fa06510452..371337b768 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/handler/CitrusKafkaTestcaseNamespaceHandler.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/handler/CitrusKafkaTestcaseNamespaceHandler.java
@@ -19,7 +19,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.8
  */
 public class CitrusKafkaTestcaseNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/xml/KafkaEmbeddedServerParser.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/xml/KafkaEmbeddedServerParser.java
index bb2df4c3c5..984e8a42a2 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/xml/KafkaEmbeddedServerParser.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/config/xml/KafkaEmbeddedServerParser.java
@@ -27,7 +27,6 @@
 /**
  * Bean definition parser for embedded Kafka server component.
  *
- * @author Christoph Deppisch
  * @since 2.8
  */
 public class KafkaEmbeddedServerParser extends AbstractBeanDefinitionParser {
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/embedded/EmbeddedKafkaServer.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/embedded/EmbeddedKafkaServer.java
index ed27e245be..69607db101 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/embedded/EmbeddedKafkaServer.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/embedded/EmbeddedKafkaServer.java
@@ -66,7 +66,6 @@
  * Embedded Kafka server with reference to embedded Zookeeper cluster for testing purpose. Starts single Zookeeper instance with logs in Java temp directory. Starts single Kafka server
  * and automatically creates given topics with admin client.
  *
- * @author Christoph Deppisch
  * @since 2.8
  */
 public class EmbeddedKafkaServer implements InitializingPhase, ShutdownPhase {
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/embedded/EmbeddedKafkaServerApp.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/embedded/EmbeddedKafkaServerApp.java
index 311b84279f..0b186e393d 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/embedded/EmbeddedKafkaServerApp.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/embedded/EmbeddedKafkaServerApp.java
@@ -25,7 +25,6 @@
  * Standalone application provides a main cli entry for running an embedded Kafka server with embedded Zookeeper.
  * Kafka server properties can be set via property file or system properties.
  *
- * @author Christoph Deppisch
  * @since 2.8
  */
 @PropertySource(value = "classpath:${citrus.kafka.server.properties.file:citrus-kafka-server.properties}", ignoreResourceNotFound = true)
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/embedded/EmbeddedKafkaServerBuilder.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/embedded/EmbeddedKafkaServerBuilder.java
index 31a11cbc0e..06e8300dd0 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/embedded/EmbeddedKafkaServerBuilder.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/embedded/EmbeddedKafkaServerBuilder.java
@@ -22,7 +22,6 @@
  * Embedded Kafka server with reference to embedded Zookeeper cluster for testing purpose. Starts single Zookeeper instance with logs in Java temp directory. Starts single Kafka server
  * and automatically creates given topics with admin client.
  *
- * @author Christoph Deppisch
  * @since 2.8
  */
 public class EmbeddedKafkaServerBuilder {
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/endpoint/KafkaEndpointBuilder.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/endpoint/KafkaEndpointBuilder.java
index 9151a49b81..ce39a90e73 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/endpoint/KafkaEndpointBuilder.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/endpoint/KafkaEndpointBuilder.java
@@ -25,7 +25,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.8
  */
 public class KafkaEndpointBuilder extends AbstractEndpointBuilder<KafkaEndpoint> {
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/endpoint/KafkaEndpointComponent.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/endpoint/KafkaEndpointComponent.java
index 63a101f25d..128d7892c4 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/endpoint/KafkaEndpointComponent.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/endpoint/KafkaEndpointComponent.java
@@ -28,7 +28,6 @@
  *
  * Further endpoint parameters such as connectionFactory get passed to the endpoint configuration.
  *
- * @author Christoph Deppisch
  * @since 2.8
  */
 public class KafkaEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/endpoint/builder/KafkaEndpoints.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/endpoint/builder/KafkaEndpoints.java
index 16c8bccad8..e1425afcd0 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/endpoint/builder/KafkaEndpoints.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/endpoint/builder/KafkaEndpoints.java
@@ -19,9 +19,6 @@
 import org.citrusframework.endpoint.builder.AsyncSyncEndpointBuilder;
 import org.citrusframework.kafka.endpoint.KafkaEndpointBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class KafkaEndpoints extends AsyncSyncEndpointBuilder<KafkaEndpointBuilder, KafkaEndpointBuilder> {
     /**
      * Private constructor setting the sync and async builder implementation.
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/message/KafkaMessageConverter.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/message/KafkaMessageConverter.java
index 6aa6dfca0c..0b3e340f5d 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/message/KafkaMessageConverter.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/message/KafkaMessageConverter.java
@@ -34,7 +34,6 @@
  * messages and vice versa. Converter combines message converting logic and header mapping.
  * Usually the message's payload is extracted to the Kafka message payload and default Kafka headers are mapped.
  *
- * @author Christoph Deppisch
  * @since 2.8
  */
 public class KafkaMessageConverter implements MessageConverter<ConsumerRecord<Object, Object>, ProducerRecord<Object, Object>, KafkaEndpointConfiguration> {
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/message/KafkaMessageHeaderMapper.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/message/KafkaMessageHeaderMapper.java
index eb0ffa9cdd..9ab9fa8105 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/message/KafkaMessageHeaderMapper.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/message/KafkaMessageHeaderMapper.java
@@ -28,7 +28,6 @@
  * Citrus Kafka header mapper translates internal message headers to Spring integration message headers and
  * vice versa.
  *
- * @author Christoph Deppisch
  * @since 2.8
  */
 public class KafkaMessageHeaderMapper {
diff --git a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/message/KafkaMessageHeaders.java b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/message/KafkaMessageHeaders.java
index 503f26e989..15b7c4209e 100644
--- a/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/message/KafkaMessageHeaders.java
+++ b/endpoints/citrus-kafka/src/main/java/org/citrusframework/kafka/message/KafkaMessageHeaders.java
@@ -19,7 +19,6 @@
 import org.citrusframework.message.MessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 2.8
  */
 public final class KafkaMessageHeaders {
diff --git a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/config/annotation/KafkaEndpointConfigParserTest.java b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/config/annotation/KafkaEndpointConfigParserTest.java
index ad1875d687..3662bbf327 100644
--- a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/config/annotation/KafkaEndpointConfigParserTest.java
+++ b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/config/annotation/KafkaEndpointConfigParserTest.java
@@ -45,9 +45,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class KafkaEndpointConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint
diff --git a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/config/xml/KafkaEmbeddedServerParserTest.java b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/config/xml/KafkaEmbeddedServerParserTest.java
index c3806303ef..056fc8c39a 100644
--- a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/config/xml/KafkaEmbeddedServerParserTest.java
+++ b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/config/xml/KafkaEmbeddedServerParserTest.java
@@ -24,7 +24,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class KafkaEmbeddedServerParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/config/xml/KafkaEndpointParserTest.java b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/config/xml/KafkaEndpointParserTest.java
index 1b801edf9f..29cea46628 100644
--- a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/config/xml/KafkaEndpointParserTest.java
+++ b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/config/xml/KafkaEndpointParserTest.java
@@ -41,9 +41,6 @@
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Christoph Deppisch
- */
 public class KafkaEndpointParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/endpoint/KafkaEndpointComponentTest.java b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/endpoint/KafkaEndpointComponentTest.java
index f95e562f49..dfbff5354b 100644
--- a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/endpoint/KafkaEndpointComponentTest.java
+++ b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/endpoint/KafkaEndpointComponentTest.java
@@ -26,9 +26,6 @@
 
 import java.util.Map;
 
-/**
- * @author Christoph Deppisch
- */
 public class KafkaEndpointComponentTest {
 
     private TestContext context = new TestContext();
diff --git a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/endpoint/KafkaProducerTest.java b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/endpoint/KafkaProducerTest.java
index 09d3517d2d..9ece224e41 100644
--- a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/endpoint/KafkaProducerTest.java
+++ b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/endpoint/KafkaProducerTest.java
@@ -42,9 +42,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class KafkaProducerTest extends AbstractTestNGUnitTest {
 
     private final KafkaProducer kafkaProducer = Mockito.mock(KafkaProducer.class);
diff --git a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/endpoint/builder/KafkaEndpointsTest.java b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/endpoint/builder/KafkaEndpointsTest.java
index 851c9fc5a8..914405814d 100644
--- a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/endpoint/builder/KafkaEndpointsTest.java
+++ b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/endpoint/builder/KafkaEndpointsTest.java
@@ -23,9 +23,6 @@
 
 import java.util.Map;
 
-/**
- * @author Christoph Deppisch
- */
 public class KafkaEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointFactoryIT.java b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointFactoryIT.java
index 6ea37dadbc..9cbf45ddc3 100644
--- a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointFactoryIT.java
+++ b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaEndpointFactoryIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class KafkaEndpointFactoryIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaMessageHeadersIT.java b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaMessageHeadersIT.java
index a2cc69b2ac..1f68e42ec9 100644
--- a/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaMessageHeadersIT.java
+++ b/endpoints/citrus-kafka/src/test/java/org/citrusframework/kafka/integration/KafkaMessageHeadersIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class KafkaMessageHeadersIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/MailSettings.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/MailSettings.java
index ce3a947984..90c491eba4 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/MailSettings.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/MailSettings.java
@@ -18,9 +18,6 @@
 
 import org.citrusframework.message.MessageType;
 
-/**
- * @author Christoph Deppisch
- */
 public class MailSettings {
 
     private static final String MAIL_PROPERTY_PREFIX = "citrus.mail.";
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailClient.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailClient.java
index 9c3cb8c567..2091a43f77 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailClient.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailClient.java
@@ -36,7 +36,6 @@
 import org.springframework.mail.javamail.MimeMailMessage;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class MailClient extends AbstractEndpoint implements Producer, InitializingPhase {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailClientBuilder.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailClientBuilder.java
index 5f377e0273..dc905c1726 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailClientBuilder.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailClientBuilder.java
@@ -23,7 +23,6 @@
 import org.citrusframework.mail.model.MailMarshaller;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class MailClientBuilder extends AbstractEndpointBuilder<MailClient> {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailEndpointComponent.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailEndpointComponent.java
index a276f7b380..787c439396 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailEndpointComponent.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailEndpointComponent.java
@@ -28,7 +28,6 @@
 /**
  * Component creates proper mail client from endpoint uri resource and parameters.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class MailEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailEndpointConfiguration.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailEndpointConfiguration.java
index e3fa14f25f..a7f314e784 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailEndpointConfiguration.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/client/MailEndpointConfiguration.java
@@ -25,7 +25,6 @@
 import java.util.Properties;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class MailEndpointConfiguration extends AbstractEndpointConfiguration {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailClientConfig.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailClientConfig.java
index 4bb9f7ba4c..eb853c4d5e 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailClientConfig.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailClientConfig.java
@@ -25,7 +25,6 @@
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailClientConfigParser.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailClientConfigParser.java
index fefc0d81e6..cf7c8e24d2 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailClientConfigParser.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailClientConfigParser.java
@@ -28,7 +28,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class MailClientConfigParser implements AnnotationConfigParser<MailClientConfig, MailClient> {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailServerConfig.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailServerConfig.java
index 717d8af544..70e60e6060 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailServerConfig.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailServerConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailServerConfigParser.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailServerConfigParser.java
index 4dc5a7ff99..dc185dfe6d 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailServerConfigParser.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/annotation/MailServerConfigParser.java
@@ -30,7 +30,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class MailServerConfigParser implements AnnotationConfigParser<MailServerConfig, MailServer> {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/handler/CitrusMailConfigNamespaceHandler.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/handler/CitrusMailConfigNamespaceHandler.java
index f327290c99..a5c910d263 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/handler/CitrusMailConfigNamespaceHandler.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/handler/CitrusMailConfigNamespaceHandler.java
@@ -21,7 +21,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class CitrusMailConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/xml/MailClientParser.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/xml/MailClientParser.java
index ec5e7c3e08..c20c3b18dc 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/xml/MailClientParser.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/xml/MailClientParser.java
@@ -26,7 +26,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class MailClientParser extends AbstractBeanDefinitionParser {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/xml/MailServerParser.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/xml/MailServerParser.java
index 65c009b153..22b6892b14 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/xml/MailServerParser.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/config/xml/MailServerParser.java
@@ -28,7 +28,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class MailServerParser extends AbstractServerParser {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/endpoint/builder/MailEndpoints.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/endpoint/builder/MailEndpoints.java
index 974d1efccc..8bf009f23f 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/endpoint/builder/MailEndpoints.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/endpoint/builder/MailEndpoints.java
@@ -20,9 +20,6 @@
 import org.citrusframework.mail.client.MailClientBuilder;
 import org.citrusframework.mail.server.MailServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class MailEndpoints extends ClientServerEndpointBuilder<MailClientBuilder, MailServerBuilder> {
     /**
      * Private constructor setting the client and server builder implementation.
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/message/CitrusMailMessageHeaders.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/message/CitrusMailMessageHeaders.java
index 49defc858b..1ada2fca6c 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/message/CitrusMailMessageHeaders.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/message/CitrusMailMessageHeaders.java
@@ -19,7 +19,6 @@
 
 /**
  * Citrus mail headers set during mail message processing.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public abstract class CitrusMailMessageHeaders {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/message/MailMessage.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/message/MailMessage.java
index 8cfcca4614..5825c011fd 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/message/MailMessage.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/message/MailMessage.java
@@ -32,7 +32,6 @@
 import org.citrusframework.xml.StringResult;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class MailMessage extends DefaultMessage {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/message/MailMessageConverter.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/message/MailMessageConverter.java
index 9a9c53c4c6..c0151fd6f7 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/message/MailMessageConverter.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/message/MailMessageConverter.java
@@ -57,8 +57,6 @@
 import java.util.Optional;
 
 /**
- * @author Christoph Deppisch
- * @author Christian Guggenmos
  * @since 2.0
  */
 public class MailMessageConverter implements MessageConverter<MimeMailMessage, MimeMailMessage, MailEndpointConfiguration> {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/AcceptRequest.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/AcceptRequest.java
index f00b8a4252..bf3f5e81b6 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/AcceptRequest.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/AcceptRequest.java
@@ -26,7 +26,6 @@
  * Accept request is defined by mail sender address and recipients. Accept request is fired for each entry in list
  * of recipients.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/AcceptResponse.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/AcceptResponse.java
index da48c29ed7..da4cfca9e4 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/AcceptResponse.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/AcceptResponse.java
@@ -22,7 +22,6 @@
  * Response outcome for accept requests. Just says whether accept request is accepted or declined according
  * to boolean response outcome.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/AttachmentPart.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/AttachmentPart.java
index e8a2d6d81b..c5f979a7f3 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/AttachmentPart.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/AttachmentPart.java
@@ -20,7 +20,6 @@
 
 /**
  * Attachment part adds file name.
- * @author Christoph Deppisch
  * @since 1.4
  */
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/BodyPart.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/BodyPart.java
index 9c378156d2..b1a621c008 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/BodyPart.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/BodyPart.java
@@ -27,7 +27,6 @@
 
 /**
  * Body part representation holds content as String and optional attachment parts.
- * @author Christoph Deppisch
  * @since 1.4
  */
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/MailMarshaller.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/MailMarshaller.java
index 0e122c3fdd..5606841f80 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/MailMarshaller.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/MailMarshaller.java
@@ -38,7 +38,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.1
  */
 public class MailMarshaller implements Marshaller, Unmarshaller {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/MailRequest.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/MailRequest.java
index 61ef7004fe..70f32b28aa 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/MailRequest.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/MailRequest.java
@@ -21,7 +21,6 @@
  * Mail message model object representing mail content with sender and recipient information. Body can be text, binary
  * or multipart nature.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/MailResponse.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/MailResponse.java
index c7511dd161..522df771ba 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/MailResponse.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/model/MailResponse.java
@@ -23,7 +23,6 @@
  * message. By default SMTP command is responded with success OK. User can also specify reject message and code
  * in order to abort SMTP mail communication with error.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/server/MailServer.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/server/MailServer.java
index 9d3a72d285..2a926bf742 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/server/MailServer.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/server/MailServer.java
@@ -54,7 +54,6 @@
  * In case of incoming multipart mail messages the server is able to split the body parts into separate XML messages
  * handled by the endpoint adapter.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class MailServer extends AbstractServer {
diff --git a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/server/MailServerBuilder.java b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/server/MailServerBuilder.java
index 32657f8735..8b467b4c03 100644
--- a/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/server/MailServerBuilder.java
+++ b/endpoints/citrus-mail/src/main/java/org/citrusframework/mail/server/MailServerBuilder.java
@@ -26,7 +26,6 @@
 import org.citrusframework.server.AbstractServerBuilder;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class MailServerBuilder extends AbstractServerBuilder<MailServer, MailServerBuilder> {
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/client/MailClientTest.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/client/MailClientTest.java
index 8c57e69284..f175912634 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/client/MailClientTest.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/client/MailClientTest.java
@@ -40,7 +40,6 @@
 import static org.mockito.Mockito.doAnswer;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 class MailClientTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/client/MailEndpointComponentTest.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/client/MailEndpointComponentTest.java
index 651484dbab..d8fc44a1ef 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/client/MailEndpointComponentTest.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/client/MailEndpointComponentTest.java
@@ -33,9 +33,6 @@
 import static org.mockito.Mockito.when;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class MailEndpointComponentTest {
 
     private ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/annotation/MailClientConfigParserTest.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/annotation/MailClientConfigParserTest.java
index f1273c109c..103350b397 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/annotation/MailClientConfigParserTest.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/annotation/MailClientConfigParserTest.java
@@ -39,9 +39,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class MailClientConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "mailClient1")
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/annotation/MailServerConfigParserTest.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/annotation/MailServerConfigParserTest.java
index 40d7641179..f985b11d58 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/annotation/MailServerConfigParserTest.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/annotation/MailServerConfigParserTest.java
@@ -38,9 +38,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class MailServerConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "mailServer1")
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/xml/MailClientParserTest.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/xml/MailClientParserTest.java
index fb580a4b14..529e5a131f 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/xml/MailClientParserTest.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/xml/MailClientParserTest.java
@@ -26,7 +26,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class MailClientParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/xml/MailServerParserTest.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/xml/MailServerParserTest.java
index 9069213cba..5c1c523569 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/xml/MailServerParserTest.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/config/xml/MailServerParserTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class MailServerParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/endpoint/builder/MailEndpointsTest.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/endpoint/builder/MailEndpointsTest.java
index 82172211c6..3b13441e2b 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/endpoint/builder/MailEndpointsTest.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/endpoint/builder/MailEndpointsTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MailEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailMultipartIT.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailMultipartIT.java
index b773c317f4..36ba9aa4bb 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailMultipartIT.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailMultipartIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MailMultipartIT extends TestNGCitrusSpringSupport {
 
     @Test
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailSendReceiveIT.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailSendReceiveIT.java
index a04ebafa7f..553e7e779d 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailSendReceiveIT.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailSendReceiveIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MailSendReceiveIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerAcceptIT.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerAcceptIT.java
index b3be57f855..82053fb496 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerAcceptIT.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerAcceptIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MailServerAcceptIT extends TestNGCitrusSpringSupport {
 
     @Test
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerErrorIT.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerErrorIT.java
index 67cf25d0df..2fd0f8fcac 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerErrorIT.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerErrorIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MailServerErrorIT extends TestNGCitrusSpringSupport {
 
     @Test
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerIT.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerIT.java
index 9d60d29caa..d07d36ee0a 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerIT.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MailServerIT extends TestNGCitrusSpringSupport {
 
     @Test
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerUserAuthIT.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerUserAuthIT.java
index 4c9c592aa2..89373084f7 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerUserAuthIT.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/integration/MailServerUserAuthIT.java
@@ -28,9 +28,6 @@
 import static org.citrusframework.actions.ReceiveMessageAction.Builder.receive;
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
-/**
- * @author Christoph Deppisch
- */
 public class MailServerUserAuthIT extends TestNGCitrusSpringSupport {
 
     @Autowired
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/message/MailMessageConverterTest.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/message/MailMessageConverterTest.java
index 8eed86234f..77c58f8fdc 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/message/MailMessageConverterTest.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/message/MailMessageConverterTest.java
@@ -25,7 +25,6 @@
 import static org.testng.Assert.assertEquals;
 
 /**
- * @author Christian Guggenmos
  * @since 2.7.3
  */
 public class MailMessageConverterTest {
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/model/MailMarshallerTest.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/model/MailMarshallerTest.java
index 85acaad20c..b23bd48b20 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/model/MailMarshallerTest.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/model/MailMarshallerTest.java
@@ -24,9 +24,6 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MailMarshallerTest {
 
     private final MailMarshaller mailMarshaller = new MailMarshaller();
diff --git a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/server/MailServerTest.java b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/server/MailServerTest.java
index 480323185d..51f73201a8 100644
--- a/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/server/MailServerTest.java
+++ b/endpoints/citrus-mail/src/test/java/org/citrusframework/mail/server/MailServerTest.java
@@ -43,9 +43,6 @@
 import static org.mockito.MockitoAnnotations.openMocks;
 import static org.testng.Assert.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class MailServerTest {
 
     private AutoCloseable mockitoContext;
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/client/RmiClient.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/client/RmiClient.java
index c761eecef8..f58da3dcc8 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/client/RmiClient.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/client/RmiClient.java
@@ -47,7 +47,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiClient extends AbstractEndpoint implements Producer, ReplyConsumer {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/client/RmiClientBuilder.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/client/RmiClientBuilder.java
index ce8e224489..4e6f2627bf 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/client/RmiClientBuilder.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/client/RmiClientBuilder.java
@@ -21,7 +21,6 @@
 import org.citrusframework.rmi.message.RmiMessageConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiClientBuilder extends AbstractEndpointBuilder<RmiClient> {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiClientConfig.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiClientConfig.java
index 61d6d6623a..d45d855687 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiClientConfig.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiClientConfig.java
@@ -25,7 +25,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiClientConfigParser.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiClientConfigParser.java
index 1746617cde..74ce8efb72 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiClientConfigParser.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiClientConfigParser.java
@@ -26,7 +26,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiClientConfigParser implements AnnotationConfigParser<RmiClientConfig, RmiClient> {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiServerConfig.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiServerConfig.java
index 85fac87a26..53167b3891 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiServerConfig.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiServerConfig.java
@@ -26,7 +26,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiServerConfigParser.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiServerConfigParser.java
index e5e57a3ce6..9fb07bacb2 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiServerConfigParser.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/annotation/RmiServerConfigParser.java
@@ -27,7 +27,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiServerConfigParser implements AnnotationConfigParser<RmiServerConfig, RmiServer> {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/handler/RmiConfigNamespaceHandler.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/handler/RmiConfigNamespaceHandler.java
index 16a9022ce4..58acb989d9 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/handler/RmiConfigNamespaceHandler.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/handler/RmiConfigNamespaceHandler.java
@@ -21,7 +21,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/xml/RmiClientParser.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/xml/RmiClientParser.java
index fe9db10555..8f11c3611b 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/xml/RmiClientParser.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/xml/RmiClientParser.java
@@ -27,7 +27,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiClientParser extends AbstractEndpointParser {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/xml/RmiEndpointConfigurationParser.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/xml/RmiEndpointConfigurationParser.java
index 80fe0c7ca1..b5b4b2231a 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/xml/RmiEndpointConfigurationParser.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/xml/RmiEndpointConfigurationParser.java
@@ -21,7 +21,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiEndpointConfigurationParser {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/xml/RmiServerParser.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/xml/RmiServerParser.java
index 4b69f59fcb..161b50a72b 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/xml/RmiServerParser.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/config/xml/RmiServerParser.java
@@ -26,7 +26,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiServerParser extends AbstractServerParser {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/RmiEndpointComponent.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/RmiEndpointComponent.java
index c790c48d0c..58e70ecd7f 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/RmiEndpointComponent.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/RmiEndpointComponent.java
@@ -24,7 +24,6 @@
 import org.citrusframework.rmi.client.RmiClient;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/RmiEndpointConfiguration.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/RmiEndpointConfiguration.java
index 6e2367718a..5e6588e53e 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/RmiEndpointConfiguration.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/RmiEndpointConfiguration.java
@@ -30,7 +30,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiEndpointConfiguration extends AbstractPollableEndpointConfiguration implements ReferenceResolverAware {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/RmiEndpointUtils.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/RmiEndpointUtils.java
index f7d88929cd..ed6b7656f5 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/RmiEndpointUtils.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/RmiEndpointUtils.java
@@ -17,7 +17,6 @@
 package org.citrusframework.rmi.endpoint;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public abstract class RmiEndpointUtils {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/builder/RmiEndpoints.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/builder/RmiEndpoints.java
index a302e3bfec..ae1aba64ff 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/builder/RmiEndpoints.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/endpoint/builder/RmiEndpoints.java
@@ -20,9 +20,6 @@
 import org.citrusframework.rmi.client.RmiClientBuilder;
 import org.citrusframework.rmi.server.RmiServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class RmiEndpoints extends ClientServerEndpointBuilder<RmiClientBuilder, RmiServerBuilder> {
     /**
      * Private constructor setting the client and server builder implementation.
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/message/RmiMessage.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/message/RmiMessage.java
index e31f7084e1..88259a4cb9 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/message/RmiMessage.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/message/RmiMessage.java
@@ -27,7 +27,6 @@
 import org.citrusframework.xml.StringResult;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiMessage extends DefaultMessage {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/message/RmiMessageConverter.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/message/RmiMessageConverter.java
index 4056b4c307..ab25eb65db 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/message/RmiMessageConverter.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/message/RmiMessageConverter.java
@@ -28,7 +28,6 @@
 import org.citrusframework.xml.StringResult;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiMessageConverter implements MessageConverter<RmiServiceInvocation, RmiServiceInvocation, RmiEndpointConfiguration> {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/message/RmiMessageHeaders.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/message/RmiMessageHeaders.java
index d179bb467d..20d17bc547 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/message/RmiMessageHeaders.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/message/RmiMessageHeaders.java
@@ -19,7 +19,6 @@
 import org.citrusframework.message.MessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public abstract class RmiMessageHeaders {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/RmiMarshaller.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/RmiMarshaller.java
index 8c7a2288cd..07d8768a83 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/RmiMarshaller.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/RmiMarshaller.java
@@ -27,7 +27,6 @@
 import org.citrusframework.xml.Unmarshaller;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiMarshaller implements Marshaller, Unmarshaller {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/RmiServiceInvocation.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/RmiServiceInvocation.java
index b20e41f73c..f2a81d9021 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/RmiServiceInvocation.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/RmiServiceInvocation.java
@@ -37,7 +37,6 @@
 import org.citrusframework.util.TypeConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/RmiServiceResult.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/RmiServiceResult.java
index 24138d2107..4135008e3e 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/RmiServiceResult.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/model/RmiServiceResult.java
@@ -35,7 +35,6 @@
 import org.citrusframework.util.TypeConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/server/RmiServer.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/server/RmiServer.java
index 78a8b57bf7..900eec01ed 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/server/RmiServer.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/server/RmiServer.java
@@ -39,7 +39,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiServer extends AbstractServer implements InvocationHandler {
diff --git a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/server/RmiServerBuilder.java b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/server/RmiServerBuilder.java
index 09c10d7b12..0be2842c64 100644
--- a/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/server/RmiServerBuilder.java
+++ b/endpoints/citrus-rmi/src/main/java/org/citrusframework/rmi/server/RmiServerBuilder.java
@@ -28,7 +28,6 @@
 import org.citrusframework.server.AbstractServerBuilder;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiServerBuilder  extends AbstractServerBuilder<RmiServer, RmiServerBuilder> {
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/client/RmiClientTest.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/client/RmiClientTest.java
index b7525eb87e..fdb5394baf 100644
--- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/client/RmiClientTest.java
+++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/client/RmiClientTest.java
@@ -36,7 +36,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiClientTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/annotation/RmiClientConfigParserTest.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/annotation/RmiClientConfigParserTest.java
index 33bdd2a52e..ba3f92d81b 100644
--- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/annotation/RmiClientConfigParserTest.java
+++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/annotation/RmiClientConfigParserTest.java
@@ -39,9 +39,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class RmiClientConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "rmiClient1")
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/annotation/RmiServerConfigParserTest.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/annotation/RmiServerConfigParserTest.java
index 42c0335f61..13d8af31a3 100644
--- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/annotation/RmiServerConfigParserTest.java
+++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/annotation/RmiServerConfigParserTest.java
@@ -37,9 +37,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class RmiServerConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "rmiServer1")
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/xml/RmiClientParserTest.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/xml/RmiClientParserTest.java
index 67d0b08b69..77f2307509 100644
--- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/xml/RmiClientParserTest.java
+++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/xml/RmiClientParserTest.java
@@ -26,7 +26,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiClientParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/xml/RmiServerParserTest.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/xml/RmiServerParserTest.java
index 9d260ba635..382b69ffc3 100644
--- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/xml/RmiServerParserTest.java
+++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/config/xml/RmiServerParserTest.java
@@ -28,7 +28,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiServerParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/endpoint/RmiEndpointComponentTest.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/endpoint/RmiEndpointComponentTest.java
index 0057d3245b..1d4a2ca3c0 100644
--- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/endpoint/RmiEndpointComponentTest.java
+++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/endpoint/RmiEndpointComponentTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiEndpointComponentTest {
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/endpoint/builder/RmiEndpointsTest.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/endpoint/builder/RmiEndpointsTest.java
index 5273b8c354..ec73c9f8f5 100644
--- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/endpoint/builder/RmiEndpointsTest.java
+++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/endpoint/builder/RmiEndpointsTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RmiEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiDynamicEndpointIT.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiDynamicEndpointIT.java
index 3db1ccf419..8e55806ada 100644
--- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiDynamicEndpointIT.java
+++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiDynamicEndpointIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 @Test
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointIT.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointIT.java
index 33aacaa71b..9175809993 100644
--- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointIT.java
+++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Test
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointJavaIT.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointJavaIT.java
index e961a29a54..e4de083396 100644
--- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointJavaIT.java
+++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/integration/RmiEndpointJavaIT.java
@@ -31,7 +31,6 @@
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Test
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/remote/HelloService.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/remote/HelloService.java
index d30230dc12..ea902671c0 100644
--- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/remote/HelloService.java
+++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/remote/HelloService.java
@@ -20,7 +20,6 @@
 import java.rmi.RemoteException;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public interface HelloService extends Remote {
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/remote/NewsService.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/remote/NewsService.java
index d5a7b2b478..4f6f10abd2 100644
--- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/remote/NewsService.java
+++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/remote/NewsService.java
@@ -20,7 +20,6 @@
 import java.rmi.RemoteException;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public interface NewsService extends Remote {
diff --git a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/server/RmiServerTest.java b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/server/RmiServerTest.java
index 8dc4c9b4bb..324f897192 100644
--- a/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/server/RmiServerTest.java
+++ b/endpoints/citrus-rmi/src/test/java/org/citrusframework/rmi/server/RmiServerTest.java
@@ -43,7 +43,6 @@
 import static org.mockito.Mockito.reset;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class RmiServerTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/actions/PurgeMessageChannelAction.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/actions/PurgeMessageChannelAction.java
index ce983f8527..8211953d05 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/actions/PurgeMessageChannelAction.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/actions/PurgeMessageChannelAction.java
@@ -40,7 +40,6 @@
  * of type {@link org.springframework.integration.channel.QueueChannel}. Action receives
  * a list of channel objects or a list of channel names that are resolved dynamically at runtime.
  *
- * @author Christoph Deppisch
  */
 public class PurgeMessageChannelAction extends AbstractTestAction {
     /** List of channel names to be purged */
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelConsumer.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelConsumer.java
index 9bb42bc749..c275f86c0e 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelConsumer.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelConsumer.java
@@ -33,7 +33,6 @@
 import org.springframework.messaging.PollableChannel;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ChannelConsumer extends AbstractSelectiveMessageConsumer {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpoint.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpoint.java
index e9e361be88..d9a27d80a3 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpoint.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpoint.java
@@ -28,7 +28,6 @@
  * implement {@link org.springframework.messaging.PollableChannel} interface. When using message selector channel
  * must be of type {@link org.citrusframework.channel.MessageSelectingQueueChannel}.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ChannelEndpoint extends AbstractEndpoint implements BeanFactoryAware {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointAdapter.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointAdapter.java
index 666dc63bd7..2662a64de8 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointAdapter.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointAdapter.java
@@ -30,7 +30,6 @@
  * on reply channel. Provides channel endpoint for clients to connect to message channel in order to provide proper
  * response message.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ChannelEndpointAdapter extends AbstractEndpointAdapter {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointBuilder.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointBuilder.java
index 3989536fc2..dd5cf44720 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointBuilder.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointBuilder.java
@@ -22,7 +22,6 @@
 import org.springframework.messaging.core.DestinationResolver;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class ChannelEndpointBuilder extends AbstractEndpointBuilder<ChannelEndpoint> {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointComponent.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointComponent.java
index 88ed74ee7a..1c6a64e9a5 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointComponent.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointComponent.java
@@ -27,7 +27,6 @@
  * Channel endpoint component creates synchronous or asynchronous channel endpoint and sets configuration properties
  * accordingly.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class ChannelEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointConfiguration.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointConfiguration.java
index 59638a5e03..3854ae2549 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointConfiguration.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelEndpointConfiguration.java
@@ -24,7 +24,6 @@
 import org.springframework.messaging.core.DestinationResolver;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ChannelEndpointConfiguration extends AbstractEndpointConfiguration {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelMessageConverter.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelMessageConverter.java
index 2cc2be7cc0..1185cfa3e4 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelMessageConverter.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelMessageConverter.java
@@ -27,7 +27,6 @@
 import org.springframework.messaging.support.MessageBuilder;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class ChannelMessageConverter implements MessageConverter<org.springframework.messaging.Message<?>, org.springframework.messaging.Message<?>, ChannelEndpointConfiguration> {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelProducer.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelProducer.java
index 4d1273d0ec..d081aa2429 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelProducer.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelProducer.java
@@ -31,7 +31,6 @@
 import org.springframework.messaging.MessageDeliveryException;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ChannelProducer implements Producer {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncConsumer.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncConsumer.java
index e5dbbfc9fe..187f2f0dc0 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncConsumer.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncConsumer.java
@@ -30,7 +30,6 @@
 import org.springframework.messaging.MessageDeliveryException;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ChannelSyncConsumer extends ChannelConsumer implements ReplyProducer {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncEndpoint.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncEndpoint.java
index c1b2afe921..ba4393527d 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncEndpoint.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncEndpoint.java
@@ -20,7 +20,6 @@
 import org.citrusframework.messaging.SelectiveConsumer;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ChannelSyncEndpoint extends ChannelEndpoint {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncEndpointBuilder.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncEndpointBuilder.java
index 0de9aeb7a5..a2c5eb6844 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncEndpointBuilder.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncEndpointBuilder.java
@@ -23,7 +23,6 @@
 import org.springframework.messaging.core.DestinationResolver;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class ChannelSyncEndpointBuilder extends AbstractEndpointBuilder<ChannelSyncEndpoint> {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncEndpointConfiguration.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncEndpointConfiguration.java
index c7bf5e33f0..32c8f3599b 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncEndpointConfiguration.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncEndpointConfiguration.java
@@ -21,7 +21,6 @@
 import org.citrusframework.message.MessageCorrelator;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ChannelSyncEndpointConfiguration extends ChannelEndpointConfiguration implements PollableEndpointConfiguration {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncProducer.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncProducer.java
index eb5d4c95a8..741d234a92 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncProducer.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/ChannelSyncProducer.java
@@ -31,7 +31,6 @@
  * Reply message is correlated and stored in correlation manager. This way test cases are able to receive synchronous
  * message asynchronously at later time.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ChannelSyncProducer extends ChannelProducer implements ReplyConsumer {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/MessageSelectingQueueChannel.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/MessageSelectingQueueChannel.java
index 7b2b938db6..568fd85b34 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/MessageSelectingQueueChannel.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/MessageSelectingQueueChannel.java
@@ -28,7 +28,6 @@
 /**
  * Added selective consumption of messages according to a message selector implementation.
  *
- * @author Christoph Deppisch
  */
 public class MessageSelectingQueueChannel extends QueueChannel {
     /** Logger */
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/endpoint/builder/MessageChannelEndpoints.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/endpoint/builder/MessageChannelEndpoints.java
index 8dfb2cb85d..6d70a9f58a 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/endpoint/builder/MessageChannelEndpoints.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/endpoint/builder/MessageChannelEndpoints.java
@@ -20,9 +20,6 @@
 import org.citrusframework.channel.ChannelSyncEndpointBuilder;
 import org.citrusframework.endpoint.builder.AsyncSyncEndpointBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class MessageChannelEndpoints extends AsyncSyncEndpointBuilder<ChannelEndpointBuilder, ChannelSyncEndpointBuilder> {
 
     /**
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/AbstractMessageSelector.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/AbstractMessageSelector.java
index 0a610c1e1c..152c804ed0 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/AbstractMessageSelector.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/AbstractMessageSelector.java
@@ -23,7 +23,6 @@
 import org.springframework.messaging.Message;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public abstract class AbstractMessageSelector implements MessageSelector {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/DispatchingMessageSelector.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/DispatchingMessageSelector.java
index 54a4ed5f96..4049cd129a 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/DispatchingMessageSelector.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/DispatchingMessageSelector.java
@@ -34,7 +34,6 @@
  * By default uses {@link HeaderMatchingMessageSelector} and supports {@link RootQNameMessageSelector} and
  * {@link XpathPayloadMessageSelector}.
  *
- * @author Christoph Deppisch
  * @since 1.2
  */
 public class DispatchingMessageSelector implements MessageSelector {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/HeaderMatchingMessageSelector.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/HeaderMatchingMessageSelector.java
index af8b5781e8..fb69078124 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/HeaderMatchingMessageSelector.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/HeaderMatchingMessageSelector.java
@@ -26,7 +26,6 @@
  * matching header elements are present in message header and its value matches the expected value
  * the message is accepted.
  *
- * @author Christoph Deppisch
  */
 public class HeaderMatchingMessageSelector extends AbstractMessageSelector {
 
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/JsonPathPayloadMessageSelector.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/JsonPathPayloadMessageSelector.java
index 7bd2ccb055..b4e0709994 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/JsonPathPayloadMessageSelector.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/JsonPathPayloadMessageSelector.java
@@ -29,7 +29,6 @@
  *
  * Syntax is jsonPath:$.root.element
  *
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public class JsonPathPayloadMessageSelector extends AbstractMessageSelector {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/MessageSelectorFactory.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/MessageSelectorFactory.java
index a4864b488e..b17212b682 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/MessageSelectorFactory.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/MessageSelectorFactory.java
@@ -20,7 +20,6 @@
 import org.springframework.integration.core.MessageSelector;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public interface MessageSelectorFactory<T extends MessageSelector> {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/PayloadMatchingMessageSelector.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/PayloadMatchingMessageSelector.java
index dff1917bc8..0a2f76c71a 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/PayloadMatchingMessageSelector.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/PayloadMatchingMessageSelector.java
@@ -24,7 +24,6 @@
  * matching header elements are present in message header and its value matches the expected value
  * the message is accepted.
  * 
- * @author Christoph Deppisch
  */
 public class PayloadMatchingMessageSelector extends AbstractMessageSelector {
 
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/RootQNameMessageSelector.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/RootQNameMessageSelector.java
index bd37796365..8fff8b286c 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/RootQNameMessageSelector.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/RootQNameMessageSelector.java
@@ -31,7 +31,6 @@
 /**
  * Message selector accepts XML messages according to specified root element QName.
  *
- * @author Christoph Deppisch
  */
 public class RootQNameMessageSelector extends AbstractMessageSelector {
 
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/XpathPayloadMessageSelector.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/XpathPayloadMessageSelector.java
index 0eac3b5fab..54caf9042e 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/XpathPayloadMessageSelector.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/channel/selector/XpathPayloadMessageSelector.java
@@ -35,7 +35,6 @@
  *
  * Syntax is xpath://root/element
  *
- * @author Christoph Deppisch
  * @since 1.2
  */
 public class XpathPayloadMessageSelector extends AbstractMessageSelector {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelEndpointConfig.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelEndpointConfig.java
index b9ea88f3cb..7f6fcac16b 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelEndpointConfig.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelEndpointConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelEndpointConfigParser.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelEndpointConfigParser.java
index 68e27001a1..433a86e611 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelEndpointConfigParser.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelEndpointConfigParser.java
@@ -27,7 +27,6 @@
 import org.springframework.messaging.core.DestinationResolver;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class ChannelEndpointConfigParser implements AnnotationConfigParser<ChannelEndpointConfig, ChannelEndpoint> {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelSyncEndpointConfig.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelSyncEndpointConfig.java
index 86db77baf0..e73ea30133 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelSyncEndpointConfig.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelSyncEndpointConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelSyncEndpointConfigParser.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelSyncEndpointConfigParser.java
index 775322bfcd..9be2be0d7c 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelSyncEndpointConfigParser.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/annotation/ChannelSyncEndpointConfigParser.java
@@ -28,7 +28,6 @@
 import org.springframework.messaging.core.DestinationResolver;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class ChannelSyncEndpointConfigParser implements AnnotationConfigParser<ChannelSyncEndpointConfig, ChannelSyncEndpoint> {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/handler/CitrusSpringIntegrationConfigNamespaceHandler.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/handler/CitrusSpringIntegrationConfigNamespaceHandler.java
index 4016d5ae67..03045f2427 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/handler/CitrusSpringIntegrationConfigNamespaceHandler.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/handler/CitrusSpringIntegrationConfigNamespaceHandler.java
@@ -25,7 +25,6 @@
 /**
  * Namespace handler for components in Citrus configuration.
  *
- * @author Christoph Deppisch
  */
 public class CitrusSpringIntegrationConfigNamespaceHandler extends NamespaceHandlerSupport {
 
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/handler/CitrusSpringIntegrationTestcaseNamespaceHandler.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/handler/CitrusSpringIntegrationTestcaseNamespaceHandler.java
index 08bd1448f8..3cf853b209 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/handler/CitrusSpringIntegrationTestcaseNamespaceHandler.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/handler/CitrusSpringIntegrationTestcaseNamespaceHandler.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 3.0
  */
 public class CitrusSpringIntegrationTestcaseNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/AbstractChannelEndpointParser.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/AbstractChannelEndpointParser.java
index cc81689b3b..b29b6abbc8 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/AbstractChannelEndpointParser.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/AbstractChannelEndpointParser.java
@@ -21,9 +21,6 @@
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractChannelEndpointParser extends AbstractEndpointParser {
 
     @Override
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/ChannelEndpointAdapterParser.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/ChannelEndpointAdapterParser.java
index 0b9efbc36f..0ead33f370 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/ChannelEndpointAdapterParser.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/ChannelEndpointAdapterParser.java
@@ -35,7 +35,6 @@
 
 /**
  * Parses endpoint adapter bean definition for channel endpoint adapter.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ChannelEndpointAdapterParser extends AbstractBeanDefinitionParser {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/ChannelEndpointParser.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/ChannelEndpointParser.java
index e75c3f4b73..7b547b8079 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/ChannelEndpointParser.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/ChannelEndpointParser.java
@@ -24,7 +24,6 @@
 /**
  * Channel endpoint parser.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ChannelEndpointParser extends AbstractChannelEndpointParser {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/ChannelSyncEndpointParser.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/ChannelSyncEndpointParser.java
index e9a7445a9c..aa9966e6e0 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/ChannelSyncEndpointParser.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/ChannelSyncEndpointParser.java
@@ -27,7 +27,6 @@
 /**
  * Bean definition parser for synchronous channel endpoint components.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ChannelSyncEndpointParser extends AbstractChannelEndpointParser {
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/MessageSelectingQueueChannelParser.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/MessageSelectingQueueChannelParser.java
index 871272dc89..82a5220d7f 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/MessageSelectingQueueChannelParser.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/MessageSelectingQueueChannelParser.java
@@ -29,7 +29,6 @@
  * Bean definition parser for special message channel configuration which
  * supports message selection.
  *
- * @author Christoph Deppisch
  */
 public class MessageSelectingQueueChannelParser implements BeanDefinitionParser {
 
diff --git a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/PurgeMessageChannelActionParser.java b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/PurgeMessageChannelActionParser.java
index 4e50219726..66043748cb 100644
--- a/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/PurgeMessageChannelActionParser.java
+++ b/endpoints/citrus-spring-integration/src/main/java/org/citrusframework/config/xml/PurgeMessageChannelActionParser.java
@@ -40,7 +40,6 @@
 /**
  * Bean definition parser for purge-channel action in test case.
  *
- * @author Christoph Deppisch
  */
 public class PurgeMessageChannelActionParser implements BeanDefinitionParser {
 
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/UnitTestSupport.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/UnitTestSupport.java
index 16297ee33f..c9628214cb 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/UnitTestSupport.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/UnitTestSupport.java
@@ -19,9 +19,6 @@
 import org.citrusframework.context.TestContextFactory;
 import org.citrusframework.testng.AbstractTestNGUnitTest;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport extends AbstractTestNGUnitTest {
 
     @Override
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/actions/PurgeMessageChannelActionTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/actions/PurgeMessageChannelActionTest.java
index 684ea922ad..e5a911c4e6 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/actions/PurgeMessageChannelActionTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/actions/PurgeMessageChannelActionTest.java
@@ -37,9 +37,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class PurgeMessageChannelActionTest extends AbstractTestNGUnitTest {
 
     @Autowired
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/actions/dsl/PurgeMessageChannelTestActionBuilderTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/actions/dsl/PurgeMessageChannelTestActionBuilderTest.java
index cc21bb2adf..f9568cbe81 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/actions/dsl/PurgeMessageChannelTestActionBuilderTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/actions/dsl/PurgeMessageChannelTestActionBuilderTest.java
@@ -42,7 +42,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class PurgeMessageChannelTestActionBuilderTest extends UnitTestSupport {
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointAdapterTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointAdapterTest.java
index f00041e2d4..d6c465f7b1 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointAdapterTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointAdapterTest.java
@@ -26,9 +26,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ChannelEndpointAdapterTest extends AbstractTestNGUnitTest {
 
     private QueueChannel channel = new QueueChannel();
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointComponentTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointComponentTest.java
index 743761d653..818ce749eb 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointComponentTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointComponentTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.when;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class ChannelEndpointComponentTest {
 
     @Mock
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointConsumerTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointConsumerTest.java
index a570bcd604..894a0b8777 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointConsumerTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointConsumerTest.java
@@ -40,9 +40,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ChannelEndpointConsumerTest extends AbstractTestNGUnitTest {
 
     private MessagingTemplate messagingTemplate = Mockito.mock(MessagingTemplate.class);
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointProducerTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointProducerTest.java
index 4257a2d892..af5ebdc017 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointProducerTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointProducerTest.java
@@ -30,9 +30,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class ChannelEndpointProducerTest extends AbstractTestNGUnitTest {
 
     private MessagingTemplate messagingTemplate = Mockito.mock(MessagingTemplate.class);
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointSyncConsumerTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointSyncConsumerTest.java
index 25d1fbe001..ba1c121295 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointSyncConsumerTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointSyncConsumerTest.java
@@ -47,9 +47,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ChannelEndpointSyncConsumerTest extends AbstractTestNGUnitTest {
 
     private final MessagingTemplate messagingTemplate = Mockito.mock(MessagingTemplate.class);
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointSyncProducerTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointSyncProducerTest.java
index e4b18ca323..586a4d47f9 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointSyncProducerTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/ChannelEndpointSyncProducerTest.java
@@ -40,9 +40,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ChannelEndpointSyncProducerTest extends AbstractTestNGUnitTest {
 
     private MessagingTemplate messagingTemplate = Mockito.mock(MessagingTemplate.class);
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/MessageSelectingQueueChannelTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/MessageSelectingQueueChannelTest.java
index ada133bb3b..cb0516408a 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/MessageSelectingQueueChannelTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/MessageSelectingQueueChannelTest.java
@@ -26,9 +26,6 @@
 
 import java.util.concurrent.atomic.AtomicLong;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageSelectingQueueChannelTest extends AbstractTestNGUnitTest {
 
     @Test
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/MultiThreadingMessageSelectionTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/MultiThreadingMessageSelectionTest.java
index 8dea73d19e..93b6737d79 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/MultiThreadingMessageSelectionTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/MultiThreadingMessageSelectionTest.java
@@ -34,7 +34,6 @@
 import static org.mockito.Mockito.doThrow;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class MultiThreadingMessageSelectionTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/endpoint/builder/MessageChannelEndpointsTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/endpoint/builder/MessageChannelEndpointsTest.java
index dbc503c570..1039a1fe08 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/endpoint/builder/MessageChannelEndpointsTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/endpoint/builder/MessageChannelEndpointsTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageChannelEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/DispatchingMessageSelectorTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/DispatchingMessageSelectorTest.java
index 23a5e9da52..835ec32eb0 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/DispatchingMessageSelectorTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/DispatchingMessageSelectorTest.java
@@ -37,9 +37,6 @@
 import static org.mockito.Mockito.when;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class DispatchingMessageSelectorTest extends UnitTestSupport {
 
     private BeanFactory beanFactory = Mockito.mock(BeanFactory.class);
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/HeaderMatchingMessageSelectorTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/HeaderMatchingMessageSelectorTest.java
index 87375a2c2c..b163e4e31a 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/HeaderMatchingMessageSelectorTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/HeaderMatchingMessageSelectorTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class HeaderMatchingMessageSelectorTest extends UnitTestSupport {
 
     @Test
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/JsonPathPayloadMessageSelectorTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/JsonPathPayloadMessageSelectorTest.java
index 54e5537e26..d7cf852eee 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/JsonPathPayloadMessageSelectorTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/JsonPathPayloadMessageSelectorTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class JsonPathPayloadMessageSelectorTest extends UnitTestSupport {
 
     @Test
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/PayloadMessageSelectorTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/PayloadMessageSelectorTest.java
index e35891a4b6..1e6b216926 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/PayloadMessageSelectorTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/PayloadMessageSelectorTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class PayloadMessageSelectorTest extends UnitTestSupport {
 
     @Test
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/RootQNameMessageSelectorTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/RootQNameMessageSelectorTest.java
index 2c240ffa95..45e0d8f4c6 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/RootQNameMessageSelectorTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/RootQNameMessageSelectorTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RootQNameMessageSelectorTest extends UnitTestSupport {
 
     @Test
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/XpathPayloadMessageSelectorTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/XpathPayloadMessageSelectorTest.java
index 1b49e5eea7..4be6c5f054 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/XpathPayloadMessageSelectorTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/channel/selector/XpathPayloadMessageSelectorTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class XpathPayloadMessageSelectorTest extends UnitTestSupport {
 
     @Test
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/annotation/ChannelEndpointConfigParserTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/annotation/ChannelEndpointConfigParserTest.java
index 8cb97b0549..2c559e48a2 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/annotation/ChannelEndpointConfigParserTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/annotation/ChannelEndpointConfigParserTest.java
@@ -40,9 +40,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ChannelEndpointConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/annotation/ChannelSyncEndpointConfigParserTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/annotation/ChannelSyncEndpointConfigParserTest.java
index 1e8ae8d598..5dcc16025d 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/annotation/ChannelSyncEndpointConfigParserTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/annotation/ChannelSyncEndpointConfigParserTest.java
@@ -42,9 +42,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ChannelSyncEndpointConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelEndpointAdapterParserTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelEndpointAdapterParserTest.java
index e98757bf43..0f5f611c70 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelEndpointAdapterParserTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelEndpointAdapterParserTest.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class ChannelEndpointAdapterParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelEndpointParserTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelEndpointParserTest.java
index 82cd86d883..8c0a680f55 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelEndpointParserTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelEndpointParserTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ChannelEndpointParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelSyncEndpointParserTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelSyncEndpointParserTest.java
index aab2b8313b..22d43d2dc0 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelSyncEndpointParserTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/ChannelSyncEndpointParserTest.java
@@ -27,9 +27,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ChannelSyncEndpointParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/MessageSelectingQueueChannelParserTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/MessageSelectingQueueChannelParserTest.java
index 61cc7518c8..ad06fd0acb 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/MessageSelectingQueueChannelParserTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/MessageSelectingQueueChannelParserTest.java
@@ -23,9 +23,6 @@
 
 import java.util.Map;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageSelectingQueueChannelParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/PurgeMessageChannelActionParserTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/PurgeMessageChannelActionParserTest.java
index 5e7f0bb6a8..9a9d0c33bf 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/PurgeMessageChannelActionParserTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/config/xml/PurgeMessageChannelActionParserTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class PurgeMessageChannelActionParserTest extends AbstractActionParserTest<PurgeMessageChannelAction> {
 
     @Test
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/endpoint/ChannelEndpointFactoryTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/endpoint/ChannelEndpointFactoryTest.java
index b60b8cc49f..0e48b30f8a 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/endpoint/ChannelEndpointFactoryTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/endpoint/ChannelEndpointFactoryTest.java
@@ -28,9 +28,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ChannelEndpointFactoryTest {
 
     private ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/MessageChannelIT.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/MessageChannelIT.java
index 4ad7249d5c..75d8bcd42c 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/MessageChannelIT.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/MessageChannelIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageChannelIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointFactoryIT.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointFactoryIT.java
index 995472df7e..1e0a330363 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointFactoryIT.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointFactoryIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 @Test
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointIT.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointIT.java
index a65c54519f..649bdcd07a 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointIT.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelEndpointIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class ChannelEndpointIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelSyncEndpointIT.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelSyncEndpointIT.java
index e7bea4757b..558d3a0dd2 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelSyncEndpointIT.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/channel/ChannelSyncEndpointIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class ChannelSyncEndpointIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java
index a2f5768fcd..21ad578743 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/common/SpringXmlTestLoaderIT.java
@@ -32,9 +32,6 @@
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
-/**
- * @author Thorsten Schlathoelter
- */
 @SpringXmlTestLoaderConfiguration(
         parserConfigurations = {
                 @BeanDefinitionParserConfiguration(name = "testcase", parser = SpringXmlTestLoaderIT.CustomTestCaseParser.class),
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/AbstractMarshallingHelloService.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/AbstractMarshallingHelloService.java
index c5b0ba3d93..940d53513e 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/AbstractMarshallingHelloService.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/AbstractMarshallingHelloService.java
@@ -30,9 +30,6 @@
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.messaging.Message;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class AbstractMarshallingHelloService implements HelloService {
 
     @Autowired
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/HelloService.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/HelloService.java
index 523e414a0a..faee585922 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/HelloService.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/HelloService.java
@@ -20,9 +20,6 @@
 import org.citrusframework.integration.service.model.HelloResponse;
 import org.springframework.messaging.Message;
 
-/**
- * @author Christoph Deppisch
- */
 public interface HelloService {
     /**
      * Handles hello request responding with proper hello response.
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/HelloServiceImpl.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/HelloServiceImpl.java
index dd05c2d9cc..b41ce0a4ed 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/HelloServiceImpl.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/HelloServiceImpl.java
@@ -21,9 +21,6 @@
 import org.springframework.messaging.Message;
 import org.springframework.integration.support.MessageBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class HelloServiceImpl extends AbstractMarshallingHelloService {
 
     public Message<HelloResponse> sayHello(Message<HelloRequest> request) {
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/LoggingInterceptor.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/LoggingInterceptor.java
index bb2fcd71c4..4dfd04b093 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/LoggingInterceptor.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/integration/service/LoggingInterceptor.java
@@ -22,9 +22,6 @@
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.support.ChannelInterceptor;
 
-/**
- * @author Christoph Deppisch
- */
 public class LoggingInterceptor implements ChannelInterceptor {
     private static final Logger logger = LoggerFactory.getLogger(LoggingInterceptor.class);
 
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/springintegration/groovy/AbstractGroovyActionDslTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/springintegration/groovy/AbstractGroovyActionDslTest.java
index ea17394410..fb9598d057 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/springintegration/groovy/AbstractGroovyActionDslTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/springintegration/groovy/AbstractGroovyActionDslTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractGroovyActionDslTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/springintegration/xml/AbstractXmlActionTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/springintegration/xml/AbstractXmlActionTest.java
index cfa5eff0fe..d69af4eda8 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/springintegration/xml/AbstractXmlActionTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/springintegration/xml/AbstractXmlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractXmlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/springintegration/yaml/AbstractYamlActionTest.java b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/springintegration/yaml/AbstractYamlActionTest.java
index 5383e9e946..f5874fb17f 100644
--- a/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/springintegration/yaml/AbstractYamlActionTest.java
+++ b/endpoints/citrus-spring-integration/src/test/java/org/citrusframework/springintegration/yaml/AbstractYamlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractYamlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/SshCommand.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/SshCommand.java
index 54800f7735..1a8d7480fd 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/SshCommand.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/SshCommand.java
@@ -37,7 +37,6 @@
 /**
  * A command for delegation to a endpoint adapter
  *
- * @author Roland Huss
  * @since 1.3
  */
 public class SshCommand implements Command, Runnable {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshClient.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshClient.java
index d39faf9092..502248d109 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshClient.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshClient.java
@@ -47,7 +47,6 @@
 /**
  * Ssh client connects to ssh server and sends commands to that server.
  *
- * @author Roland Huss, Christoph Deppisch
  * @since 1.4
  */
 public class SshClient extends AbstractEndpoint implements Producer, ReplyConsumer {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshClientBuilder.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshClientBuilder.java
index 4f234dba29..c753052c5d 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshClientBuilder.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshClientBuilder.java
@@ -21,7 +21,6 @@
 import org.citrusframework.ssh.message.SshMessageConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class SshClientBuilder extends AbstractEndpointBuilder<SshClient> {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshEndpointComponent.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshEndpointComponent.java
index e7b686cac7..b2f10e3837 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshEndpointComponent.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshEndpointComponent.java
@@ -28,7 +28,6 @@
 /**
  * Component creates proper ssh client from endpoint uri resource and parameters.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class SshEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshEndpointConfiguration.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshEndpointConfiguration.java
index 27ec647b91..d18a640662 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshEndpointConfiguration.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/client/SshEndpointConfiguration.java
@@ -23,7 +23,6 @@
 import org.citrusframework.ssh.model.SshMarshaller;
 
 /**
- * @author Roland Huss, Christoph Deppisch
  * @since 1.4
  */
 public class SshEndpointConfiguration extends AbstractPollableEndpointConfiguration {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshClientConfig.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshClientConfig.java
index 1ff34737d6..0cb1ad2918 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshClientConfig.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshClientConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshClientConfigParser.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshClientConfigParser.java
index 157d6eb18d..1634d19ede 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshClientConfigParser.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshClientConfigParser.java
@@ -26,7 +26,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class SshClientConfigParser implements AnnotationConfigParser<SshClientConfig, SshClient> {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshServerConfig.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshServerConfig.java
index 121c6141e1..4e96e2b233 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshServerConfig.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshServerConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshServerConfigParser.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshServerConfigParser.java
index 5b408f0b3c..f186708f1b 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshServerConfigParser.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/annotation/SshServerConfigParser.java
@@ -26,7 +26,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class SshServerConfigParser implements AnnotationConfigParser<SshServerConfig, SshServer> {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/handler/CitrusSshConfigNamespaceHandler.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/handler/CitrusSshConfigNamespaceHandler.java
index 42a2b8a38c..4b442b021f 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/handler/CitrusSshConfigNamespaceHandler.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/handler/CitrusSshConfigNamespaceHandler.java
@@ -23,7 +23,6 @@
 /**
  * Namespace handler implementation for components in Citrus SSH namespace.
  * 
- * @author Roland Huss
  */
 public class CitrusSshConfigNamespaceHandler extends NamespaceHandlerSupport {
 
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/xml/SshClientParser.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/xml/SshClientParser.java
index a6eb295da3..3f35069ae6 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/xml/SshClientParser.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/xml/SshClientParser.java
@@ -29,7 +29,6 @@
 /**
  * Parse for SSH-client configuration
  *
- * @author Roland Huss, Christoph Deppisch
  * @since 1.3
  */
 public class SshClientParser extends AbstractEndpointParser {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/xml/SshServerParser.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/xml/SshServerParser.java
index 5105cbb7b5..0e1a31525a 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/xml/SshServerParser.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/config/xml/SshServerParser.java
@@ -27,7 +27,6 @@
 /**
  * Parser for the configuration of an SSH server
  *
- * @author Roland Huss, Christoph Deppisch
  */
 public class SshServerParser extends AbstractServerParser {
 
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/endpoint/builder/SshEndpoints.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/endpoint/builder/SshEndpoints.java
index 8ad3948298..24f2693d38 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/endpoint/builder/SshEndpoints.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/endpoint/builder/SshEndpoints.java
@@ -20,9 +20,6 @@
 import org.citrusframework.ssh.client.SshClientBuilder;
 import org.citrusframework.ssh.server.SshServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class SshEndpoints extends ClientServerEndpointBuilder<SshClientBuilder, SshServerBuilder> {
     /**
      * Private constructor setting the client and server builder implementation.
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/message/SshMessageConverter.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/message/SshMessageConverter.java
index 51803c82d3..3819c915bd 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/message/SshMessageConverter.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/message/SshMessageConverter.java
@@ -28,7 +28,6 @@
 import org.citrusframework.xml.StringResult;
 
 /**
- * @author Christoph Deppisch
  * @since 2.1
  */
 public class SshMessageConverter implements MessageConverter<SshMessage, SshMessage, SshEndpointConfiguration> {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshMarshaller.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshMarshaller.java
index 3b461cee0b..5120da4953 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshMarshaller.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshMarshaller.java
@@ -27,7 +27,6 @@
 import org.citrusframework.xml.Unmarshaller;
 
 /**
- * @author Christoph Deppisch
  * @since 2.1
  */
 public class SshMarshaller implements Marshaller, Unmarshaller {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshMessage.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshMessage.java
index 9dac41fa22..56ec8e93ed 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshMessage.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshMessage.java
@@ -17,7 +17,6 @@
 package org.citrusframework.ssh.model;
 
 /**
- * @author Christoph Deppisch
  * @since 2.1
  */
 public interface SshMessage {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshRequest.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshRequest.java
index afcd76ccdf..90a88d4b4b 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshRequest.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshRequest.java
@@ -21,7 +21,6 @@
 /**
  * POJO encapsulating an SSH request. It is immutable.
  *
- * @author Roland Huss
  * @since 1.3
  */
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshResponse.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshResponse.java
index f45af03f4a..8b8cafa44e 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshResponse.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/model/SshResponse.java
@@ -21,7 +21,6 @@
 /**
  * POJO encapsulate a SSH response. It is immutable.
  *
- * @author Roland Huss
  * @since 1.3
  */
 @XmlAccessorType(XmlAccessType.FIELD)
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SimplePasswordAuthenticator.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SimplePasswordAuthenticator.java
index 2389cceed1..ff10d41849 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SimplePasswordAuthenticator.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SimplePasswordAuthenticator.java
@@ -22,7 +22,6 @@
 /**
  * Simple user/password authenticator for comparing textually.
  *
- * @author Roland Huss
  * @since 05.09.12
  */
 class SimplePasswordAuthenticator implements PasswordAuthenticator {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SinglePublicKeyAuthenticator.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SinglePublicKeyAuthenticator.java
index b082f9ab77..c7626f3ba8 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SinglePublicKeyAuthenticator.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SinglePublicKeyAuthenticator.java
@@ -36,7 +36,6 @@
  * Public key authenticator which verifies a single provided public key. The public key
  * itself must be in PEM format.
  *
- * @author Roland Huss
  * @since 05.09.12
  */
 class SinglePublicKeyAuthenticator implements PublickeyAuthenticator {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SshServer.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SshServer.java
index d6c9cf9f3f..7ff4945e35 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SshServer.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SshServer.java
@@ -71,7 +71,6 @@
  *   <stderr>warning: no tty</stderr>
  * </ssh-response>
  *
- * @author Roland Huss
  * @since 04.09.12
  */
 public class SshServer extends AbstractServer {
diff --git a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SshServerBuilder.java b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SshServerBuilder.java
index 33fc844d03..79ac58303d 100644
--- a/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SshServerBuilder.java
+++ b/endpoints/citrus-ssh/src/main/java/org/citrusframework/ssh/server/SshServerBuilder.java
@@ -22,7 +22,6 @@
 import org.citrusframework.ssh.model.SshMarshaller;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class SshServerBuilder extends AbstractServerBuilder<SshServer, SshServerBuilder> {
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/SshCommandTest.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/SshCommandTest.java
index 07448384e7..182e45e5f2 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/SshCommandTest.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/SshCommandTest.java
@@ -44,7 +44,6 @@
 import static org.testng.AssertJUnit.assertEquals;
 
 /**
- * @author Roland Huss
  * @since 05.09.12
  */
 public class SshCommandTest {
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/client/SshClientTest.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/client/SshClientTest.java
index c8f32c60f8..61127217f5 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/client/SshClientTest.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/client/SshClientTest.java
@@ -50,7 +50,6 @@
 import static org.testng.Assert.assertNull;
 
 /**
- * @author Roland Huss
  * @since 12.09.12
  */
 public class SshClientTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/client/SshEndpointComponentTest.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/client/SshEndpointComponentTest.java
index 5c4327f621..f2353db151 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/client/SshEndpointComponentTest.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/client/SshEndpointComponentTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SshEndpointComponentTest {
 
     private TestContext context = new TestContext();
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/annotation/SshClientConfigParserTest.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/annotation/SshClientConfigParserTest.java
index 5a6bc5fb3d..e7278681ce 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/annotation/SshClientConfigParserTest.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/annotation/SshClientConfigParserTest.java
@@ -37,9 +37,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SshClientConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "sshClient1")
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/annotation/SshServerConfigParserTest.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/annotation/SshServerConfigParserTest.java
index e85760e9f5..5e9846ec3f 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/annotation/SshServerConfigParserTest.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/annotation/SshServerConfigParserTest.java
@@ -35,9 +35,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SshServerConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "sshServer1")
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/xml/SshClientParserTest.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/xml/SshClientParserTest.java
index 27ca9ad3c5..9062d2c605 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/xml/SshClientParserTest.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/xml/SshClientParserTest.java
@@ -23,9 +23,6 @@
 
 import java.util.Map;
 
-/**
- * @author Christoph Deppisch
- */
 public class SshClientParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/xml/SshServerParserTest.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/xml/SshServerParserTest.java
index 6127180600..4299b72ba7 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/xml/SshServerParserTest.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/config/xml/SshServerParserTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Roland Huss, Christoph Deppisch
- */
 public class SshServerParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/endpoint/builder/SshEndpointsTest.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/endpoint/builder/SshEndpointsTest.java
index 19d80068b1..ff6884d9d6 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/endpoint/builder/SshEndpointsTest.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/endpoint/builder/SshEndpointsTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SshEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerErrorIT.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerErrorIT.java
index fc22d42999..bf73a20d7b 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerErrorIT.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerErrorIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class SshServerErrorIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerIT.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerIT.java
index d156dc7f95..ed27965bbc 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerIT.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/integration/SshServerIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class SshServerIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/server/SimplePasswordAuthenticatorTest.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/server/SimplePasswordAuthenticatorTest.java
index fc2beb8a07..2144973bc8 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/server/SimplePasswordAuthenticatorTest.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/server/SimplePasswordAuthenticatorTest.java
@@ -22,7 +22,6 @@
 import static org.testng.Assert.assertTrue;
 
 /**
- * @author Roland Huss
  * @since 05.09.12
  */
 public class SimplePasswordAuthenticatorTest {
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/server/SinglePublicKeyAuthenticatorTest.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/server/SinglePublicKeyAuthenticatorTest.java
index 2d93a60f84..939ccd12f1 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/server/SinglePublicKeyAuthenticatorTest.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/server/SinglePublicKeyAuthenticatorTest.java
@@ -39,7 +39,6 @@
 import static org.testng.Assert.assertTrue;
 
 /**
- * @author Roland Huss
  * @since 05.09.12
  */
 public class SinglePublicKeyAuthenticatorTest {
diff --git a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/server/SshServerTest.java b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/server/SshServerTest.java
index 4284daf3e7..d60ac51362 100644
--- a/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/server/SshServerTest.java
+++ b/endpoints/citrus-ssh/src/test/java/org/citrusframework/ssh/server/SshServerTest.java
@@ -40,9 +40,6 @@
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Roland Huss
- */
 public class SshServerTest {
 
     private SshServer server;
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxEndpointConfig.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxEndpointConfig.java
index e0b9315c7a..b35343a9f9 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxEndpointConfig.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxEndpointConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxEndpointConfigParser.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxEndpointConfigParser.java
index eed73e5209..47d14e232b 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxEndpointConfigParser.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxEndpointConfigParser.java
@@ -26,7 +26,6 @@
 import org.citrusframework.vertx.message.VertxMessageConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class VertxEndpointConfigParser implements AnnotationConfigParser<VertxEndpointConfig, VertxEndpoint> {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxSyncEndpointConfig.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxSyncEndpointConfig.java
index e81e24fbdc..769058b8f3 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxSyncEndpointConfig.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxSyncEndpointConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxSyncEndpointConfigParser.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxSyncEndpointConfigParser.java
index 06306aefb6..b50b568307 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxSyncEndpointConfigParser.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/annotation/VertxSyncEndpointConfigParser.java
@@ -27,7 +27,6 @@
 import org.citrusframework.vertx.message.VertxMessageConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class VertxSyncEndpointConfigParser implements AnnotationConfigParser<VertxSyncEndpointConfig, VertxSyncEndpoint> {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/handler/CitrusVertxConfigNamespaceHandler.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/handler/CitrusVertxConfigNamespaceHandler.java
index f82efe969b..405870d3b4 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/handler/CitrusVertxConfigNamespaceHandler.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/handler/CitrusVertxConfigNamespaceHandler.java
@@ -21,7 +21,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CitrusVertxConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/xml/VertxEndpointParser.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/xml/VertxEndpointParser.java
index bc6eee707c..0713fcab9e 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/xml/VertxEndpointParser.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/xml/VertxEndpointParser.java
@@ -27,7 +27,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxEndpointParser extends AbstractEndpointParser {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/xml/VertxSyncEndpointParser.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/xml/VertxSyncEndpointParser.java
index 6baeb0d174..eb4905fbc6 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/xml/VertxSyncEndpointParser.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/config/xml/VertxSyncEndpointParser.java
@@ -26,7 +26,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxSyncEndpointParser extends VertxEndpointParser {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxConsumer.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxConsumer.java
index b8f99fe935..4d96605d34 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxConsumer.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxConsumer.java
@@ -27,7 +27,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxConsumer extends AbstractMessageConsumer {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpoint.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpoint.java
index 90747db6db..581a4e1df8 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpoint.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpoint.java
@@ -22,7 +22,6 @@
 import org.citrusframework.vertx.factory.VertxInstanceFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxEndpoint extends AbstractEndpoint {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpointBuilder.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpointBuilder.java
index 5f67a460ee..1d2fd9ccfc 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpointBuilder.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpointBuilder.java
@@ -21,7 +21,6 @@
 import org.citrusframework.vertx.message.VertxMessageConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class VertxEndpointBuilder extends AbstractEndpointBuilder<VertxEndpoint> {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpointComponent.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpointComponent.java
index 996e9e8896..39f0c99dc7 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpointComponent.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpointComponent.java
@@ -26,7 +26,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpointConfiguration.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpointConfiguration.java
index e82e332b54..5fd0071522 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpointConfiguration.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxEndpointConfiguration.java
@@ -20,7 +20,6 @@
 import org.citrusframework.vertx.message.VertxMessageConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxEndpointConfiguration extends AbstractPollableEndpointConfiguration {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxProducer.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxProducer.java
index e024d5282d..f965a3af0d 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxProducer.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxProducer.java
@@ -25,7 +25,6 @@
 import io.vertx.core.Vertx;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxProducer implements Producer {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncConsumer.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncConsumer.java
index 637ea0c96b..a94b3a37f9 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncConsumer.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncConsumer.java
@@ -28,7 +28,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxSyncConsumer extends VertxConsumer implements ReplyProducer {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncEndpoint.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncEndpoint.java
index b35d7f5d04..10d29944b6 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncEndpoint.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncEndpoint.java
@@ -20,7 +20,6 @@
 import org.citrusframework.messaging.Producer;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxSyncEndpoint extends VertxEndpoint {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncEndpointBuilder.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncEndpointBuilder.java
index d9d5d8e150..5a67a2c7d3 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncEndpointBuilder.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncEndpointBuilder.java
@@ -22,7 +22,6 @@
 import org.citrusframework.vertx.message.VertxMessageConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class VertxSyncEndpointBuilder extends AbstractEndpointBuilder<VertxSyncEndpoint> {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncEndpointConfiguration.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncEndpointConfiguration.java
index 3addea9baa..7117b1368c 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncEndpointConfiguration.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncEndpointConfiguration.java
@@ -20,7 +20,6 @@
 import org.citrusframework.message.MessageCorrelator;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxSyncEndpointConfiguration extends VertxEndpointConfiguration {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncProducer.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncProducer.java
index d34d10bb7e..aee0083463 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncProducer.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/VertxSyncProducer.java
@@ -28,7 +28,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxSyncProducer extends VertxProducer implements ReplyConsumer {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/builder/VertxEndpoints.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/builder/VertxEndpoints.java
index 02f0ef782b..1265fb9d38 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/builder/VertxEndpoints.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/endpoint/builder/VertxEndpoints.java
@@ -20,9 +20,6 @@
 import org.citrusframework.vertx.endpoint.VertxEndpointBuilder;
 import org.citrusframework.vertx.endpoint.VertxSyncEndpointBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class VertxEndpoints extends AsyncSyncEndpointBuilder<VertxEndpointBuilder, VertxSyncEndpointBuilder> {
     /**
      * Private constructor setting the sync and async builder implementation.
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/AbstractVertxInstanceFactory.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/AbstractVertxInstanceFactory.java
index 668823652b..37182577e3 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/AbstractVertxInstanceFactory.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/AbstractVertxInstanceFactory.java
@@ -35,7 +35,6 @@
  * Abstract Vertx instance factory provides basic method for creating a new Vertx instance. By default, waits for
  * instance to start up properly.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public abstract class AbstractVertxInstanceFactory implements VertxInstanceFactory {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/CachingVertxInstanceFactory.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/CachingVertxInstanceFactory.java
index 747665382b..f2cfc57c9a 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/CachingVertxInstanceFactory.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/CachingVertxInstanceFactory.java
@@ -26,7 +26,6 @@
  * Vert.x instance factory that caches created instances in memory. Ensures that same cluster host and port is
  * instance is created only once.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CachingVertxInstanceFactory extends AbstractVertxInstanceFactory {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/SingleVertxInstanceFactory.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/SingleVertxInstanceFactory.java
index 84f737f485..fa126131ba 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/SingleVertxInstanceFactory.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/SingleVertxInstanceFactory.java
@@ -24,7 +24,6 @@
 /**
  * Vertx instance factory creates a new instance only once and holds reuses this single instance all the time.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class SingleVertxInstanceFactory extends AbstractVertxInstanceFactory {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/VertxInstanceFactory.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/VertxInstanceFactory.java
index d56699e0dc..2364aa7c07 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/VertxInstanceFactory.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/factory/VertxInstanceFactory.java
@@ -20,7 +20,6 @@
 import io.vertx.core.Vertx;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public interface VertxInstanceFactory {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/message/CitrusVertxMessageHeaders.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/message/CitrusVertxMessageHeaders.java
index 1cfca042e3..2f8384ced3 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/message/CitrusVertxMessageHeaders.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/message/CitrusVertxMessageHeaders.java
@@ -19,7 +19,6 @@
 import org.citrusframework.message.MessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public abstract class CitrusVertxMessageHeaders {
diff --git a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/message/VertxMessageConverter.java b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/message/VertxMessageConverter.java
index 6d6060e8df..5683bb3b1a 100644
--- a/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/message/VertxMessageConverter.java
+++ b/endpoints/citrus-vertx/src/main/java/org/citrusframework/vertx/message/VertxMessageConverter.java
@@ -24,7 +24,6 @@
  * Message converter implementation converts inbound Vert.x messages to internal message representation. Outbound message conversion is not supported
  * as the Vert.x message transport encapsulates message conversion by default.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxMessageConverter implements MessageConverter<io.vertx.core.eventbus.Message, io.vertx.core.eventbus.Message, VertxEndpointConfiguration> {
diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/annotation/VertxEndpointConfigParserTest.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/annotation/VertxEndpointConfigParserTest.java
index b65685afcc..d10941a7f2 100644
--- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/annotation/VertxEndpointConfigParserTest.java
+++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/annotation/VertxEndpointConfigParserTest.java
@@ -38,9 +38,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class VertxEndpointConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint
diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/annotation/VertxSyncEndpointConfigParserTest.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/annotation/VertxSyncEndpointConfigParserTest.java
index be45c54bad..e738312157 100644
--- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/annotation/VertxSyncEndpointConfigParserTest.java
+++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/annotation/VertxSyncEndpointConfigParserTest.java
@@ -36,9 +36,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class VertxSyncEndpointConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint
diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/xml/VertxEndpointParserTest.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/xml/VertxEndpointParserTest.java
index 0eed7d6783..8033a4a411 100644
--- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/xml/VertxEndpointParserTest.java
+++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/xml/VertxEndpointParserTest.java
@@ -24,9 +24,6 @@
 
 import java.util.Map;
 
-/**
- * @author Christoph Deppisch
- */
 public class VertxEndpointParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/xml/VertxSyncEndpointParserTest.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/xml/VertxSyncEndpointParserTest.java
index 77085c309c..22f242171e 100644
--- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/xml/VertxSyncEndpointParserTest.java
+++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/config/xml/VertxSyncEndpointParserTest.java
@@ -26,7 +26,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxSyncEndpointParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxEndpointComponentTest.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxEndpointComponentTest.java
index 6ee459617c..a13d3d1960 100644
--- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxEndpointComponentTest.java
+++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxEndpointComponentTest.java
@@ -35,7 +35,6 @@
 
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxEndpointComponentTest {
diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxEndpointTest.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxEndpointTest.java
index 46ac7dc3d3..c6a13a2467 100644
--- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxEndpointTest.java
+++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxEndpointTest.java
@@ -35,7 +35,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxEndpointTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxSyncEndpointTest.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxSyncEndpointTest.java
index ad05da60ae..e2cb4d4252 100644
--- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxSyncEndpointTest.java
+++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/VertxSyncEndpointTest.java
@@ -35,7 +35,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class VertxSyncEndpointTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/builder/VertxEndpointsTest.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/builder/VertxEndpointsTest.java
index d61ab19f72..ae184ef7ab 100644
--- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/builder/VertxEndpointsTest.java
+++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/endpoint/builder/VertxEndpointsTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class VertxEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxEndpointIT.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxEndpointIT.java
index 1315d35b85..be845192f1 100644
--- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxEndpointIT.java
+++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxEndpointIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 @Test
diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxSyncEndpointIT.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxSyncEndpointIT.java
index 9e07649608..3913e113dc 100644
--- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxSyncEndpointIT.java
+++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/integration/VertxSyncEndpointIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 @Test
diff --git a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/message/VertxMessageConverterTest.java b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/message/VertxMessageConverterTest.java
index db6b7179e0..01be4f982f 100644
--- a/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/message/VertxMessageConverterTest.java
+++ b/endpoints/citrus-vertx/src/test/java/org/citrusframework/vertx/message/VertxMessageConverterTest.java
@@ -28,7 +28,6 @@
 
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class VertxMessageConverterTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/client/WebSocketClient.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/client/WebSocketClient.java
index bbdd01fa89..50fcf6b19e 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/client/WebSocketClient.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/client/WebSocketClient.java
@@ -19,7 +19,6 @@
 import org.citrusframework.websocket.endpoint.WebSocketEndpoint;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class WebSocketClient extends WebSocketEndpoint {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/client/WebSocketClientBuilder.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/client/WebSocketClientBuilder.java
index 532310852d..772ef347ac 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/client/WebSocketClientBuilder.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/client/WebSocketClientBuilder.java
@@ -21,7 +21,6 @@
 import org.citrusframework.websocket.message.WebSocketMessageConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class WebSocketClientBuilder extends AbstractEndpointBuilder<WebSocketClient> {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/client/WebSocketClientEndpointConfiguration.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/client/WebSocketClientEndpointConfiguration.java
index 4fc95d4601..c1aeebe2a9 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/client/WebSocketClientEndpointConfiguration.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/client/WebSocketClientEndpointConfiguration.java
@@ -37,7 +37,6 @@
 
 /**
  * Web socket endpoint configuration for client side web socket communication.
- * @author Martin Maher
  * @since 2.3
  */
 public class WebSocketClientEndpointConfiguration extends AbstractWebSocketEndpointConfiguration {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketClientConfig.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketClientConfig.java
index e2b2de3893..9e9e9d4a79 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketClientConfig.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketClientConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketClientConfigParser.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketClientConfigParser.java
index 387a87c551..1635bf497f 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketClientConfigParser.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketClientConfigParser.java
@@ -26,7 +26,6 @@
 import org.citrusframework.websocket.message.WebSocketMessageConverter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class WebSocketClientConfigParser implements AnnotationConfigParser<WebSocketClientConfig, WebSocketClient> {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketConfig.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketConfig.java
index 4700cea45a..7938a6e420 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketConfig.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketConfig.java
@@ -17,7 +17,6 @@
 package org.citrusframework.websocket.config.annotation;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public @interface WebSocketConfig {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketServerConfig.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketServerConfig.java
index e0fdffe74f..e8ca34659a 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketServerConfig.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketServerConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketServerConfigParser.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketServerConfigParser.java
index 8d3e743794..590f97c130 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketServerConfigParser.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/annotation/WebSocketServerConfigParser.java
@@ -37,7 +37,6 @@
 import static org.citrusframework.util.StringUtils.hasText;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class WebSocketServerConfigParser implements AnnotationConfigParser<WebSocketServerConfig, WebSocketServer> {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/handler/CitrusWebSocketConfigNamespaceHandler.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/handler/CitrusWebSocketConfigNamespaceHandler.java
index 93567584da..b2b3f759f0 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/handler/CitrusWebSocketConfigNamespaceHandler.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/handler/CitrusWebSocketConfigNamespaceHandler.java
@@ -22,7 +22,6 @@
 /**
  * Namespace handler implementation for components in Citrus http namespace.
  *
- * @author Christoph Deppisch
  */
 public class CitrusWebSocketConfigNamespaceHandler extends NamespaceHandlerSupport {
 
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/xml/WebSocketClientParser.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/xml/WebSocketClientParser.java
index 9395b5f162..9593f1568f 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/xml/WebSocketClientParser.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/xml/WebSocketClientParser.java
@@ -29,7 +29,6 @@
 /**
  * Used for parsing client WebSocket configurations
  *
- * @author Martin Maher
  * @since 2.3
  */
 public class WebSocketClientParser extends AbstractEndpointParser {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/xml/WebSocketEndpointParser.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/xml/WebSocketEndpointParser.java
index f6fcadb0fe..3a8499a60d 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/xml/WebSocketEndpointParser.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/xml/WebSocketEndpointParser.java
@@ -29,7 +29,6 @@
 /**
  * Used for parsing server WebSocket endpoints and respective configurations.
  *
- * @author Martin Maher
  * @since 2.3
  */
 public class WebSocketEndpointParser extends AbstractEndpointParser {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/xml/WebSocketServerParser.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/xml/WebSocketServerParser.java
index 2da555e443..7969dc7655 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/xml/WebSocketServerParser.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/config/xml/WebSocketServerParser.java
@@ -30,7 +30,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class WebSocketServerParser extends HttpServerParser {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/AbstractWebSocketEndpointConfiguration.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/AbstractWebSocketEndpointConfiguration.java
index 68e1a4f568..43b47cdaec 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/AbstractWebSocketEndpointConfiguration.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/AbstractWebSocketEndpointConfiguration.java
@@ -23,7 +23,6 @@
 
 /**
  * Abstract endpoint configuration implementation provides basic endpoint properties for web socket endpoints.
- * @author Martin Maher
  * @since 2.3
  */
 public abstract class AbstractWebSocketEndpointConfiguration extends AbstractPollableEndpointConfiguration implements WebSocketEndpointConfiguration {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketConsumer.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketConsumer.java
index 3a6d09f8e0..3724658324 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketConsumer.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketConsumer.java
@@ -26,7 +26,6 @@
 
 /**
  * Consumer polls for incoming messages on web socket handler.
- * @author Martin Maher
  * @since 2.3
  */
 public class WebSocketConsumer extends AbstractSelectiveMessageConsumer {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketEndpoint.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketEndpoint.java
index f1dcc5d887..23427ba2e7 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketEndpoint.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketEndpoint.java
@@ -23,7 +23,6 @@
 
 /**
  * Endpoint constructs web socket consumer and producer with given endpoint configuration.
- * @author Martin Maher
  * @since 2.3
  */
 public class WebSocketEndpoint extends AbstractEndpoint {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketEndpointComponent.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketEndpointComponent.java
index cf5f5a5b46..65e3a541a3 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketEndpointComponent.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketEndpointComponent.java
@@ -26,7 +26,6 @@
 /**
  * Web Socket endpoint component is able to create Web Socket client endpoint from endpoint uri with parameters.
  *
- * @author Martin Maher
  * @since 2.3
  */
 public class WebSocketEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketEndpointConfiguration.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketEndpointConfiguration.java
index f782a9fbf0..d30c9f589a 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketEndpointConfiguration.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketEndpointConfiguration.java
@@ -23,7 +23,6 @@
 
 /**
  * Web socket endpoint configuration interface defines set of properties all web socket endpoints should have.
- * @author Christoph Deppisch
  * @since 2.3
  */
 public interface WebSocketEndpointConfiguration extends PollableEndpointConfiguration {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketProducer.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketProducer.java
index 591fb36526..93702a449c 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketProducer.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/WebSocketProducer.java
@@ -26,7 +26,6 @@
 
 /**
  * Producer sends web socket messages to all open sessions known to the web socket handler.
- * @author Martin Maher
  * @since 2.3
  */
 public class WebSocketProducer implements Producer {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/builder/WebSocketEndpoints.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/builder/WebSocketEndpoints.java
index 2b19025eba..fd22cb0585 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/builder/WebSocketEndpoints.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/endpoint/builder/WebSocketEndpoints.java
@@ -20,9 +20,6 @@
 import org.citrusframework.websocket.client.WebSocketClientBuilder;
 import org.citrusframework.websocket.server.WebSocketServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class WebSocketEndpoints extends ClientServerEndpointBuilder<WebSocketClientBuilder, WebSocketServerBuilder> {
     /**
      * Private constructor setting the client and server builder implementation.
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/handler/CitrusWebSocketHandler.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/handler/CitrusWebSocketHandler.java
index 499df57c8f..8f57a97fae 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/handler/CitrusWebSocketHandler.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/handler/CitrusWebSocketHandler.java
@@ -30,7 +30,6 @@
 /**
  * Web Socket Handler for handling incoming and sending outgoing Web Socket messages
  *
- * @author Martin Maher
  * @since 2.3
  */
 public class CitrusWebSocketHandler extends AbstractWebSocketHandler {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/handler/WebSocketUrlHandlerMapping.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/handler/WebSocketUrlHandlerMapping.java
index ad7b9b9dad..55418bfc29 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/handler/WebSocketUrlHandlerMapping.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/handler/WebSocketUrlHandlerMapping.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 
 /**
- * @author Martin Maher
  * @since 2.3
  */
 public class WebSocketUrlHandlerMapping extends WebSocketHandlerMapping {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/interceptor/SessionEnricherHandshakeInterceptor.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/interceptor/SessionEnricherHandshakeInterceptor.java
index df1134feae..b50462c3e5 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/interceptor/SessionEnricherHandshakeInterceptor.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/interceptor/SessionEnricherHandshakeInterceptor.java
@@ -29,7 +29,6 @@
  * Enriches the Web Socket session with the Web Socket ID and PATH as defined in the http-server
  * citrus context.
  *
- * @author Martin Maher
  * @since 2.3
  */
 public class SessionEnricherHandshakeInterceptor implements HandshakeInterceptor {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/message/WebSocketMessage.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/message/WebSocketMessage.java
index c644742f64..257994f9ae 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/message/WebSocketMessage.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/message/WebSocketMessage.java
@@ -26,7 +26,6 @@
 /**
  * Message representing web socket message data.
  *
- * @author Martin Maher
  * @since 2.3
  */
 public class WebSocketMessage extends DefaultMessage {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/message/WebSocketMessageConverter.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/message/WebSocketMessageConverter.java
index 282a2eb90f..3d9cf543c7 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/message/WebSocketMessageConverter.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/message/WebSocketMessageConverter.java
@@ -30,7 +30,6 @@
 /**
  * Message converter able to convert internal and external message representations for web socket messages. Converter
  * converts inbound and outbound messages.
- * @author Martin Maher
  * @since 2.3
  */
 public class WebSocketMessageConverter implements MessageConverter<org.springframework.web.socket.WebSocketMessage, org.springframework.web.socket.WebSocketMessage, WebSocketEndpointConfiguration> {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/message/WebSocketMessageHeaders.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/message/WebSocketMessageHeaders.java
index 5e04145966..40fd71d0ee 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/message/WebSocketMessageHeaders.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/message/WebSocketMessageHeaders.java
@@ -20,7 +20,6 @@
 
 /**
  * Special set of web socket related message headers.
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class WebSocketMessageHeaders {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/server/WebSocketServer.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/server/WebSocketServer.java
index dcc9bc1e4a..9ca50a5adb 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/server/WebSocketServer.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/server/WebSocketServer.java
@@ -27,7 +27,6 @@
 import java.util.List;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class WebSocketServer extends HttpServer {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/server/WebSocketServerBuilder.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/server/WebSocketServerBuilder.java
index b02f68abbd..82010d212f 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/server/WebSocketServerBuilder.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/server/WebSocketServerBuilder.java
@@ -22,7 +22,6 @@
 import org.citrusframework.websocket.endpoint.WebSocketEndpoint;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class WebSocketServerBuilder extends AbstractHttpServerBuilder<WebSocketServer, WebSocketServerBuilder> {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/server/WebSocketServerEndpointConfiguration.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/server/WebSocketServerEndpointConfiguration.java
index 66bfafb2c3..d8fc818eb4 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/server/WebSocketServerEndpointConfiguration.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/server/WebSocketServerEndpointConfiguration.java
@@ -23,7 +23,6 @@
 
 /**
  * Web socket endpoint configuration for server side web socket communication.
- * @author Martin Maher
  * @since 2.3
  */
 public class WebSocketServerEndpointConfiguration extends AbstractWebSocketEndpointConfiguration {
diff --git a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/servlet/CitrusWebSocketDispatcherServlet.java b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/servlet/CitrusWebSocketDispatcherServlet.java
index e4ecaa43aa..372c30d024 100644
--- a/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/servlet/CitrusWebSocketDispatcherServlet.java
+++ b/endpoints/citrus-websocket/src/main/java/org/citrusframework/websocket/servlet/CitrusWebSocketDispatcherServlet.java
@@ -37,7 +37,6 @@
  * Citrus dispatcher servlet extends Spring's message dispatcher servlet and just
  * adds optional configuration settings for default mapping strategies and so on.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class CitrusWebSocketDispatcherServlet extends CitrusDispatcherServlet {
diff --git a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/annotation/WebSocketClientConfigParserTest.java b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/annotation/WebSocketClientConfigParserTest.java
index 3033cc79a0..471f2f0a81 100644
--- a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/annotation/WebSocketClientConfigParserTest.java
+++ b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/annotation/WebSocketClientConfigParserTest.java
@@ -40,9 +40,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebSocketClientConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "webSocketClient1")
diff --git a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/annotation/WebSocketServerConfigParserTest.java b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/annotation/WebSocketServerConfigParserTest.java
index 056aba5fbb..3a71806cad 100644
--- a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/annotation/WebSocketServerConfigParserTest.java
+++ b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/annotation/WebSocketServerConfigParserTest.java
@@ -34,9 +34,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebSocketServerConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "webSocketServer1")
diff --git a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/xml/WebSocketClientParserTest.java b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/xml/WebSocketClientParserTest.java
index 227f860b29..933f2d5ab3 100644
--- a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/xml/WebSocketClientParserTest.java
+++ b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/xml/WebSocketClientParserTest.java
@@ -26,9 +26,6 @@
 
 import java.util.Map;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebSocketClientParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/xml/WebSocketEndpointParserTest.java b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/xml/WebSocketEndpointParserTest.java
index f9159b071c..a9e1021608 100644
--- a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/xml/WebSocketEndpointParserTest.java
+++ b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/config/xml/WebSocketEndpointParserTest.java
@@ -25,9 +25,6 @@
 
 import java.util.Map;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebSocketEndpointParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/endpoint/WebSocketEndpointComponentTest.java b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/endpoint/WebSocketEndpointComponentTest.java
index e7c3c39f32..2ebafd21fd 100644
--- a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/endpoint/WebSocketEndpointComponentTest.java
+++ b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/endpoint/WebSocketEndpointComponentTest.java
@@ -28,7 +28,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Martin Maher
  * @since 2.3
  */
 public class WebSocketEndpointComponentTest {
diff --git a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/endpoint/builder/WebSocketEndpointsTest.java b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/endpoint/builder/WebSocketEndpointsTest.java
index feebdc4309..69342cd69e 100644
--- a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/endpoint/builder/WebSocketEndpointsTest.java
+++ b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/endpoint/builder/WebSocketEndpointsTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebSocketEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/integration/WebSocketEndpointIT.java b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/integration/WebSocketEndpointIT.java
index 0dbf6af925..9739ca357b 100644
--- a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/integration/WebSocketEndpointIT.java
+++ b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/integration/WebSocketEndpointIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Martin Maher
- */
 @Test
 public class WebSocketEndpointIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/message/WebSocketMessageConverterTest.java b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/message/WebSocketMessageConverterTest.java
index 04f72d66a5..0fb6f8952f 100644
--- a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/message/WebSocketMessageConverterTest.java
+++ b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/message/WebSocketMessageConverterTest.java
@@ -29,7 +29,6 @@
 import java.nio.charset.Charset;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class WebSocketMessageConverterTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/servlet/CitrusWebSocketDispatcherServletTest.java b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/servlet/CitrusWebSocketDispatcherServletTest.java
index 1d2a2b08c7..6b7c6bd168 100644
--- a/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/servlet/CitrusWebSocketDispatcherServletTest.java
+++ b/endpoints/citrus-websocket/src/test/java/org/citrusframework/websocket/servlet/CitrusWebSocketDispatcherServletTest.java
@@ -52,7 +52,6 @@
 import static org.testng.Assert.assertTrue;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class CitrusWebSocketDispatcherServletTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/AssertSoapFault.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/AssertSoapFault.java
index 16e332c6b2..a071df56a0 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/AssertSoapFault.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/AssertSoapFault.java
@@ -51,7 +51,6 @@
  * Class constructs a control soap fault detail with given expected information (faultCode, faultString and faultDetail)
  * and delegates validation to {@link SoapFaultValidator} instance.
  *
- * @author Christoph Deppisch
  * @since 2009
  */
 public class AssertSoapFault extends AbstractActionContainer {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/ReceiveSoapMessageAction.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/ReceiveSoapMessageAction.java
index e586257b26..4957debb01 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/ReceiveSoapMessageAction.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/ReceiveSoapMessageAction.java
@@ -44,7 +44,6 @@
  * This special implementation offers SOAP attachment validation in addition to
  * the normal message receiver.
  *
- * @author Christoph Deppisch
  */
 public class ReceiveSoapMessageAction extends ReceiveMessageAction implements TestAction {
     /** Control attachment */
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SendSoapFaultAction.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SendSoapFaultAction.java
index b62bdd0afe..0c3e21042a 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SendSoapFaultAction.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SendSoapFaultAction.java
@@ -35,7 +35,6 @@
 import org.springframework.http.HttpStatus;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class SendSoapFaultAction extends SendSoapMessageAction {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SendSoapMessageAction.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SendSoapMessageAction.java
index 4d651f9558..9f4a591ac2 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SendSoapMessageAction.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SendSoapMessageAction.java
@@ -44,7 +44,6 @@
 /**
  * Message send action able to add SOAP attachment support to normal message sending action.
  *
- * @author Christoph Deppisch
  */
 public class SendSoapMessageAction extends SendMessageAction implements TestAction {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SoapActionBuilder.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SoapActionBuilder.java
index 30351fe76b..1d763ee057 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SoapActionBuilder.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SoapActionBuilder.java
@@ -26,7 +26,6 @@
 /**
  * Action executes soap client and server operations.
  *
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class SoapActionBuilder extends AbstractReferenceResolverAwareTestActionBuilder<TestAction> {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SoapClientActionBuilder.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SoapClientActionBuilder.java
index ceb29b16d4..741e216752 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SoapClientActionBuilder.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SoapClientActionBuilder.java
@@ -26,7 +26,6 @@
 /**
  * Action executes soap client operations such as sending requests and receiving responses.
  *
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class SoapClientActionBuilder extends AbstractReferenceResolverAwareTestActionBuilder<TestAction> {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SoapServerActionBuilder.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SoapServerActionBuilder.java
index 30a6f14e43..47ffc8d853 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SoapServerActionBuilder.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/actions/SoapServerActionBuilder.java
@@ -25,7 +25,6 @@
 /**
  * Action executes soap server operations such as receiving requests and sending response messsages.
  *
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class SoapServerActionBuilder extends AbstractReferenceResolverAwareTestActionBuilder<TestAction> {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/addressing/WsAddressingHeaders.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/addressing/WsAddressingHeaders.java
index 6c6b06d330..655eb7022a 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/addressing/WsAddressingHeaders.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/addressing/WsAddressingHeaders.java
@@ -30,7 +30,6 @@
  * Value object holding ws addressing information which is translated into the message header.
  * Message id is optional - if not set here it is generated automatically.
  *
- * @author Christoph Deppisch
  */
 public class WsAddressingHeaders {
     /** Addressing headers version */
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/addressing/WsAddressingMessageHeaders.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/addressing/WsAddressingMessageHeaders.java
index 05248fea6a..296e47374c 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/addressing/WsAddressingMessageHeaders.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/addressing/WsAddressingMessageHeaders.java
@@ -19,7 +19,6 @@
 import org.citrusframework.ws.message.SoapMessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public abstract class WsAddressingMessageHeaders {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/addressing/WsAddressingVersion.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/addressing/WsAddressingVersion.java
index af7523c7ef..fff4918916 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/addressing/WsAddressingVersion.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/addressing/WsAddressingVersion.java
@@ -19,7 +19,6 @@
 /**
  * Ws addressing versions supported in framework.
  *
- * @author Christoph Deppisch
  */
 public enum WsAddressingVersion {
     VERSION10,
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceClient.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceClient.java
index 0aca4a4a9c..cc75ea7b63 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceClient.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceClient.java
@@ -49,7 +49,6 @@
 /**
  * Client sends SOAP WebService messages to some server endpoint via Http protocol. Client waits for synchronous
  * SOAP response message.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class WebServiceClient extends AbstractEndpoint implements Producer, ReplyConsumer {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceClientBuilder.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceClientBuilder.java
index e9cdac6164..7a68c900d1 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceClientBuilder.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceClientBuilder.java
@@ -29,7 +29,6 @@
 import java.util.List;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class WebServiceClientBuilder extends AbstractEndpointBuilder<WebServiceClient> {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceEndpointComponent.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceEndpointComponent.java
index 0a3fd4ecbb..214696a03b 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceEndpointComponent.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceEndpointComponent.java
@@ -26,7 +26,6 @@
 /**
  * Component creates proper web service client from endpoint uri resource and parameters.
  *
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class WebServiceEndpointComponent extends AbstractEndpointComponent {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceEndpointConfiguration.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceEndpointConfiguration.java
index fb7077fec7..7d41dfc5e0 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceEndpointConfiguration.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/client/WebServiceEndpointConfiguration.java
@@ -37,7 +37,6 @@
 import org.springframework.ws.transport.WebServiceMessageSender;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class WebServiceEndpointConfiguration extends AbstractPollableEndpointConfiguration {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceClientConfig.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceClientConfig.java
index 73c2e0e3ba..62b6dc59f7 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceClientConfig.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceClientConfig.java
@@ -25,7 +25,6 @@
 import org.citrusframework.message.ErrorHandlingStrategy;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceClientConfigParser.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceClientConfigParser.java
index 4399c531e0..6dfe5eb77d 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceClientConfigParser.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceClientConfigParser.java
@@ -35,7 +35,6 @@
 import org.springframework.ws.transport.WebServiceMessageSender;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class WebServiceClientConfigParser implements AnnotationConfigParser<WebServiceClientConfig, WebServiceClient> {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceServerConfig.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceServerConfig.java
index f49dd22b27..5f135dc9a1 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceServerConfig.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceServerConfig.java
@@ -24,7 +24,6 @@
 import org.citrusframework.annotations.CitrusEndpointConfig;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceServerConfigParser.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceServerConfigParser.java
index 1fc7466d10..50f11852db 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceServerConfigParser.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/annotation/WebServiceServerConfigParser.java
@@ -31,7 +31,6 @@
 import static org.citrusframework.util.StringUtils.hasText;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class WebServiceServerConfigParser implements AnnotationConfigParser<WebServiceServerConfig, WebServiceServer> {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/handler/CitrusWsConfigNamespaceHandler.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/handler/CitrusWsConfigNamespaceHandler.java
index 5eb2774e80..8c4f718f6f 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/handler/CitrusWsConfigNamespaceHandler.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/handler/CitrusWsConfigNamespaceHandler.java
@@ -23,7 +23,6 @@
 /**
  * Namespace handler for configuration components in Citrus ws namespace.
  *
- * @author Christoph Deppisch
  */
 public class CitrusWsConfigNamespaceHandler extends NamespaceHandlerSupport {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/handler/CitrusWsTestcaseNamespaceHandler.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/handler/CitrusWsTestcaseNamespaceHandler.java
index ad6b107dbf..e4ea5e41f5 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/handler/CitrusWsTestcaseNamespaceHandler.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/handler/CitrusWsTestcaseNamespaceHandler.java
@@ -23,7 +23,6 @@
 /**
  * Namespace handler for test action components in Citrus ws namespace.
  *
- * @author Christoph Deppisch
  */
 public class CitrusWsTestcaseNamespaceHandler extends NamespaceHandlerSupport {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/AssertSoapFaultParser.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/AssertSoapFaultParser.java
index 8e8cc1bd7e..fa97f1ec97 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/AssertSoapFaultParser.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/AssertSoapFaultParser.java
@@ -41,7 +41,6 @@
 /**
  * Parser for SOAP fault assert action.
  *
- * @author Christoph Deppisch
  */
 public class AssertSoapFaultParser implements BeanDefinitionParser {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/ReceiveSoapMessageActionParser.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/ReceiveSoapMessageActionParser.java
index 301c19914b..446afe7518 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/ReceiveSoapMessageActionParser.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/ReceiveSoapMessageActionParser.java
@@ -39,7 +39,6 @@
 /**
  * Parser for SOAP message receiver component in Citrus ws namespace.
  *
- * @author Christoph Deppisch
  */
 public class ReceiveSoapMessageActionParser extends ReceiveMessageActionParser {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/SendSoapFaultActionParser.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/SendSoapFaultActionParser.java
index 486937ba2e..877469e157 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/SendSoapFaultActionParser.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/SendSoapFaultActionParser.java
@@ -33,7 +33,6 @@
 /**
  * Bean definition parser for send soap fault action in test case.
  *
- * @author Christoph Deppisch
  */
 public class SendSoapFaultActionParser extends SendSoapMessageActionParser {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/SendSoapMessageActionParser.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/SendSoapMessageActionParser.java
index 2a3cff367d..1bb724f17f 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/SendSoapMessageActionParser.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/SendSoapMessageActionParser.java
@@ -37,7 +37,6 @@
 /**
  * Parser for SOAP message sender component in Citrus ws namespace.
  *
- * @author Christoph Deppisch
  */
 public class SendSoapMessageActionParser extends SendMessageActionParser {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/SoapAttachmentParser.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/SoapAttachmentParser.java
index 1ffdb0cbec..10ad43b463 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/SoapAttachmentParser.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/SoapAttachmentParser.java
@@ -23,7 +23,6 @@
 /**
  * Parser for SOAP attachment element in Citrus ws namespace.
  *
- * @author Christoph Deppisch
  */
 public final class SoapAttachmentParser {
     /**
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/WebServiceClientParser.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/WebServiceClientParser.java
index 6d7e42ff04..e1f787f964 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/WebServiceClientParser.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/WebServiceClientParser.java
@@ -30,7 +30,6 @@
 /**
  * Parser configures web service client bean definition.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class WebServiceClientParser extends AbstractEndpointParser {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/WebServiceServerParser.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/WebServiceServerParser.java
index 81670bcc72..6a1a7a8e42 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/WebServiceServerParser.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/config/xml/WebServiceServerParser.java
@@ -28,7 +28,6 @@
 /**
  * Parser for jetty-server component in Citrus ws namespace.
  *
- * @author Christoph Deppisch
  */
 public class WebServiceServerParser extends AbstractServerParser {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/endpoint/builder/WebServiceEndpoints.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/endpoint/builder/WebServiceEndpoints.java
index 90882f822b..237ec4a47a 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/endpoint/builder/WebServiceEndpoints.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/endpoint/builder/WebServiceEndpoints.java
@@ -20,9 +20,6 @@
 import org.citrusframework.ws.client.WebServiceClientBuilder;
 import org.citrusframework.ws.server.WebServiceServerBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public final class WebServiceEndpoints extends ClientServerEndpointBuilder<WebServiceClientBuilder, WebServiceServerBuilder>  {
 
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/DelegatingEndpointInterceptor.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/DelegatingEndpointInterceptor.java
index a504027f26..86eccc2643 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/DelegatingEndpointInterceptor.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/DelegatingEndpointInterceptor.java
@@ -28,7 +28,6 @@
 /**
  * Interceptor implementation delegates to list of other endpoint interceptors.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class DelegatingEndpointInterceptor implements SmartEndpointInterceptor, SoapEndpointInterceptor {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/LoggingClientInterceptor.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/LoggingClientInterceptor.java
index 4a674c1eb8..b1e7e96738 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/LoggingClientInterceptor.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/LoggingClientInterceptor.java
@@ -29,7 +29,6 @@
  * Client interceptor implementation logging SOAP requests and responses as well as SOAP faults
  * with logging framework.
  *
- * @author Christoph Deppisch
  */
 public class LoggingClientInterceptor extends LoggingInterceptorSupport implements ClientInterceptor {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/LoggingEndpointInterceptor.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/LoggingEndpointInterceptor.java
index 9d79e4baa8..01a401f9ae 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/LoggingEndpointInterceptor.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/LoggingEndpointInterceptor.java
@@ -27,7 +27,6 @@
  * WebService requests (other than SOAP) the content is logged via {@link java.io.ByteArrayOutputStream}
  * which is much more expensive as whole message is loaded to internal memory.
  *
- * @author Christoph Deppisch
  */
 public class LoggingEndpointInterceptor extends LoggingInterceptorSupport implements EndpointInterceptor {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/LoggingInterceptorSupport.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/LoggingInterceptorSupport.java
index c3cc0f16a8..8843679e01 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/LoggingInterceptorSupport.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/LoggingInterceptorSupport.java
@@ -39,7 +39,6 @@
 /**
  * Abstract logging support class offers basic logger methods for SOAP messages.
  *
- * @author Christoph Deppisch
  */
 public abstract class LoggingInterceptorSupport extends TransformerObjectSupport {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/SoapMustUnderstandEndpointInterceptor.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/SoapMustUnderstandEndpointInterceptor.java
index cd07abef37..ea5dbba1e9 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/SoapMustUnderstandEndpointInterceptor.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/interceptor/SoapMustUnderstandEndpointInterceptor.java
@@ -27,7 +27,6 @@
  * Handles and accepts must understand header entries in SOAP requests. The supported header entries are configured
  * via simple HashMap where key is the namespace uri and value the header name (local part).
  *
- * @author Christoph Deppisch
  */
 public class SoapMustUnderstandEndpointInterceptor implements SoapEndpointInterceptor {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapAttachment.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapAttachment.java
index b101d06d72..55f6ae9c32 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapAttachment.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapAttachment.java
@@ -41,7 +41,6 @@
 /**
  * Citrus SOAP attachment implementation.
  *
- * @author Christoph Deppisch
  */
 public class SoapAttachment implements Attachment, Serializable {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapFault.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapFault.java
index 9adead4eba..f7ffd50ebb 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapFault.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapFault.java
@@ -36,7 +36,6 @@
 import org.springframework.xml.namespace.QNameUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class SoapFault extends SoapMessage {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapFormattingMessageProcessor.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapFormattingMessageProcessor.java
index d0bcf99b6e..d356623d38 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapFormattingMessageProcessor.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapFormattingMessageProcessor.java
@@ -25,7 +25,6 @@
 import org.citrusframework.xml.XmlFormattingMessageProcessor;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class SoapFormattingMessageProcessor extends XmlFormattingMessageProcessor {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessage.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessage.java
index 275a3e05a4..4b26e0c5ff 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessage.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessage.java
@@ -30,7 +30,6 @@
  * SOAP message representation holding additional elements like SOAP action, header fragment data and
  * attachments.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class SoapMessage extends DefaultMessage {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessageHeaders.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessageHeaders.java
index d7291f5ec1..48f2e73a0b 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessageHeaders.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessageHeaders.java
@@ -18,9 +18,6 @@
 
 import org.citrusframework.message.MessageHeaders;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class SoapMessageHeaders {
 
     /**
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessageUtils.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessageUtils.java
index 857e4d7218..6dc6048b73 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessageUtils.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/SoapMessageUtils.java
@@ -20,7 +20,6 @@
 import org.citrusframework.message.MessageHeaders;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.5
  */
 public final class SoapMessageUtils {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/callback/SoapRequestMessageCallback.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/callback/SoapRequestMessageCallback.java
index d8c4e9c24d..fbea8d7a9a 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/callback/SoapRequestMessageCallback.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/callback/SoapRequestMessageCallback.java
@@ -29,7 +29,6 @@
  * Sender callback invoked by framework with actual web service request before message is sent.
  * Web service message is filled with content from internal message representation.
  *
- * @author Christoph Deppisch
  */
 public class SoapRequestMessageCallback implements WebServiceMessageCallback {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/callback/SoapResponseMessageCallback.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/callback/SoapResponseMessageCallback.java
index cdf2d63999..357f0febc0 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/callback/SoapResponseMessageCallback.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/callback/SoapResponseMessageCallback.java
@@ -29,7 +29,6 @@
  * Receiver callback invoked by framework on response message. Callback fills an internal message representation with
  * the response information for further message processing.
  *
- * @author Christoph Deppisch
  */
 public class SoapResponseMessageCallback implements WebServiceMessageCallback {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/converter/SoapMessageConverter.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/converter/SoapMessageConverter.java
index b2c86ffba1..993ceb85b2 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/converter/SoapMessageConverter.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/converter/SoapMessageConverter.java
@@ -69,7 +69,6 @@
  * Default converter implementation for SOAP messages. By default strips away the SOAP envelope and constructs internal message representation
  * from incoming SOAP request messages. Response messages are created from internal message representation accordingly.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class SoapMessageConverter implements WebServiceMessageConverter {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/converter/WebServiceMessageConverter.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/converter/WebServiceMessageConverter.java
index b590823c48..5f211cce73 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/converter/WebServiceMessageConverter.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/converter/WebServiceMessageConverter.java
@@ -26,7 +26,6 @@
  * Converter is abel to create proper WebService message from internal message representation and vice versa. Converter
  * is used both on client and server side to convert SOAP request and response messages to internal message representation.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public interface WebServiceMessageConverter extends MessageConverter<WebServiceMessage, WebServiceMessage, WebServiceEndpointConfiguration> {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/converter/WsAddressingMessageConverter.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/converter/WsAddressingMessageConverter.java
index 996a9c7e13..c4aa60fa0e 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/converter/WsAddressingMessageConverter.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/message/converter/WsAddressingMessageConverter.java
@@ -38,7 +38,6 @@
 /**
  * Ws addressing aware message converter implementation. Adds addressing header information to SOAP header.
  *
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class WsAddressingMessageConverter extends SoapMessageConverter {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/security/BasicAuthConstraint.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/security/BasicAuthConstraint.java
index 4acdd6ce37..bcf6c9c2fa 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/security/BasicAuthConstraint.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/security/BasicAuthConstraint.java
@@ -28,7 +28,6 @@
 /**
  * Convenient constraint instantiation for basic authentication and multiple user roles.
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public class BasicAuthConstraint implements Constraint {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/security/SecurityHandlerFactory.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/security/SecurityHandlerFactory.java
index c5d2f601cf..b5acf4e4e5 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/security/SecurityHandlerFactory.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/security/SecurityHandlerFactory.java
@@ -42,7 +42,6 @@
  * Factory bean constructs a security handler for usage in Jetty servlet container. Security handler
  * holds one to many constraints and a set of users known to a user login service for authentication.
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public class SecurityHandlerFactory implements FactoryBean<SecurityHandler>, InitializingPhase {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/security/User.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/security/User.java
index fe734e3917..02211f71be 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/security/User.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/security/User.java
@@ -21,7 +21,6 @@
 /**
  * User model object for easy instantiation in Spring application context.
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public class User {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/server/WebServiceEndpoint.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/server/WebServiceEndpoint.java
index c5c347e060..9f9e010ae5 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/server/WebServiceEndpoint.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/server/WebServiceEndpoint.java
@@ -73,7 +73,6 @@
  * SpringWS {@link MessageEndpoint} implementation. Endpoint will delegate message processing to
  * a {@link EndpointAdapter} implementation.
  *
- * @author Christoph Deppisch
  */
 public class WebServiceEndpoint implements MessageEndpoint {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/server/WebServiceServer.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/server/WebServiceServer.java
index 175af40fe3..5cf92449c0 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/server/WebServiceServer.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/server/WebServiceServer.java
@@ -48,7 +48,6 @@
  * Jetty server implementation wrapping a {@link Server} with Citrus server behaviour, so
  * server can be started/stopped by Citrus.
  *
- * @author Christoph Deppisch
  */
 public class WebServiceServer extends AbstractServer {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/server/WebServiceServerBuilder.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/server/WebServiceServerBuilder.java
index a07b4887fb..8d2a0742a0 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/server/WebServiceServerBuilder.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/server/WebServiceServerBuilder.java
@@ -27,7 +27,6 @@
 import java.util.List;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class WebServiceServerBuilder extends AbstractServerBuilder<WebServiceServer, WebServiceServerBuilder> {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/servlet/CitrusMessageDispatcherServlet.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/servlet/CitrusMessageDispatcherServlet.java
index 2a855ba5ec..c1f6587943 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/servlet/CitrusMessageDispatcherServlet.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/servlet/CitrusMessageDispatcherServlet.java
@@ -33,7 +33,6 @@
  * Citrus message dispatcher servlet extends Spring's message dispatcher servlet and just
  * adds optional configuration settings for default mapping strategies, interceptors and so on.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class CitrusMessageDispatcherServlet extends MessageDispatcherServlet {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/AbstractFaultDetailValidator.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/AbstractFaultDetailValidator.java
index af394c24ab..929f164f70 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/AbstractFaultDetailValidator.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/AbstractFaultDetailValidator.java
@@ -29,7 +29,6 @@
  * Abstract implementation of {@link SoapFaultValidator} converting soap fault detail objects to simple String content for
  * further validation.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractFaultDetailValidator extends AbstractSoapFaultValidator {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/AbstractSoapAttachmentValidator.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/AbstractSoapAttachmentValidator.java
index e9c59aa6fb..31376275fb 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/AbstractSoapAttachmentValidator.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/AbstractSoapAttachmentValidator.java
@@ -33,7 +33,6 @@
  * Validator will create a {@link SoapAttachment} and automatically handle contentId and
  * contentType validation. Content body validation is delegated to subclasses.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractSoapAttachmentValidator implements SoapAttachmentValidator {
     /**
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/AbstractSoapFaultValidator.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/AbstractSoapFaultValidator.java
index d26b82b883..76e64d353e 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/AbstractSoapFaultValidator.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/AbstractSoapFaultValidator.java
@@ -29,7 +29,6 @@
  * Abstract soap fault validation implementation offering basic faultCode and faultString validation.
  * Subclasses may add fault detail validation in addition to that.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractSoapFaultValidator implements SoapFaultValidator {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/BinarySoapAttachmentValidator.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/BinarySoapAttachmentValidator.java
index 7e051d9e58..593b74999c 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/BinarySoapAttachmentValidator.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/BinarySoapAttachmentValidator.java
@@ -29,7 +29,6 @@
 /**
  * Soap attachment validator performs binary content validation by comparing attachment content binary input streams.
  *
- * @author Christoph Deppisch
  * @since 2.1
  */
 public class BinarySoapAttachmentValidator extends AbstractSoapAttachmentValidator {
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SimpleSoapAttachmentValidator.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SimpleSoapAttachmentValidator.java
index 4986f38f79..4adf2f2ccb 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SimpleSoapAttachmentValidator.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SimpleSoapAttachmentValidator.java
@@ -25,7 +25,6 @@
  * Simple implementation of a {@link AbstractSoapAttachmentValidator}.
  * Attachment content body is validated through simple string equals assertion.
  *
- * @author Christoph Deppisch
  */
 public class SimpleSoapAttachmentValidator extends AbstractSoapAttachmentValidator {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SimpleSoapFaultValidator.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SimpleSoapFaultValidator.java
index e3e21c5414..6c1c174397 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SimpleSoapFaultValidator.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SimpleSoapFaultValidator.java
@@ -26,7 +26,6 @@
  * Simple soap fault validator implementation just performing String equals on soap fault detail
  * as validation algorithm.
  *
- * @author Christoph Deppisch
  */
 public class SimpleSoapFaultValidator extends AbstractFaultDetailValidator {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapAttachmentValidator.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapAttachmentValidator.java
index af53a2a76f..18d43c4055 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapAttachmentValidator.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapAttachmentValidator.java
@@ -29,7 +29,6 @@
  * {@link org.springframework.ws.mime.Attachment} implementations to the Spring integration message header. The header name will be the
  * attachment's contentId. The header value is the {@link org.springframework.ws.mime.Attachment} object.
  *
- * @author Christoph Deppisch
  */
 public interface SoapAttachmentValidator {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultDetailValidationContext.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultDetailValidationContext.java
index 3b9fd37280..0a78332bfb 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultDetailValidationContext.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultDetailValidationContext.java
@@ -21,7 +21,6 @@
 
 /**
  * Soap fault detail validation context extends XML validation context.
- * @author Christoph Deppisch
  */
 public class SoapFaultDetailValidationContext extends XmlMessageValidationContext {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultValidationContext.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultValidationContext.java
index 221a3ce531..343d706910 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultValidationContext.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultValidationContext.java
@@ -27,7 +27,6 @@
  * Special validation context holds 1-n {@link SoapFaultDetailValidationContext} instances for
  * 1-n SOAP fault detail elements.
  *
- * @author Christoph Deppisch
  */
 public class SoapFaultValidationContext extends DefaultValidationContext {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultValidator.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultValidator.java
index bc0da7513f..c0f4ab7e16 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultValidator.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/SoapFaultValidator.java
@@ -23,7 +23,6 @@
 /**
  * Interface for soap fault validation.
  *
- * @author Christoph Deppisch
  */
 public interface SoapFaultValidator {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/XmlSoapAttachmentValidator.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/XmlSoapAttachmentValidator.java
index 04010c7c8e..bf4f48efca 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/XmlSoapAttachmentValidator.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/XmlSoapAttachmentValidator.java
@@ -35,7 +35,6 @@
  * Soap attachment validator delegating attachment content validation to a {@link MessageValidator}.
  * Through {@link XmlMessageValidationContext} this class supports message validation for XML payload.
  *
- * @author Christoph Deppisch
  */
 public class XmlSoapAttachmentValidator extends SimpleSoapAttachmentValidator implements ReferenceResolverAware {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/XmlSoapFaultValidator.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/XmlSoapFaultValidator.java
index 8ee62903c3..8194b2e03a 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/XmlSoapFaultValidator.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/validation/XmlSoapFaultValidator.java
@@ -32,7 +32,6 @@
  * Soap fault validator implementation that delegates soap fault detail validation to default XML message validator
  * in order to support XML fault detail content validation.
  *
- * @author Christoph Deppisch
  */
 public class XmlSoapFaultValidator extends AbstractFaultDetailValidator {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/xml/Soap.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/xml/Soap.java
index b5ef55187d..03996d9644 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/xml/Soap.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/xml/Soap.java
@@ -49,9 +49,6 @@
 import org.citrusframework.xml.actions.Receive;
 import org.citrusframework.xml.actions.Send;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "soap")
 public class Soap implements TestActionBuilder<TestAction>, ReferenceResolverAware {
 
diff --git a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/yaml/Soap.java b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/yaml/Soap.java
index 17d2a81ffe..de09fc6759 100644
--- a/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/yaml/Soap.java
+++ b/endpoints/citrus-ws/src/main/java/org/citrusframework/ws/yaml/Soap.java
@@ -43,9 +43,6 @@
 import org.citrusframework.yaml.actions.Receive;
 import org.citrusframework.yaml.actions.Send;
 
-/**
- * @author Christoph Deppisch
- */
 public class Soap implements TestActionBuilder<TestAction>, ReferenceResolverAware {
 
     private TestActionBuilder<?> builder;
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/UnitTestSupport.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/UnitTestSupport.java
index 3b92e258cb..bd2a601d26 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/UnitTestSupport.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/UnitTestSupport.java
@@ -21,9 +21,6 @@
 import org.citrusframework.validation.DefaultTextEqualsMessageValidator;
 import org.citrusframework.validation.xml.DomXmlMessageValidator;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport extends AbstractTestNGUnitTest {
 
     @Override
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/WebServiceEndpointTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/WebServiceEndpointTest.java
index 9d80bc6b1a..352f0ae835 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/WebServiceEndpointTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/WebServiceEndpointTest.java
@@ -59,9 +59,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebServiceEndpointTest {
 
     private MessageContext messageContext = Mockito.mock(MessageContext.class);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/AssertSoapFaultTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/AssertSoapFaultTest.java
index 04a7205058..b713d91423 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/AssertSoapFaultTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/AssertSoapFaultTest.java
@@ -42,9 +42,6 @@
 
 import static org.citrusframework.DefaultTestActionBuilder.action;
 
-/**
- * @author Christoph Deppisch
- */
 public class AssertSoapFaultTest extends UnitTestSupport {
 
     @Autowired
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/ReceiveSoapMessageActionTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/ReceiveSoapMessageActionTest.java
index 59c43850a4..ec3be32434 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/ReceiveSoapMessageActionTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/ReceiveSoapMessageActionTest.java
@@ -42,9 +42,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 @SuppressWarnings({ "unchecked", "rawtypes" })
 public class ReceiveSoapMessageActionTest extends AbstractTestNGUnitTest {
 
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/SendSoapFaultActionTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/SendSoapFaultActionTest.java
index 82b988e70a..f7efeb167d 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/SendSoapFaultActionTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/SendSoapFaultActionTest.java
@@ -35,9 +35,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendSoapFaultActionTest extends UnitTestSupport {
 
     private Endpoint endpoint = Mockito.mock(Endpoint.class);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/SendSoapMessageActionTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/SendSoapMessageActionTest.java
index 1d7b4d2904..501b8bf0c0 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/SendSoapMessageActionTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/SendSoapMessageActionTest.java
@@ -41,9 +41,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendSoapMessageActionTest extends AbstractTestNGUnitTest {
 
     private Endpoint webServiceEndpoint = Mockito.mock(Endpoint.class);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/SoapActionBuilderTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/SoapActionBuilderTest.java
index 39b0838d55..fe1b39bf14 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/SoapActionBuilderTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/SoapActionBuilderTest.java
@@ -26,9 +26,6 @@
 
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapActionBuilderTest {
 
     private SoapActionBuilder fixture;
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/dsl/ReceiveSoapMessageTestActionBuilderTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/dsl/ReceiveSoapMessageTestActionBuilderTest.java
index 09c2fce895..b82690e5c6 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/dsl/ReceiveSoapMessageTestActionBuilderTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/dsl/ReceiveSoapMessageTestActionBuilderTest.java
@@ -54,9 +54,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveSoapMessageTestActionBuilderTest extends UnitTestSupport {
 
     private final Consumer messageConsumer = Mockito.mock(Consumer.class);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/dsl/SendSoapFaultTestActionBuilderTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/dsl/SendSoapFaultTestActionBuilderTest.java
index 6ae6af9681..9006d1f50e 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/dsl/SendSoapFaultTestActionBuilderTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/dsl/SendSoapFaultTestActionBuilderTest.java
@@ -46,9 +46,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendSoapFaultTestActionBuilderTest extends UnitTestSupport {
 
     public static final String FAULT_STRING = "Something went wrong";
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/dsl/SendSoapMessageTestActionBuilderTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/dsl/SendSoapMessageTestActionBuilderTest.java
index 0466e2bec5..0272750a5b 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/dsl/SendSoapMessageTestActionBuilderTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/actions/dsl/SendSoapMessageTestActionBuilderTest.java
@@ -53,9 +53,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendSoapMessageTestActionBuilderTest extends UnitTestSupport {
 
     private final WebServiceClient soapClient = Mockito.mock(WebServiceClient.class);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceClientTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceClientTest.java
index 9ab55d036f..1853cec78e 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceClientTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceClientTest.java
@@ -30,9 +30,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebServiceClientTest extends AbstractTestNGUnitTest {
 
     private WebServiceTemplate webServiceTemplate = Mockito.mock(WebServiceTemplate.class);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceEndpointComponentTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceEndpointComponentTest.java
index 49f0cb1cc1..049eb95c3a 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceEndpointComponentTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/client/WebServiceEndpointComponentTest.java
@@ -37,9 +37,6 @@
 import static org.mockito.Mockito.when;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class WebServiceEndpointComponentTest {
 
     private ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/annotation/WebServiceClientConfigParserTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/annotation/WebServiceClientConfigParserTest.java
index ec20de4194..d9f65484c4 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/annotation/WebServiceClientConfigParserTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/annotation/WebServiceClientConfigParserTest.java
@@ -54,9 +54,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebServiceClientConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "wsClient1")
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/annotation/WebServiceServerConfigParserTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/annotation/WebServiceServerConfigParserTest.java
index 3b8abcce33..29620449df 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/annotation/WebServiceServerConfigParserTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/annotation/WebServiceServerConfigParserTest.java
@@ -42,9 +42,6 @@
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebServiceServerConfigParserTest extends AbstractTestNGUnitTest {
 
     @CitrusEndpoint(name = "soapServer1")
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/AssertSoapFaultParserTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/AssertSoapFaultParserTest.java
index fbe0c34334..e1a1732941 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/AssertSoapFaultParserTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/AssertSoapFaultParserTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AssertSoapFaultParserTest extends AbstractActionParserTest<AssertSoapFault> {
 
     @Test
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/ReceiveSoapMessageActionParserTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/ReceiveSoapMessageActionParserTest.java
index 69afdc34f6..2842e1c8a3 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/ReceiveSoapMessageActionParserTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/ReceiveSoapMessageActionParserTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.testng.AbstractActionParserTest;
 import org.citrusframework.ws.actions.ReceiveSoapMessageAction;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveSoapMessageActionParserTest extends AbstractActionParserTest<ReceiveSoapMessageAction> {
 
     @Test
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/SendSoapFaultActionParserTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/SendSoapFaultActionParserTest.java
index 6e4e60ecb5..082a767836 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/SendSoapFaultActionParserTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/SendSoapFaultActionParserTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendSoapFaultActionParserTest extends AbstractActionParserTest<SendSoapFaultAction> {
 
     @Test
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/SendSoapMessageActionParserTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/SendSoapMessageActionParserTest.java
index 9024a255e9..e23aed4d71 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/SendSoapMessageActionParserTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/SendSoapMessageActionParserTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.testng.AbstractActionParserTest;
 import org.citrusframework.ws.actions.SendSoapMessageAction;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendSoapMessageActionParserTest extends AbstractActionParserTest<SendSoapMessageAction> {
 
     @Test
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/WebServiceClientParserTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/WebServiceClientParserTest.java
index 688cb8f4b4..56a380e8cc 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/WebServiceClientParserTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/WebServiceClientParserTest.java
@@ -31,9 +31,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebServiceClientParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/WebServiceServerParserTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/WebServiceServerParserTest.java
index 8317a935d1..1ac95a3855 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/WebServiceServerParserTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/config/xml/WebServiceServerParserTest.java
@@ -24,9 +24,6 @@
 
 import java.util.Iterator;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebServiceServerParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/endpoint/builder/WebServiceEndpointsTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/endpoint/builder/WebServiceEndpointsTest.java
index ccda2ca300..cb938cec26 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/endpoint/builder/WebServiceEndpointsTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/endpoint/builder/WebServiceEndpointsTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class WebServiceEndpointsTest {
 
     @Test
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/AbstractGroovyActionDslTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/AbstractGroovyActionDslTest.java
index f2fbe3c7a9..7a8e8d2c60 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/AbstractGroovyActionDslTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/AbstractGroovyActionDslTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractGroovyActionDslTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/AssertSoapFaultTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/AssertSoapFaultTest.java
index 1924879570..59addd14eb 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/AssertSoapFaultTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/AssertSoapFaultTest.java
@@ -45,9 +45,6 @@
 
 import static org.citrusframework.ws.endpoint.builder.WebServiceEndpoints.soap;
 
-/**
- * @author Christoph Deppisch
- */
 public class AssertSoapFaultTest extends AbstractGroovyActionDslTest {
 
     private final int port = SocketUtils.findAvailableTcpPort(8080);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/SendSoapFaultTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/SendSoapFaultTest.java
index ce6553f81a..9b8fb7eb22 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/SendSoapFaultTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/SendSoapFaultTest.java
@@ -42,9 +42,6 @@
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 import static org.citrusframework.ws.endpoint.builder.WebServiceEndpoints.soap;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendSoapFaultTest extends AbstractGroovyActionDslTest {
 
     private WebServiceServer soapServer;
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/SoapClientTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/SoapClientTest.java
index 976f941962..38bf5e6d9b 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/SoapClientTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/SoapClientTest.java
@@ -47,9 +47,6 @@
 
 import static org.citrusframework.ws.endpoint.builder.WebServiceEndpoints.soap;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapClientTest extends AbstractGroovyActionDslTest {
 
     private final int port = SocketUtils.findAvailableTcpPort(8080);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/SoapServerTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/SoapServerTest.java
index 6c3435fe73..b753914fca 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/SoapServerTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/groovy/SoapServerTest.java
@@ -45,9 +45,6 @@
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 import static org.citrusframework.ws.endpoint.builder.WebServiceEndpoints.soap;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapServerTest extends AbstractGroovyActionDslTest {
 
     private WebServiceServer soapServer;
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/AssertSoapFaultIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/AssertSoapFaultIT.java
index f20124b448..759a281de4 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/AssertSoapFaultIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/AssertSoapFaultIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2009
  */
 public class AssertSoapFaultIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/AssertSoapFaultJavaIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/AssertSoapFaultJavaIT.java
index 52b2e688f2..87ed5e919b 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/AssertSoapFaultJavaIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/AssertSoapFaultJavaIT.java
@@ -23,9 +23,6 @@
 import static org.citrusframework.ws.actions.AssertSoapFault.Builder.assertSoapFault;
 import static org.citrusframework.ws.actions.SoapActionBuilder.soap;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class AssertSoapFaultJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/EmptySoapResponseIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/EmptySoapResponseIT.java
index 6e0c67227d..c26e60779e 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/EmptySoapResponseIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/EmptySoapResponseIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2012
  */
 public class EmptySoapResponseIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/PropagateSoapFaultIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/PropagateSoapFaultIT.java
index 2740c5c1c8..6e550796d4 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/PropagateSoapFaultIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/PropagateSoapFaultIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2011
  */
 public class PropagateSoapFaultIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapAttachmentJavaIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapAttachmentJavaIT.java
index 563370ae2f..1ca4f205db 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapAttachmentJavaIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapAttachmentJavaIT.java
@@ -27,9 +27,6 @@
 import static org.citrusframework.dsl.XmlSupport.xml;
 import static org.citrusframework.ws.actions.SoapActionBuilder.soap;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class SendSoapAttachmentJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithAttachmentIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithAttachmentIT.java
index dbd501b228..1cb5e0d10a 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithAttachmentIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithAttachmentIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2009
  */
 public class SendSoapMessageWithAttachmentIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithSchemaValidationIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithSchemaValidationIT.java
index 9d3614d201..2c4934d156 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithSchemaValidationIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SendSoapMessageWithSchemaValidationIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Thorsten Schlathoelter
  * @since 3.1.3
  */
 public class SendSoapMessageWithSchemaValidationIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/ServerSoapFaultIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/ServerSoapFaultIT.java
index f32e5c2b0a..51652f9f03 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/ServerSoapFaultIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/ServerSoapFaultIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2010
  */
 public class ServerSoapFaultIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapAttachmentHandlingEndpoint.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapAttachmentHandlingEndpoint.java
index f7213dcb9d..877f259b55 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapAttachmentHandlingEndpoint.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapAttachmentHandlingEndpoint.java
@@ -25,9 +25,6 @@
 
 import java.util.Iterator;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapAttachmentHandlingEndpoint implements MessageEndpoint {
 
     /**
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapFaultGeneratingEndpoint.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapFaultGeneratingEndpoint.java
index 544bd32f5f..f35a089a5c 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapFaultGeneratingEndpoint.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapFaultGeneratingEndpoint.java
@@ -20,9 +20,6 @@
 import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.server.endpoint.MessageEndpoint;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapFaultGeneratingEndpoint implements MessageEndpoint {
 
 	public void invoke(MessageContext messageContext) throws Exception {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapForkModeIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapForkModeIT.java
index 6389b4f6c5..97667703f3 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapForkModeIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapForkModeIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2011
  */
 public class SoapForkModeIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapForkModeJavaIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapForkModeJavaIT.java
index 62fa9fc2cb..cfbcb9a58b 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapForkModeJavaIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapForkModeJavaIT.java
@@ -24,9 +24,6 @@
 import static org.citrusframework.dsl.XmlSupport.xml;
 import static org.citrusframework.ws.actions.SoapActionBuilder.soap;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class SoapForkModeJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHeaderFragmentIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHeaderFragmentIT.java
index f72cdc7dae..3717e3c910 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHeaderFragmentIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHeaderFragmentIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2011
  */
 public class SoapHeaderFragmentIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHeaderFragmentJavaIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHeaderFragmentJavaIT.java
index d0f2f46ad7..a14192c7aa 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHeaderFragmentJavaIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHeaderFragmentJavaIT.java
@@ -24,9 +24,6 @@
 import static org.citrusframework.dsl.XmlSupport.xml;
 import static org.citrusframework.ws.actions.SoapActionBuilder.soap;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class SoapHeaderFragmentJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpAttributeHeaderIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpAttributeHeaderIT.java
index 7a2e8e760e..3c077524f6 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpAttributeHeaderIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpAttributeHeaderIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapHttpAttributeHeaderIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpErrorIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpErrorIT.java
index c60750b75b..70b120a38a 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpErrorIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpErrorIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapHttpErrorIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpErrorJavaIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpErrorJavaIT.java
index 44e1e13743..8793f5d093 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpErrorJavaIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapHttpErrorJavaIT.java
@@ -28,9 +28,6 @@
 import static org.citrusframework.dsl.MessageSupport.MessageHeaderSupport.fromHeaders;
 import static org.citrusframework.dsl.XmlSupport.xml;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class SoapHttpErrorJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMimeHeaderIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMimeHeaderIT.java
index 648df9a3a0..3c1019e600 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMimeHeaderIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMimeHeaderIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2011
  */
 public class SoapMimeHeaderIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMimeHeaderJavaIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMimeHeaderJavaIT.java
index 6ba6e31fb8..b8f662f79d 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMimeHeaderJavaIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMimeHeaderJavaIT.java
@@ -24,9 +24,6 @@
 import static org.citrusframework.dsl.XmlSupport.xml;
 import static org.citrusframework.ws.actions.SoapActionBuilder.soap;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class SoapMimeHeaderJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleAttachmentIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleAttachmentIT.java
index 829a493eb7..826218ac36 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleAttachmentIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleAttachmentIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2009
  */
 public class SoapMultipleAttachmentIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleHeaderFragmentIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleHeaderFragmentIT.java
index c13fbb1a2e..52215a4289 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleHeaderFragmentIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapMultipleHeaderFragmentIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2011
  */
 public class SoapMultipleHeaderFragmentIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapSchemaValidationIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapSchemaValidationIT.java
index b8b4780b8f..b24ed35f5d 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapSchemaValidationIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapSchemaValidationIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class SoapSchemaValidationIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapWsdlRequestIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapWsdlRequestIT.java
index c4d460f616..b9cc3404c0 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapWsdlRequestIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/SoapWsdlRequestIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapWsdlRequestIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceClientIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceClientIT.java
index fa18bf4e47..a022b879e8 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceClientIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceClientIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class WebServiceClientIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceClientJavaIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceClientJavaIT.java
index 5f046bfca7..d74673810e 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceClientJavaIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceClientJavaIT.java
@@ -24,9 +24,6 @@
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 import static org.citrusframework.dsl.XmlSupport.xml;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class WebServiceClientJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceEndpointFactoryIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceEndpointFactoryIT.java
index 3a23415523..36c6f46fed 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceEndpointFactoryIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceEndpointFactoryIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class WebServiceEndpointFactoryIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceServerIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceServerIT.java
index 377e7ab3a7..a495ec84f1 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceServerIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceServerIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class WebServiceServerIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceServerJavaIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceServerJavaIT.java
index 5734271cf3..c8e4390af4 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceServerJavaIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WebServiceServerJavaIT.java
@@ -27,9 +27,6 @@
 import static org.citrusframework.dsl.MessageSupport.MessageHeaderSupport.fromHeaders;
 import static org.citrusframework.dsl.XmlSupport.xml;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class WebServiceServerJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WsAddressingIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WsAddressingIT.java
index d37ed9bb5d..86dbb493f9 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WsAddressingIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WsAddressingIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2010
  */
 public class WsAddressingIT extends TestNGCitrusSpringSupport {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WsAddressingJavaIT.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WsAddressingJavaIT.java
index 993fecd8c1..3b3547e1d7 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WsAddressingJavaIT.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/integration/WsAddressingJavaIT.java
@@ -23,9 +23,6 @@
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 import static org.citrusframework.ws.actions.AssertSoapFault.Builder.assertSoapFault;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class WsAddressingJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/interceptor/DelegatingEndpointInterceptorTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/interceptor/DelegatingEndpointInterceptorTest.java
index 3d4ecffc3f..9bc0ca902a 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/interceptor/DelegatingEndpointInterceptorTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/interceptor/DelegatingEndpointInterceptorTest.java
@@ -37,7 +37,6 @@
 
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class DelegatingEndpointInterceptorTest {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/interceptor/SoapMustUnderstandEndpointInterceptorTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/interceptor/SoapMustUnderstandEndpointInterceptorTest.java
index 130b1dfff6..fbd07ade31 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/interceptor/SoapMustUnderstandEndpointInterceptorTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/interceptor/SoapMustUnderstandEndpointInterceptorTest.java
@@ -29,9 +29,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapMustUnderstandEndpointInterceptorTest {
 
     @Test
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapAttachmentTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapAttachmentTest.java
index 5f5a74af32..5bd9d624a4 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapAttachmentTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapAttachmentTest.java
@@ -38,9 +38,6 @@
 import static org.mockito.Mockito.when;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapAttachmentTest {
 
     private final Attachment attachment = Mockito.mock(Attachment.class);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapFaultTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapFaultTest.java
index dc9dfe6395..e54bb8439d 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapFaultTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapFaultTest.java
@@ -19,9 +19,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapFaultTest {
 
     @Test
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapFormattingMessageProcessorTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapFormattingMessageProcessorTest.java
index 4059a8ba6d..45f83cf25d 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapFormattingMessageProcessorTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/SoapFormattingMessageProcessorTest.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class SoapFormattingMessageProcessorTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapRequestMessageCallbackTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapRequestMessageCallbackTest.java
index 0baf8200ca..889d149935 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapRequestMessageCallbackTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapRequestMessageCallbackTest.java
@@ -46,9 +46,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapRequestMessageCallbackTest extends AbstractTestNGUnitTest {
 
     private final SoapMessage soapRequest = Mockito.mock(SoapMessage.class);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapResponseMessageCallbackTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapResponseMessageCallbackTest.java
index cc3e57066e..817b6afeda 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapResponseMessageCallbackTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/callback/SoapResponseMessageCallbackTest.java
@@ -42,9 +42,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapResponseMessageCallbackTest extends AbstractTestNGUnitTest {
 
     private org.springframework.ws.soap.SoapMessage soapResponse = Mockito.mock(org.springframework.ws.soap.SoapMessage.class);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/converter/WsAddressingMessageConverterTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/converter/WsAddressingMessageConverterTest.java
index ce77ad84e4..7889f956c8 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/converter/WsAddressingMessageConverterTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/message/converter/WsAddressingMessageConverterTest.java
@@ -44,7 +44,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class WsAddressingMessageConverterTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/servlet/CitrusMessageDispatcherServletTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/servlet/CitrusMessageDispatcherServletTest.java
index 4ba0167f80..e056245dca 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/servlet/CitrusMessageDispatcherServletTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/servlet/CitrusMessageDispatcherServletTest.java
@@ -40,7 +40,6 @@
 
 
 /**
- * @author Christoph Deppisch
  * @since 1.4.1
  */
 public class CitrusMessageDispatcherServletTest extends AbstractTestNGUnitTest {
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/validation/SimpleSoapAttachmentValidatorTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/validation/SimpleSoapAttachmentValidatorTest.java
index 0c9e9f3d57..574be5f630 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/validation/SimpleSoapAttachmentValidatorTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/validation/SimpleSoapAttachmentValidatorTest.java
@@ -24,9 +24,6 @@
 import org.citrusframework.ws.message.SoapMessage;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SimpleSoapAttachmentValidatorTest {
 
     @Test
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/validation/XmlSoapFaultValidatorTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/validation/XmlSoapFaultValidatorTest.java
index 76660d7a11..40d9e0141c 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/validation/XmlSoapFaultValidatorTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/validation/XmlSoapFaultValidatorTest.java
@@ -22,9 +22,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class XmlSoapFaultValidatorTest extends AbstractTestNGUnitTest {
 
     @Autowired
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/AbstractXmlActionTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/AbstractXmlActionTest.java
index 5b5e1b442b..f9572020e0 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/AbstractXmlActionTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/AbstractXmlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractXmlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/AssertSoapFaultTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/AssertSoapFaultTest.java
index ddb5792298..ad54cefc91 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/AssertSoapFaultTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/AssertSoapFaultTest.java
@@ -45,9 +45,6 @@
 
 import static org.citrusframework.ws.endpoint.builder.WebServiceEndpoints.soap;
 
-/**
- * @author Christoph Deppisch
- */
 public class AssertSoapFaultTest extends AbstractXmlActionTest {
 
     private final int port = SocketUtils.findAvailableTcpPort(8080);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/SendSoapFaultTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/SendSoapFaultTest.java
index 16ddc1f08d..8a6d068e63 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/SendSoapFaultTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/SendSoapFaultTest.java
@@ -42,9 +42,6 @@
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 import static org.citrusframework.ws.endpoint.builder.WebServiceEndpoints.soap;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendSoapFaultTest extends AbstractXmlActionTest {
 
     private WebServiceServer soapServer;
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/SoapClientTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/SoapClientTest.java
index d6e7a8a02c..b4ea0f1e72 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/SoapClientTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/SoapClientTest.java
@@ -50,9 +50,6 @@
 
 import static org.citrusframework.ws.endpoint.builder.WebServiceEndpoints.soap;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapClientTest extends AbstractXmlActionTest {
 
     private final int port = SocketUtils.findAvailableTcpPort(8080);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/SoapServerTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/SoapServerTest.java
index 439a3f9888..f11b14ac7f 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/SoapServerTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/xml/SoapServerTest.java
@@ -45,9 +45,6 @@
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 import static org.citrusframework.ws.endpoint.builder.WebServiceEndpoints.soap;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapServerTest extends AbstractXmlActionTest {
 
     private WebServiceServer soapServer;
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/AbstractYamlActionTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/AbstractYamlActionTest.java
index d322593ee8..9fc147066b 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/AbstractYamlActionTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/AbstractYamlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractYamlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/AssertSoapFaultTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/AssertSoapFaultTest.java
index 380f37986c..225f48ce53 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/AssertSoapFaultTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/AssertSoapFaultTest.java
@@ -45,9 +45,6 @@
 
 import static org.citrusframework.ws.endpoint.builder.WebServiceEndpoints.soap;
 
-/**
- * @author Christoph Deppisch
- */
 public class AssertSoapFaultTest extends AbstractYamlActionTest {
 
     private final int port = SocketUtils.findAvailableTcpPort(8080);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/SendSoapFaultTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/SendSoapFaultTest.java
index d184fc32f9..0ce04b291d 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/SendSoapFaultTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/SendSoapFaultTest.java
@@ -42,9 +42,6 @@
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 import static org.citrusframework.ws.endpoint.builder.WebServiceEndpoints.soap;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendSoapFaultTest extends AbstractYamlActionTest {
 
     private WebServiceServer soapServer;
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/SoapClientTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/SoapClientTest.java
index 8471979d88..6080811a16 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/SoapClientTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/SoapClientTest.java
@@ -48,9 +48,6 @@
 
 import static org.citrusframework.ws.endpoint.builder.WebServiceEndpoints.soap;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapClientTest extends AbstractYamlActionTest {
 
     private final int port = SocketUtils.findAvailableTcpPort(8080);
diff --git a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/SoapServerTest.java b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/SoapServerTest.java
index 2dc486fcbb..7f1212a6bc 100644
--- a/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/SoapServerTest.java
+++ b/endpoints/citrus-ws/src/test/java/org/citrusframework/ws/yaml/SoapServerTest.java
@@ -45,9 +45,6 @@
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 import static org.citrusframework.ws.endpoint.builder.WebServiceEndpoints.soap;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapServerTest extends AbstractYamlActionTest {
 
     private WebServiceServer soapServer;
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/actions/ZooExecuteAction.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/actions/ZooExecuteAction.java
index a158a3335b..32ceffbffb 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/actions/ZooExecuteAction.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/actions/ZooExecuteAction.java
@@ -57,7 +57,6 @@
 /**
  * Executes zookeeper command with given zookeeper client implementation. Possible command result is stored within command object.
  *
- * @author Martin Maher
  * @since 2.5
  */
 public class ZooExecuteAction extends AbstractTestAction {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/client/ZooClient.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/client/ZooClient.java
index 1a660ab00c..cff913f662 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/client/ZooClient.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/client/ZooClient.java
@@ -27,7 +27,6 @@
 /**
  * Zookeeper client used for executing zookeeper commands.
  *
- * @author Martin Maher
  * @since 2.5
  */
 public class ZooClient {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/client/ZooClientConfig.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/client/ZooClientConfig.java
index 138b9ba9c2..a4f51b831f 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/client/ZooClientConfig.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/client/ZooClientConfig.java
@@ -17,7 +17,6 @@
 package org.citrusframework.zookeeper.client;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class ZooClientConfig {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/AbstractZooCommand.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/AbstractZooCommand.java
index df2930d3b4..1cc3ef944b 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/AbstractZooCommand.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/AbstractZooCommand.java
@@ -23,7 +23,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public abstract class AbstractZooCommand<R> implements ZooCommand {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/CommandHelper.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/CommandHelper.java
index 634188c562..bb97b78da0 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/CommandHelper.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/CommandHelper.java
@@ -19,7 +19,6 @@
 import org.apache.zookeeper.data.Stat;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class CommandHelper {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/CommandResultCallback.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/CommandResultCallback.java
index e4fcf1fab8..a88962a6d1 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/CommandResultCallback.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/CommandResultCallback.java
@@ -19,7 +19,6 @@
 import org.citrusframework.context.TestContext;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public interface CommandResultCallback<R> {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Create.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Create.java
index ab55d5aa7f..4c6363c262 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Create.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Create.java
@@ -31,7 +31,6 @@
 import static java.lang.String.format;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class Create extends AbstractZooCommand<ZooResponse> {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Delete.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Delete.java
index 85b0fc5b52..5032809e19 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Delete.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Delete.java
@@ -26,7 +26,6 @@
 import static java.lang.Integer.parseInt;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class Delete extends AbstractZooCommand<ZooResponse> {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Exists.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Exists.java
index 95a1fe8bd7..d7b5f9ee2e 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Exists.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Exists.java
@@ -25,7 +25,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class Exists extends AbstractZooCommand<ZooResponse> {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/GetChildren.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/GetChildren.java
index e624bf60e5..85ea9e97f0 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/GetChildren.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/GetChildren.java
@@ -27,7 +27,6 @@
 import java.util.List;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class GetChildren extends AbstractZooCommand<ZooResponse> {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/GetData.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/GetData.java
index 6c2812177a..826d3a05c6 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/GetData.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/GetData.java
@@ -24,7 +24,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class GetData extends AbstractZooCommand<ZooResponse> {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Info.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Info.java
index 342b111b6c..e02b606819 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Info.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/Info.java
@@ -22,7 +22,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class Info extends AbstractZooCommand<ZooResponse> {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/SetData.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/SetData.java
index 4dca60495e..925f9ce435 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/SetData.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/SetData.java
@@ -27,7 +27,6 @@
 import static java.lang.Integer.parseInt;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class SetData extends AbstractZooCommand<ZooResponse> {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/ZooCommand.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/ZooCommand.java
index 3d4525c933..44d883a675 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/ZooCommand.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/ZooCommand.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public interface ZooCommand<R> {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/ZooResponse.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/ZooResponse.java
index bb287714d6..617f38aff3 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/ZooResponse.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/command/ZooResponse.java
@@ -20,7 +20,6 @@
 import java.util.Map;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class ZooResponse {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/handler/CitrusZooConfigNamespaceHandler.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/handler/CitrusZooConfigNamespaceHandler.java
index 369c7135bf..3e99b53754 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/handler/CitrusZooConfigNamespaceHandler.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/handler/CitrusZooConfigNamespaceHandler.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class CitrusZooConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/handler/CitrusZooTestcaseNamespaceHandler.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/handler/CitrusZooTestcaseNamespaceHandler.java
index 765584140c..d65950ba1a 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/handler/CitrusZooTestcaseNamespaceHandler.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/handler/CitrusZooTestcaseNamespaceHandler.java
@@ -21,7 +21,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class CitrusZooTestcaseNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/xml/ZooClientParser.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/xml/ZooClientParser.java
index f3e39bc7bd..aac3330eaa 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/xml/ZooClientParser.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/xml/ZooClientParser.java
@@ -27,7 +27,6 @@
 /**
  * Bean definition parser for zookeeper client instance.
  *
- * @author Martin Maher
  * @since 2.5
  */
 public class ZooClientParser implements BeanDefinitionParser {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/xml/ZooExecuteActionParser.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/xml/ZooExecuteActionParser.java
index b159209b5c..468e1c0c36 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/xml/ZooExecuteActionParser.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/config/xml/ZooExecuteActionParser.java
@@ -49,7 +49,6 @@
 /**
  * Bean definition parser for zookeeper client action in test case.
  *
- * @author Martin Maher
  * @since 2.5
  */
 public class ZooExecuteActionParser implements BeanDefinitionParser {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/message/ZooMessageHeaders.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/message/ZooMessageHeaders.java
index 558dd63306..021cf703fc 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/message/ZooMessageHeaders.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/message/ZooMessageHeaders.java
@@ -19,7 +19,6 @@
 import org.citrusframework.message.MessageHeaders;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class ZooMessageHeaders {
diff --git a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/server/ZooServer.java b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/server/ZooServer.java
index 4a0994b09e..ecdca1209a 100644
--- a/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/server/ZooServer.java
+++ b/endpoints/citrus-zookeeper/src/main/java/org/citrusframework/zookeeper/server/ZooServer.java
@@ -30,7 +30,6 @@
 /**
  * Simple ZooKeeper server standalone instance.
  *
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class ZooServer extends AbstractServer {
diff --git a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/UnitTestSupport.java b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/UnitTestSupport.java
index ab928ff3d4..cafe8e9f9a 100644
--- a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/UnitTestSupport.java
+++ b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/UnitTestSupport.java
@@ -20,9 +20,6 @@
 import org.citrusframework.context.TestContextFactory;
 import org.testng.annotations.BeforeMethod;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport {
 
     protected TestContextFactory testContextFactory;
diff --git a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/actions/dsl/ZooExecuteTestActionBuilderTest.java b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/actions/dsl/ZooExecuteTestActionBuilderTest.java
index cd916a3d76..4c99b9bb3d 100644
--- a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/actions/dsl/ZooExecuteTestActionBuilderTest.java
+++ b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/actions/dsl/ZooExecuteTestActionBuilderTest.java
@@ -39,7 +39,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class ZooExecuteTestActionBuilderTest extends UnitTestSupport {
diff --git a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/config/xml/ZooClientParserTest.java b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/config/xml/ZooClientParserTest.java
index 98af90d0ba..f171c65bc6 100644
--- a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/config/xml/ZooClientParserTest.java
+++ b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/config/xml/ZooClientParserTest.java
@@ -28,9 +28,6 @@
 import static org.citrusframework.zookeeper.client.ZooClientConfig.ZooKeeperClientConfigBuilder.DEFAULT_TIMEOUT;
 import static org.citrusframework.zookeeper.client.ZooClientConfig.ZooKeeperClientConfigBuilder.DEFAULT_URL;
 
-/**
- * @author Martin Maher
- */
 public class ZooClientParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/integration/ZooExecuteIT.java b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/integration/ZooExecuteIT.java
index dbdd48bbef..d01fd146fa 100644
--- a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/integration/ZooExecuteIT.java
+++ b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/integration/ZooExecuteIT.java
@@ -26,7 +26,6 @@
  * A Zookeeper server must be running for this test to succeed. The zookeeper maven
  * plugin can be used for starting and stopping the server on demand.
  *
- * @author Martin Maher
  * @since 2.5
  */
 @Test
diff --git a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/integration/ZooExecuteJavaIT.java b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/integration/ZooExecuteJavaIT.java
index cac00564c0..b013035238 100644
--- a/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/integration/ZooExecuteJavaIT.java
+++ b/endpoints/citrus-zookeeper/src/test/java/org/citrusframework/zookeeper/integration/ZooExecuteJavaIT.java
@@ -27,7 +27,6 @@
 import static org.citrusframework.zookeeper.actions.ZooExecuteAction.Builder.zookeeper;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class ZooExecuteJavaIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/CitrusLifecycleHooks.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/CitrusLifecycleHooks.java
index 30fd8f3baf..7fcd4bf7d9 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/CitrusLifecycleHooks.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/CitrusLifecycleHooks.java
@@ -27,7 +27,6 @@
 import static java.lang.String.format;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusLifecycleHooks {
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/CitrusReporter.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/CitrusReporter.java
index 0ad090d4e2..aba81c2333 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/CitrusReporter.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/CitrusReporter.java
@@ -25,7 +25,6 @@
 import io.cucumber.plugin.event.TestRunFinished;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusReporter implements SummaryPrinter, ColorAware, ConcurrentEventListener {
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/CucumberTestEngine.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/CucumberTestEngine.java
index 2aa1a8f984..2ecdcdf7bf 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/CucumberTestEngine.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/CucumberTestEngine.java
@@ -45,9 +45,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public class CucumberTestEngine extends AbstractTestEngine {
 
     /** Logger */
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusBackend.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusBackend.java
index 232a8f7936..53ba8e0b5b 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusBackend.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusBackend.java
@@ -31,7 +31,6 @@
 import org.citrusframework.cucumber.CitrusReporter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusBackend implements Backend {
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusBackendProviderService.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusBackendProviderService.java
index 38fe3b1dfd..99bdc8cb5a 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusBackendProviderService.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusBackendProviderService.java
@@ -25,9 +25,6 @@
 import io.cucumber.core.backend.Lookup;
 import org.citrusframework.spi.Resources;
 
-/**
- * @author Christoph Deppisch
- */
 public class CitrusBackendProviderService implements BackendProviderService {
     @Override
     public Backend create(Lookup lookup, Container container, Supplier<ClassLoader> classLoader) {
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusHookDefinition.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusHookDefinition.java
index eb2b33d8ab..ec5032230b 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusHookDefinition.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusHookDefinition.java
@@ -24,9 +24,6 @@
 import io.cucumber.core.backend.TestCaseState;
 import org.citrusframework.util.ReflectionHelper;
 
-/**
- * @author Christoph Deppisch
- */
 public class CitrusHookDefinition implements HookDefinition {
 
     private final Method method;
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusObjectFactory.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusObjectFactory.java
index 49ce730857..e83d7a3add 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusObjectFactory.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/CitrusObjectFactory.java
@@ -30,7 +30,6 @@
 import org.citrusframework.context.TestContext;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusObjectFactory implements ObjectFactory {
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/NoopSnippet.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/NoopSnippet.java
index 9ba16439a3..7f4f64bd7e 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/NoopSnippet.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/NoopSnippet.java
@@ -22,9 +22,6 @@
 
 import io.cucumber.core.backend.Snippet;
 
-/**
- * @author Christoph Deppisch
- */
 public class NoopSnippet implements Snippet {
     @Override
     public MessageFormat template() {
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/Scenario.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/Scenario.java
index 1590200983..ad25a1cf46 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/Scenario.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/Scenario.java
@@ -22,9 +22,6 @@
 import io.cucumber.core.backend.TestCaseState;
 import io.cucumber.java.Status;
 
-/**
- * @author Christoph Deppisch
- */
 public final class Scenario {
 
     private final TestCaseState delegate;
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/spring/CitrusSpringBackend.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/spring/CitrusSpringBackend.java
index 15804f4751..7ce823bf31 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/spring/CitrusSpringBackend.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/spring/CitrusSpringBackend.java
@@ -36,9 +36,6 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-/**
- * @author Christoph Deppisch
- */
 public class CitrusSpringBackend extends CitrusBackend {
 
     /** Logger */
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/spring/CitrusSpringObjectFactory.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/spring/CitrusSpringObjectFactory.java
index 79da679149..19e6dc0ba0 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/spring/CitrusSpringObjectFactory.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/backend/spring/CitrusSpringObjectFactory.java
@@ -34,7 +34,6 @@
 import org.springframework.context.ApplicationContext;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusSpringObjectFactory implements ObjectFactory {
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/config/handler/CucumberTestcaseNamespaceHandler.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/config/handler/CucumberTestcaseNamespaceHandler.java
index b07bc9238e..7224752700 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/config/handler/CucumberTestcaseNamespaceHandler.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/config/handler/CucumberTestcaseNamespaceHandler.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CucumberTestcaseNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/config/xml/StepTemplateParser.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/config/xml/StepTemplateParser.java
index 2393d3c4fb..9aa3a9f663 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/config/xml/StepTemplateParser.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/config/xml/StepTemplateParser.java
@@ -33,7 +33,6 @@
 
 /**
  * Parser configures a step template with pattern and parameter names.
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class StepTemplateParser implements BeanDefinitionParser {
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/container/StepTemplate.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/container/StepTemplate.java
index 52a3052d76..7e34c7f4a1 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/container/StepTemplate.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/container/StepTemplate.java
@@ -29,7 +29,6 @@
  * optional parameter names for step arguments. By default this template is non global meaning that all parameter test variables
  * are only visible within the template.
  *
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class StepTemplate extends Template {
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/step/xml/XmlStepDefinition.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/step/xml/XmlStepDefinition.java
index 041993d13e..3e8d2d693c 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/step/xml/XmlStepDefinition.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/step/xml/XmlStepDefinition.java
@@ -29,7 +29,6 @@
 
 /**
  * Special step definition that runs a XML step definition template on execution.
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class XmlStepDefinition implements StepDefinition {
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/step/xml/XmlStepParameterInfo.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/step/xml/XmlStepParameterInfo.java
index 4d6d60114c..410291a7ad 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/step/xml/XmlStepParameterInfo.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/step/xml/XmlStepParameterInfo.java
@@ -21,9 +21,6 @@
 import io.cucumber.core.backend.ParameterInfo;
 import io.cucumber.core.backend.TypeResolver;
 
-/**
- * @author Christoph Deppisch
- */
 public class XmlStepParameterInfo implements ParameterInfo {
 
     private final Type type;
diff --git a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/step/xml/XmlSteps.java b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/step/xml/XmlSteps.java
index ec880883cb..b590378b7d 100644
--- a/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/step/xml/XmlSteps.java
+++ b/runtime/citrus-cucumber/src/main/java/org/citrusframework/cucumber/step/xml/XmlSteps.java
@@ -24,7 +24,6 @@
 
 /**
  * Step executes a XML template on test designer. The template is provided with step arguments as test template parameters.
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class XmlSteps {
diff --git a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/CucumberTestEngineTest.java b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/CucumberTestEngineTest.java
index aa6efc00a8..bd62244105 100644
--- a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/CucumberTestEngineTest.java
+++ b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/CucumberTestEngineTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CucumberTestEngineTest {
 
     @Test
diff --git a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/UnitTestSupport.java b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/UnitTestSupport.java
index 55c8182077..ce3dfa328d 100644
--- a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/UnitTestSupport.java
+++ b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/UnitTestSupport.java
@@ -33,9 +33,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 
-/**
- * @author Christoph Deppisch
- */
 @ContextConfiguration(classes = CitrusSpringConfig.class)
 public class UnitTestSupport extends AbstractTestNGUnitTest {
 
diff --git a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/CitrusLifecycleHooksTest.java b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/CitrusLifecycleHooksTest.java
index e742fc4372..eacc139acc 100644
--- a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/CitrusLifecycleHooksTest.java
+++ b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/CitrusLifecycleHooksTest.java
@@ -42,9 +42,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Christoph Deppisch
- */
 public class CitrusLifecycleHooksTest extends UnitTestSupport {
 
     @Mock
diff --git a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/CitrusObjectFactoryTest.java b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/CitrusObjectFactoryTest.java
index 798e2625d3..2950884fe7 100644
--- a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/CitrusObjectFactoryTest.java
+++ b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/CitrusObjectFactoryTest.java
@@ -20,7 +20,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusObjectFactoryTest {
diff --git a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/TestRunnerSteps.java b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/TestRunnerSteps.java
index 3c11b6777d..e95c78bfde 100644
--- a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/TestRunnerSteps.java
+++ b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/TestRunnerSteps.java
@@ -21,7 +21,6 @@
 import org.citrusframework.context.TestContext;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class TestRunnerSteps {
diff --git a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/spring/CitrusSpringObjectFactoryTest.java b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/spring/CitrusSpringObjectFactoryTest.java
index 63ad7ccfb5..c0fc4c53af 100644
--- a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/spring/CitrusSpringObjectFactoryTest.java
+++ b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/spring/CitrusSpringObjectFactoryTest.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusSpringObjectFactoryTest {
diff --git a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/spring/SpringRunnerSteps.java b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/spring/SpringRunnerSteps.java
index 05cd6b81f4..9fda58bb8f 100644
--- a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/spring/SpringRunnerSteps.java
+++ b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/backend/spring/SpringRunnerSteps.java
@@ -24,7 +24,6 @@
 import org.springframework.test.context.ContextConfiguration;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 @CucumberContextConfiguration
diff --git a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/config/xml/StepTemplateParserTest.java b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/config/xml/StepTemplateParserTest.java
index 69b3991fb1..de4a92b114 100644
--- a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/config/xml/StepTemplateParserTest.java
+++ b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/config/xml/StepTemplateParserTest.java
@@ -26,7 +26,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class StepTemplateParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/integration/birthday/BirthdayXmlFeatureIT.java b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/integration/birthday/BirthdayXmlFeatureIT.java
index 520b6a6ad9..7596cf9106 100644
--- a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/integration/birthday/BirthdayXmlFeatureIT.java
+++ b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/integration/birthday/BirthdayXmlFeatureIT.java
@@ -21,7 +21,6 @@
 import org.junit.runner.RunWith;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 @RunWith(Cucumber.class)
diff --git a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/integration/echo/EchoFeatureIT.java b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/integration/echo/EchoFeatureIT.java
index 4e849cd149..8c763482e2 100644
--- a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/integration/echo/EchoFeatureIT.java
+++ b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/integration/echo/EchoFeatureIT.java
@@ -21,7 +21,6 @@
 import org.junit.runner.RunWith;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 @RunWith(Cucumber.class)
diff --git a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/integration/echo/EchoSteps.java b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/integration/echo/EchoSteps.java
index 911a916ef3..7c2fb6de6f 100644
--- a/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/integration/echo/EchoSteps.java
+++ b/runtime/citrus-cucumber/src/test/java/org/citrusframework/cucumber/integration/echo/EchoSteps.java
@@ -28,7 +28,6 @@
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class EchoSteps {
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/config/xml/GroovyActionParser.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/config/xml/GroovyActionParser.java
index bf5378a436..1c8f4a7e98 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/config/xml/GroovyActionParser.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/config/xml/GroovyActionParser.java
@@ -28,7 +28,6 @@
 /**
  * Bean definition parser for groovy action in test case.
  *
- * @author Christoph Deppisch
  */
 public class GroovyActionParser implements BeanDefinitionParser {
 
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/config/xml/parser/GroovyScriptMessageBuilderParser.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/config/xml/parser/GroovyScriptMessageBuilderParser.java
index 42e5d78a23..cd4c1d74a0 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/config/xml/parser/GroovyScriptMessageBuilderParser.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/config/xml/parser/GroovyScriptMessageBuilderParser.java
@@ -23,9 +23,6 @@
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyScriptMessageBuilderParser implements ScriptMessageBuilderParser {
 
     @Override
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/GroovyTestLoader.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/GroovyTestLoader.java
index f59744fb0e..7c521cd8af 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/GroovyTestLoader.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/GroovyTestLoader.java
@@ -28,9 +28,6 @@
 import org.citrusframework.util.StringUtils;
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyTestLoader extends DefaultTestLoader implements TestSourceAware {
 
     private String source;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/GroovyScript.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/GroovyScript.java
index d378fec9f6..8193f65157 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/GroovyScript.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/GroovyScript.java
@@ -21,9 +21,6 @@
 import groovy.lang.MissingPropertyException;
 import groovy.util.DelegatingScript;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class GroovyScript extends DelegatingScript {
 
     private Citrus citrusFramework;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/GroovyShellUtils.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/GroovyShellUtils.java
index 13bf07c479..dc71779ded 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/GroovyShellUtils.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/GroovyShellUtils.java
@@ -28,9 +28,6 @@
 import org.codehaus.groovy.control.CompilerConfiguration;
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyShellUtils {
 
     private static final Pattern COMMENTS = Pattern.compile("^(?:\\s*//|/\\*|\\s+\\*).*$", Pattern.MULTILINE);
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/Action.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/Action.java
index 4faf9926cb..4dddaa0182 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/Action.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/Action.java
@@ -22,9 +22,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 public class Action implements TestActionBuilder<TestAction>, ReferenceResolverAware {
 
     private String reference;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ActionsBuilder.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ActionsBuilder.java
index 17a92b058a..6573d3362b 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ActionsBuilder.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ActionsBuilder.java
@@ -30,9 +30,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 public interface ActionsBuilder {
 
     /**
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ActionsConfiguration.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ActionsConfiguration.java
index 86066aa0c6..3fa625d8e2 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ActionsConfiguration.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ActionsConfiguration.java
@@ -25,9 +25,6 @@
 import groovy.lang.Closure;
 import groovy.lang.DelegatesTo;
 
-/**
- * @author Christoph Deppisch
- */
 public class ActionsConfiguration implements ActionsBuilder {
 
     private final TestActionRunner runner;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ActionsScript.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ActionsScript.java
index 075236acdc..af8d8cd2b4 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ActionsScript.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ActionsScript.java
@@ -22,9 +22,6 @@
 import org.citrusframework.groovy.dsl.GroovyShellUtils;
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
 
-/**
- * @author Christoph Deppisch
- */
 public class ActionsScript {
 
     private final String script;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/FinallyActionsBuilder.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/FinallyActionsBuilder.java
index e462a3f694..727f681d01 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/FinallyActionsBuilder.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/FinallyActionsBuilder.java
@@ -23,9 +23,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.container.FinallySequence;
 
-/**
- * @author Christoph Deppisch
- */
 public class FinallyActionsBuilder extends GroovyObjectSupport implements ActionsBuilder, Supplier<FinallySequence.Builder> {
 
     private final FinallySequence.Builder builder = new FinallySequence.Builder();
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ReceiveActionBuilderWrapper.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ReceiveActionBuilderWrapper.java
index f11ccb3f7a..b834a9ede4 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ReceiveActionBuilderWrapper.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/ReceiveActionBuilderWrapper.java
@@ -26,9 +26,6 @@
 import org.citrusframework.message.builder.ReceiveMessageBuilderSupport;
 import org.citrusframework.util.FileUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveActionBuilderWrapper extends ReceiveMessageAction.ReceiveMessageActionBuilder<ReceiveMessageAction, ReceiveActionBuilderWrapper.ReceiveMessageActionBuilderSupport, ReceiveActionBuilderWrapper> {
 
     public ReceiveMessageActionBuilderSupport message(Closure<?> callable) {
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/SendActionBuilderWrapper.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/SendActionBuilderWrapper.java
index a0431064fd..5bb8316085 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/SendActionBuilderWrapper.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/SendActionBuilderWrapper.java
@@ -26,9 +26,6 @@
 import groovy.lang.Closure;
 import org.citrusframework.util.FileUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendActionBuilderWrapper extends SendMessageAction.SendMessageActionBuilder<SendMessageAction, SendActionBuilderWrapper.SendMessageActionBuilderSupport, SendActionBuilderWrapper> {
 
     public SendMessageActionBuilderSupport message(Closure<?> callable) {
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/TemplateConfiguration.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/TemplateConfiguration.java
index fbc3b20882..9d2bf64e07 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/TemplateConfiguration.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/TemplateConfiguration.java
@@ -25,9 +25,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.container.Template;
 
-/**
- * @author Christoph Deppisch
- */
 public class TemplateConfiguration implements ActionsBuilder {
 
     private final Template.Builder target;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/BodySpec.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/BodySpec.java
index b9dc631bd5..47c3834502 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/BodySpec.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/BodySpec.java
@@ -19,9 +19,6 @@
 import groovy.lang.GroovyObjectSupport;
 import groovy.lang.MissingMethodException;
 
-/**
- * @author Christoph Deppisch
- */
 public class BodySpec extends GroovyObjectSupport {
 
     private BodySpec delegate;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/HeaderSpec.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/HeaderSpec.java
index 303b769fbe..5233648452 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/HeaderSpec.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/HeaderSpec.java
@@ -22,9 +22,6 @@
 
 import groovy.lang.GroovyObjectSupport;
 
-/**
- * @author Christoph Deppisch
- */
 public class HeaderSpec extends GroovyObjectSupport implements Supplier<Map<String, Object>> {
 
     private final Map<String, Object> headers = new LinkedHashMap<>();
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/JsonBodySpec.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/JsonBodySpec.java
index 0b480187b3..601644e5c1 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/JsonBodySpec.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/JsonBodySpec.java
@@ -18,9 +18,6 @@
 
 import groovy.json.JsonBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class JsonBodySpec extends BodySpec {
 
     private JsonBuilder jsonBuilder;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/XmlBodySpec.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/XmlBodySpec.java
index 90cf05e96c..b2a73e5a3f 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/XmlBodySpec.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/actions/model/XmlBodySpec.java
@@ -20,9 +20,6 @@
 
 import groovy.xml.MarkupBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class XmlBodySpec extends BodySpec {
 
     private MarkupBuilder markupBuilder;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/ConfigurationScript.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/ConfigurationScript.java
index 2f39c7dcc5..b6883778f1 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/ConfigurationScript.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/ConfigurationScript.java
@@ -21,9 +21,6 @@
 import org.citrusframework.groovy.dsl.GroovyShellUtils;
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
 
-/**
- * @author Christoph Deppisch
- */
 public class ConfigurationScript {
 
     private final Citrus citrus;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/ContextConfiguration.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/ContextConfiguration.java
index f9c20ff0b0..d228fd02c5 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/ContextConfiguration.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/ContextConfiguration.java
@@ -31,9 +31,6 @@
 import org.citrusframework.util.FileUtils;
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
 
-/**
- * @author Christoph Deppisch
- */
 public class ContextConfiguration {
 
     private final Citrus citrus;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/beans/BeansConfiguration.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/beans/BeansConfiguration.java
index 095eeadb39..1443ada0d0 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/beans/BeansConfiguration.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/beans/BeansConfiguration.java
@@ -27,9 +27,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 import org.citrusframework.message.DefaultMessageQueue;
 
-/**
- * @author Christoph Deppisch
- */
 public class BeansConfiguration extends GroovyObjectSupport {
 
     private final Citrus citrus;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/beans/QueueConfiguration.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/beans/QueueConfiguration.java
index 9896d4e0b1..e9232e5116 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/beans/QueueConfiguration.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/beans/QueueConfiguration.java
@@ -19,9 +19,6 @@
 import org.citrusframework.Citrus;
 import org.citrusframework.message.DefaultMessageQueue;
 
-/**
- * @author Christoph Deppisch
- */
 public class QueueConfiguration {
 
     private final Citrus citrus;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointBuilderConfiguration.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointBuilderConfiguration.java
index 83fe43ab10..aafea7c044 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointBuilderConfiguration.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointBuilderConfiguration.java
@@ -27,9 +27,6 @@
 import groovy.lang.MissingPropertyException;
 import org.citrusframework.util.ReflectionHelper;
 
-/**
- * @author Christoph Deppisch
- */
 public class EndpointBuilderConfiguration<T extends Endpoint> implements Supplier<T> {
 
     private final EndpointBuilder<T> builder;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointBuilderHelper.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointBuilderHelper.java
index 7473aa5999..4ae2c46108 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointBuilderHelper.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointBuilderHelper.java
@@ -19,9 +19,6 @@
 import org.citrusframework.endpoint.EndpointBuilder;
 import org.citrusframework.exceptions.CitrusRuntimeException;
 
-/**
- * @author Christoph Deppisch
- */
 public class EndpointBuilderHelper {
 
     /**
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointConfiguration.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointConfiguration.java
index 0aaf9e00e6..7c5c147dc1 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointConfiguration.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointConfiguration.java
@@ -25,9 +25,6 @@
 import groovy.lang.GroovyObjectSupport;
 import groovy.lang.MissingMethodException;
 
-/**
- * @author Christoph Deppisch
- */
 public class EndpointConfiguration extends GroovyObjectSupport implements Supplier<Endpoint> {
 
     private final String type;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointConfigurationScript.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointConfigurationScript.java
index 618f6b9386..04acdc1503 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointConfigurationScript.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointConfigurationScript.java
@@ -23,9 +23,6 @@
 import org.citrusframework.groovy.dsl.GroovyShellUtils;
 import org.codehaus.groovy.control.customizers.ImportCustomizer;
 
-/**
- * @author Christoph Deppisch
- */
 public class EndpointConfigurationScript {
 
     private final Citrus citrus;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointsConfiguration.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointsConfiguration.java
index a7a8473df3..7896d7826f 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointsConfiguration.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/configuration/endpoints/EndpointsConfiguration.java
@@ -28,9 +28,6 @@
 import groovy.lang.DelegatesTo;
 import groovy.lang.GroovyObjectSupport;
 
-/**
- * @author Christoph Deppisch
- */
 public class EndpointsConfiguration extends GroovyObjectSupport {
 
     private final Set<Supplier<Endpoint>> endpoints = new HashSet<>();
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/test/TestCaseScript.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/test/TestCaseScript.java
index a28b4b953a..37f38b9de7 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/test/TestCaseScript.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/test/TestCaseScript.java
@@ -30,9 +30,6 @@
 import groovy.lang.DelegatesTo;
 import groovy.lang.GroovyObjectSupport;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestCaseScript extends GroovyObjectSupport implements ActionsBuilder {
 
     private final Citrus citrus;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/test/VariablesConfiguration.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/test/VariablesConfiguration.java
index 8812101766..81239d61db 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/test/VariablesConfiguration.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/groovy/dsl/test/VariablesConfiguration.java
@@ -19,9 +19,6 @@
 import org.citrusframework.context.TestContext;
 import groovy.lang.GroovyObjectSupport;
 
-/**
- * @author Christoph Deppisch
- */
 public class VariablesConfiguration extends GroovyObjectSupport {
 
     private final TestContext context;
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/message/builder/script/GroovyFileResourcePayloadBuilder.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/message/builder/script/GroovyFileResourcePayloadBuilder.java
index b016fbed7b..9ac9d50c87 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/message/builder/script/GroovyFileResourcePayloadBuilder.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/message/builder/script/GroovyFileResourcePayloadBuilder.java
@@ -20,9 +20,6 @@
 import org.citrusframework.message.builder.FileResourcePayloadBuilder;
 import org.citrusframework.spi.Resource;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyFileResourcePayloadBuilder extends FileResourcePayloadBuilder {
 
     /**
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/message/builder/script/GroovyScriptPayloadBuilder.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/message/builder/script/GroovyScriptPayloadBuilder.java
index 6b9f74928d..8caea26ade 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/message/builder/script/GroovyScriptPayloadBuilder.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/message/builder/script/GroovyScriptPayloadBuilder.java
@@ -26,9 +26,6 @@
 import org.citrusframework.validation.script.TemplateBasedScriptBuilder;
 import org.codehaus.groovy.control.CompilationFailedException;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyScriptPayloadBuilder implements ScriptPayloadBuilder {
 
     /** Default path to script template */
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/script/GroovyAction.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/script/GroovyAction.java
index b301184d4a..9186ffe84f 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/script/GroovyAction.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/script/GroovyAction.java
@@ -37,7 +37,6 @@
 /**
  * Action executes groovy scripts either specified inline or from external file resource.
  *
- * @author Christoph Deppisch
  * @since 2006
  */
 public class GroovyAction extends AbstractTestAction {
diff --git a/runtime/citrus-groovy/src/main/java/org/citrusframework/util/GroovyTypeConverter.java b/runtime/citrus-groovy/src/main/java/org/citrusframework/util/GroovyTypeConverter.java
index bc18cc92b8..458c7193d7 100644
--- a/runtime/citrus-groovy/src/main/java/org/citrusframework/util/GroovyTypeConverter.java
+++ b/runtime/citrus-groovy/src/main/java/org/citrusframework/util/GroovyTypeConverter.java
@@ -21,9 +21,6 @@
 import groovy.lang.GString;
 import org.codehaus.groovy.runtime.GStringImpl;
 
-/**
- * @author Christoph Deppisch
- */
 public final class GroovyTypeConverter extends DefaultTypeConverter {
 
     public static GroovyTypeConverter INSTANCE = new GroovyTypeConverter();
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/UnitTestSupport.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/UnitTestSupport.java
index 69c2f799d4..5aaaa8cac8 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/UnitTestSupport.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/UnitTestSupport.java
@@ -21,9 +21,6 @@
 import org.citrusframework.validation.DefaultMessageHeaderValidator;
 import org.citrusframework.validation.DefaultTextEqualsMessageValidator;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport extends AbstractTestNGUnitTest {
 
     @Override
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/actions/ReceiveMessageActionTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/actions/ReceiveMessageActionTest.java
index 7c808f8a8c..b9a5b764f6 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/actions/ReceiveMessageActionTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/actions/ReceiveMessageActionTest.java
@@ -41,9 +41,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageActionTest extends AbstractTestNGUnitTest {
 
     @Mock
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/actions/SendMessageActionTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/actions/SendMessageActionTest.java
index 9124733749..58b9533fad 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/actions/SendMessageActionTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/actions/SendMessageActionTest.java
@@ -39,9 +39,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendMessageActionTest extends AbstractTestNGUnitTest {
 
     private Endpoint endpoint = Mockito.mock(Endpoint.class);
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/GroovyActionParserTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/GroovyActionParserTest.java
index 9d65be33be..6279776e12 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/GroovyActionParserTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/GroovyActionParserTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyActionParserTest extends AbstractActionParserTest<GroovyAction> {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/ReceiveMessageActionParserTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/ReceiveMessageActionParserTest.java
index eaae06444a..62391412f6 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/ReceiveMessageActionParserTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/ReceiveMessageActionParserTest.java
@@ -28,9 +28,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageActionParserTest extends AbstractActionParserTest<ReceiveMessageAction> {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/SendMessageActionParserTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/SendMessageActionParserTest.java
index f7d2ba53a6..8a91c37e39 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/SendMessageActionParserTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/SendMessageActionParserTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendMessageActionParserTest extends AbstractActionParserTest<SendMessageAction> {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/parser/GroovyScriptMessageBuilderParserTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/parser/GroovyScriptMessageBuilderParserTest.java
index fa04eb0e36..b14ad6e239 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/parser/GroovyScriptMessageBuilderParserTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/config/xml/parser/GroovyScriptMessageBuilderParserTest.java
@@ -19,9 +19,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyScriptMessageBuilderParserTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/GroovyTemplateLoaderTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/GroovyTemplateLoaderTest.java
index 29c092e9b8..ccdd2d768a 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/GroovyTemplateLoaderTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/GroovyTemplateLoaderTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyTemplateLoaderTest extends UnitTestSupport {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/GroovyTestLoaderTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/GroovyTestLoaderTest.java
index 7a0fb05603..c18cde5888 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/GroovyTestLoaderTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/GroovyTestLoaderTest.java
@@ -30,9 +30,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyTestLoaderTest extends UnitTestSupport {
 
     private Citrus citrus;
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/NoopMessageProcessor.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/NoopMessageProcessor.java
index 226be15dab..796d336c87 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/NoopMessageProcessor.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/NoopMessageProcessor.java
@@ -20,9 +20,6 @@
 import org.citrusframework.message.Message;
 import org.citrusframework.message.MessageProcessor;
 
-/**
- * @author Christoph Deppisch
- */
 public class NoopMessageProcessor implements MessageProcessor {
 
     @Override
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/NoopVariableExtractor.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/NoopVariableExtractor.java
index 06af70691c..19234eba43 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/NoopVariableExtractor.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/NoopVariableExtractor.java
@@ -22,9 +22,6 @@
 import org.citrusframework.message.Message;
 import org.citrusframework.variable.VariableExtractor;
 
-/**
- * @author Christoph Deppisch
- */
 public class NoopVariableExtractor implements VariableExtractor {
     @Override
     public void extractVariables(Message message, TestContext context) {
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/AbstractGroovyActionDslTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/AbstractGroovyActionDslTest.java
index b1b290e2c0..55a5347f35 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/AbstractGroovyActionDslTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/AbstractGroovyActionDslTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractGroovyActionDslTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ActionTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ActionTest.java
index f193f3161e..af7887fa6c 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ActionTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ActionTest.java
@@ -25,9 +25,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 public class ActionTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ApplyTemplateTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ApplyTemplateTest.java
index 23f15d7d7c..a0d7e48676 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ApplyTemplateTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ApplyTemplateTest.java
@@ -25,9 +25,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 public class ApplyTemplateTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/CreateVariablesTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/CreateVariablesTest.java
index 1a9b8178e3..aa68283dd7 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/CreateVariablesTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/CreateVariablesTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CreateVariablesTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/EchoTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/EchoTest.java
index 37a24501fa..675847ea59 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/EchoTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/EchoTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class EchoTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ExpectTimeoutTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ExpectTimeoutTest.java
index 8e5b47f0cc..30a4c1e87e 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ExpectTimeoutTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ExpectTimeoutTest.java
@@ -25,7 +25,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class ExpectTimeoutTest extends AbstractGroovyActionDslTest {
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/FailTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/FailTest.java
index ba1a431d8a..d3c9fb1678 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/FailTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/FailTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class FailTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/LoadPropertiesTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/LoadPropertiesTest.java
index 9b37b73f87..ee945240ce 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/LoadPropertiesTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/LoadPropertiesTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class LoadPropertiesTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/PurgeEndpointTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/PurgeEndpointTest.java
index a172b0eabc..044afca43a 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/PurgeEndpointTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/PurgeEndpointTest.java
@@ -28,9 +28,6 @@
 
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 
-/**
- * @author Christoph Deppisch
- */
 public class PurgeEndpointTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ReceiveTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ReceiveTest.java
index 3ff0321224..bfee57ff4d 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ReceiveTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/ReceiveTest.java
@@ -51,9 +51,6 @@
 
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveTest extends AbstractGroovyActionDslTest {
 
     @BindToRegistry
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/SendTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/SendTest.java
index 8740a445d1..e79b8dbb98 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/SendTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/SendTest.java
@@ -44,9 +44,6 @@
 
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendTest extends AbstractGroovyActionDslTest {
 
     @BindToRegistry
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/SleepTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/SleepTest.java
index 6db30ed7af..1a32a7fabc 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/SleepTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/SleepTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SleepTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/StartTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/StartTest.java
index c1832a1d10..2a3f6e1e59 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/StartTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/StartTest.java
@@ -30,9 +30,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class StartTest extends AbstractGroovyActionDslTest {
 
     @BindToRegistry
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/StopTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/StopTest.java
index c3a49e3bf2..9c21430ddc 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/StopTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/StopTest.java
@@ -30,9 +30,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopTest extends AbstractGroovyActionDslTest {
 
     @BindToRegistry
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/TraceVariablesTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/TraceVariablesTest.java
index 935b431e73..1838c61581 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/TraceVariablesTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/TraceVariablesTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TraceVariablesTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/TransformTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/TransformTest.java
index c738e2085c..73fd0bf441 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/TransformTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/TransformTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TransformTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/AssertTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/AssertTest.java
index 03416e457f..515e4de705 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/AssertTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/AssertTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AssertTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/AsyncTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/AsyncTest.java
index ba1b86a312..bddeefe474 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/AsyncTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/AsyncTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AsyncTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/CatchTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/CatchTest.java
index df5ea6fb3d..00df9255b8 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/CatchTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/CatchTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CatchTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/ConditionalTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/ConditionalTest.java
index b8093c193e..35126a5c8b 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/ConditionalTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/ConditionalTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ConditionalTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/IterateTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/IterateTest.java
index 28cea60911..94ca034faa 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/IterateTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/IterateTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class IterateTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/ParallelTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/ParallelTest.java
index 66a62d6621..2c4630d5bb 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/ParallelTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/ParallelTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ParallelTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/RepeatOnErrorTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/RepeatOnErrorTest.java
index 675b9600e1..942d735dfe 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/RepeatOnErrorTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/RepeatOnErrorTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RepeatOnErrorTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/RepeatTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/RepeatTest.java
index 81baa39af0..43800eb3f2 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/RepeatTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/RepeatTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RepeatTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/SequentialTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/SequentialTest.java
index bdceba7099..4a7b037683 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/SequentialTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/SequentialTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SequentialTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/TimerTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/TimerTest.java
index 6701fc983f..f4551782ef 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/TimerTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/TimerTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TimerTest extends AbstractGroovyActionDslTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/WaitForTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/WaitForTest.java
index 93c89386ca..f47ff42fdb 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/WaitForTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/dsl/container/WaitForTest.java
@@ -33,9 +33,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class WaitForTest extends AbstractGroovyActionDslTest {
 
     private static final String DEFAULT_WAIT_TIME = "5000";
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/xml/AbstractXmlActionTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/xml/AbstractXmlActionTest.java
index a2ab904749..4f49ce83b4 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/xml/AbstractXmlActionTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/xml/AbstractXmlActionTest.java
@@ -36,9 +36,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractXmlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/xml/GroovyTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/xml/GroovyTest.java
index ca7fe8b374..86ac5a86e4 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/xml/GroovyTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/xml/GroovyTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/yaml/AbstractYamlActionTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/yaml/AbstractYamlActionTest.java
index efa72505b8..8697a933fd 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/yaml/AbstractYamlActionTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/yaml/AbstractYamlActionTest.java
@@ -36,9 +36,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractYamlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/yaml/GroovyTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/yaml/GroovyTest.java
index daa4b342e3..d4fcce2bd7 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/yaml/GroovyTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/groovy/yaml/GroovyTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java
index a3ad166268..502ba35fb5 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class CreateVariablesIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/CreateVariablesJavaIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/CreateVariablesJavaIT.java
index 99a639f443..be34e278f1 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/CreateVariablesJavaIT.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/CreateVariablesJavaIT.java
@@ -22,9 +22,6 @@
 
 import static org.citrusframework.script.GroovyAction.Builder.groovy;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class CreateVariablesJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java
index 3d19584dda..62f5023657 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class LoadPropertiesIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/LoadPropertiesJavaIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/LoadPropertiesJavaIT.java
index 35111564d5..63cd71e629 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/LoadPropertiesJavaIT.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/actions/LoadPropertiesJavaIT.java
@@ -24,9 +24,6 @@
 import static org.citrusframework.actions.LoadPropertiesAction.Builder.load;
 import static org.citrusframework.script.GroovyAction.Builder.groovy;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class LoadPropertiesJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/IterateIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/IterateIT.java
index 6bcfdfee02..ab3db46fb4 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/IterateIT.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/IterateIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class IterateIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/ParallelFailureIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/ParallelFailureIT.java
index c5f169ea9b..ffe211642d 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/ParallelFailureIT.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/ParallelFailureIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class ParallelFailureIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/TemplateVariablesIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/TemplateVariablesIT.java
index 8af1cb38b6..866802fe28 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/TemplateVariablesIT.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/container/TemplateVariablesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2011-01-26
  */
 public class TemplateVariablesIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/groovy/GroovyTestLoaderIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/groovy/GroovyTestLoaderIT.java
index 81315dcd11..cd0d57650e 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/groovy/GroovyTestLoaderIT.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/groovy/GroovyTestLoaderIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.1
  */
 @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/script/GroovyActionIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/script/GroovyActionIT.java
index d2ba942449..7a4bd1a7b9 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/script/GroovyActionIT.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/script/GroovyActionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2009
  */
 public class GroovyActionIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/script/GroovyActionJavaIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/script/GroovyActionJavaIT.java
index 66bad582bf..a7af6c16a4 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/script/GroovyActionJavaIT.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/script/GroovyActionJavaIT.java
@@ -23,9 +23,6 @@
 
 import static org.citrusframework.script.GroovyAction.Builder.groovy;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class GroovyActionJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java
index 038ff5f155..27e14c7dda 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java
@@ -26,7 +26,6 @@
  * Global variables are loaded in advance to this test. Variables are printed within this test
  * to show that global property loader works fine.
  *
- * @author Philipp Komninos
  * @since 2010
  */
 public class GlobalVariablesIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/message/builder/script/GroovyScriptPayloadBuilderTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/message/builder/script/GroovyScriptPayloadBuilderTest.java
index 3a3b8582dc..40b2eda32a 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/message/builder/script/GroovyScriptPayloadBuilderTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/message/builder/script/GroovyScriptPayloadBuilderTest.java
@@ -20,9 +20,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyScriptPayloadBuilderTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/script/GroovyActionTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/script/GroovyActionTest.java
index 66115d25f0..7765ef8715 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/script/GroovyActionTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/script/GroovyActionTest.java
@@ -22,9 +22,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 import org.citrusframework.testng.AbstractTestNGUnitTest;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyActionTest extends AbstractTestNGUnitTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/util/GroovyTypeConverterTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/util/GroovyTypeConverterTest.java
index 86fa6431f6..4842aac951 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/util/GroovyTypeConverterTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/util/GroovyTypeConverterTest.java
@@ -20,9 +20,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyTypeConverterTest {
 
     private final GroovyTypeConverter converter = GroovyTypeConverter.INSTANCE;
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/util/TypeConverterTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/util/TypeConverterTest.java
index f6ef83f565..e3b1745e56 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/util/TypeConverterTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/util/TypeConverterTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TypeConverterTest {
 
     @Test
diff --git a/runtime/citrus-groovy/src/test/java/org/citrusframework/validation/script/TemplateBasedScriptBuilderTest.java b/runtime/citrus-groovy/src/test/java/org/citrusframework/validation/script/TemplateBasedScriptBuilderTest.java
index 443c5668a6..f15cb83e99 100644
--- a/runtime/citrus-groovy/src/test/java/org/citrusframework/validation/script/TemplateBasedScriptBuilderTest.java
+++ b/runtime/citrus-groovy/src/test/java/org/citrusframework/validation/script/TemplateBasedScriptBuilderTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TemplateBasedScriptBuilderTest {
 
     @Test
diff --git a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/CitrusJUnit4Runner.java b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/CitrusJUnit4Runner.java
index 068b8e84f7..88d21483c7 100644
--- a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/CitrusJUnit4Runner.java
+++ b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/CitrusJUnit4Runner.java
@@ -33,7 +33,6 @@
  * JUnit runner reads Citrus test annotation for XML test cases and prepares test execution within proper Citrus
  * test context boundaries. Supports package scan as well as multiple test method annotations within one single class.
  *
- * @author Christoph Deppisch
  * @since 2.2
  */
 public class CitrusJUnit4Runner extends BlockJUnit4ClassRunner {
diff --git a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4CitrusSupport.java b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4CitrusSupport.java
index 33b58f13ab..d62534bed5 100644
--- a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4CitrusSupport.java
+++ b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4CitrusSupport.java
@@ -36,7 +36,6 @@
 import org.junit.runner.RunWith;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @RunWith(CitrusJUnit4Runner.class)
diff --git a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4Helper.java b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4Helper.java
index 37928ec8d9..a2fda7af0c 100644
--- a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4Helper.java
+++ b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4Helper.java
@@ -37,9 +37,6 @@
 import org.citrusframework.util.StringUtils;
 import org.junit.runners.model.FrameworkMethod;
 
-/**
- * @author Christoph Deppisch
- */
 public final class JUnit4Helper {
 
     public static final String BUILDER_ATTRIBUTE = "builder";
diff --git a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4ParameterHelper.java b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4ParameterHelper.java
index 0872dfde29..98ec09f360 100644
--- a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4ParameterHelper.java
+++ b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4ParameterHelper.java
@@ -25,9 +25,6 @@
 import org.citrusframework.context.TestContext;
 import org.citrusframework.exceptions.CitrusRuntimeException;
 
-/**
- * @author Christoph Deppisch
- */
 public final class JUnit4ParameterHelper {
 
     /**
diff --git a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4TestEngine.java b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4TestEngine.java
index 8844033662..cd2147436c 100644
--- a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4TestEngine.java
+++ b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/JUnit4TestEngine.java
@@ -38,7 +38,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class JUnit4TestEngine extends AbstractTestEngine {
diff --git a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/TestSuiteState.java b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/TestSuiteState.java
index e8fca75fcb..69bd76b368 100644
--- a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/TestSuiteState.java
+++ b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/TestSuiteState.java
@@ -17,7 +17,6 @@
 package org.citrusframework.junit;
 
 /**
- * @author Christoph Deppisch
  * @since 2.2
  */
 public final class TestSuiteState {
diff --git a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/CitrusSpringJUnit4Runner.java b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/CitrusSpringJUnit4Runner.java
index 236b4ad500..994174ee4d 100644
--- a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/CitrusSpringJUnit4Runner.java
+++ b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/CitrusSpringJUnit4Runner.java
@@ -35,7 +35,6 @@
  * JUnit runner reads Citrus test annotation for XML test cases and prepares test execution within proper Citrus
  * test context boundaries. Supports package scan as well as multiple test method annotations within one single class.
  *
- * @author Christoph Deppisch
  * @since 2.2
  */
 public class CitrusSpringJUnit4Runner extends SpringJUnit4ClassRunner {
diff --git a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/JUnit4CitrusSpringSupport.java b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/JUnit4CitrusSpringSupport.java
index fa8f5c86d2..9c1cd76bac 100644
--- a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/JUnit4CitrusSpringSupport.java
+++ b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/JUnit4CitrusSpringSupport.java
@@ -48,7 +48,6 @@
  * Base test implementation for test cases that use JUnit testing framework. Class also provides
  * test listener support and loads the Spring root application context files for Citrus.
  *
- * @author Christoph Deppisch
  */
 @RunWith(CitrusSpringJUnit4Runner.class)
 @ContextConfiguration(classes = CitrusSpringConfig.class)
diff --git a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/TestSuiteExecutionListener.java b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/TestSuiteExecutionListener.java
index 260fac666c..5b4f2f7bba 100644
--- a/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/TestSuiteExecutionListener.java
+++ b/runtime/citrus-junit/src/main/java/org/citrusframework/junit/spring/TestSuiteExecutionListener.java
@@ -28,7 +28,6 @@
  * tasks before and after the test run. The tasks after are executed as ShutdownHook thread that is added
  * to the JVM runtime.
  *
- * @author Christoph Deppisch
  */
 public class TestSuiteExecutionListener extends AbstractTestExecutionListener {
 
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/ShouldFailGroup.java b/runtime/citrus-junit/src/test/java/org/citrusframework/ShouldFailGroup.java
index f80cda72a1..2081cb87a1 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/ShouldFailGroup.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/ShouldFailGroup.java
@@ -23,7 +23,6 @@
  * This group is used in both JUnit and TestNG test suites where JUnit uses the class itself as a {@link org.junit.experimental.categories.Category} and
  * TestNG uses the class name as test group name in {@link org.testng.annotations.Test}.
  *
- * @author Christoph Deppisch
  */
 public final class ShouldFailGroup {
 
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/JUnit4TestEngineTest.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/JUnit4TestEngineTest.java
index 7afc38df5d..cc764d03bd 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/JUnit4TestEngineTest.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/JUnit4TestEngineTest.java
@@ -28,7 +28,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class JUnit4TestEngineTest {
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/ApplyTestBehaviorIT.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/ApplyTestBehaviorIT.java
index 974a322922..eaee93c34b 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/ApplyTestBehaviorIT.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/ApplyTestBehaviorIT.java
@@ -26,9 +26,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 import static org.citrusframework.container.Sequence.Builder.sequential;
 
-/**
- * @author Christoph Deppisch
- */
 public class ApplyTestBehaviorIT extends JUnit4CitrusSpringSupport {
 
     @Test
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/ContextInjectionJUnit4IT.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/ContextInjectionJUnit4IT.java
index 813f7ed5f5..26c39fb445 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/ContextInjectionJUnit4IT.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/ContextInjectionJUnit4IT.java
@@ -26,7 +26,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class ContextInjectionJUnit4IT extends JUnit4CitrusSpringSupport {
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/EchoActionJUnit4JavaIT.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/EchoActionJUnit4JavaIT.java
index db01cf6f0a..1f5c871320 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/EchoActionJUnit4JavaIT.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/EchoActionJUnit4JavaIT.java
@@ -22,9 +22,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 public class EchoActionJUnit4JavaIT extends JUnit4CitrusSpringSupport {
 
     @Test
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/EndpointInjectionIT.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/EndpointInjectionIT.java
index 407c54bf58..614ce7ae32 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/EndpointInjectionIT.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/EndpointInjectionIT.java
@@ -43,9 +43,6 @@
 import static org.citrusframework.actions.ReceiveMessageAction.Builder.receive;
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
-/**
- * @author Christoph Deppisch
- */
 public class EndpointInjectionIT extends JUnit4CitrusSpringSupport {
 
     @CitrusFramework
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/FailJUnit4JavaIT.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/FailJUnit4JavaIT.java
index ad00c6feb7..92597a56bc 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/FailJUnit4JavaIT.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/FailJUnit4JavaIT.java
@@ -25,9 +25,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 public class FailJUnit4JavaIT extends JUnit4CitrusSpringSupport {
 
     @Test(expected = TestCaseFailedException.class)
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/FailJUnit4RuntimeExceptionIT.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/FailJUnit4RuntimeExceptionIT.java
index ac31d8659a..4ac74eb91e 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/FailJUnit4RuntimeExceptionIT.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/FailJUnit4RuntimeExceptionIT.java
@@ -23,9 +23,6 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-/**
- * @author Christoph Deppisch
- */
 public class FailJUnit4RuntimeExceptionIT extends JUnit4CitrusSpringSupport {
 
     @Test(expected = TestCaseFailedException.class)
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/JUnit4GroovyIT.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/JUnit4GroovyIT.java
index c093ab4f91..f27e0e9270 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/JUnit4GroovyIT.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/JUnit4GroovyIT.java
@@ -25,7 +25,6 @@
 import org.junit.experimental.categories.Category;
 
 /**
- * @author Christoph Deppisch
  * @since 2.2
  */
 @SuppressWarnings("squid:S2699")
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/JUnit4SpringXmlIT.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/JUnit4SpringXmlIT.java
index c65bc4822e..edbfa8741d 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/JUnit4SpringXmlIT.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/JUnit4SpringXmlIT.java
@@ -25,7 +25,6 @@
 import org.junit.experimental.categories.Category;
 
 /**
- * @author Christoph Deppisch
  * @since 2.2
  */
 @SuppressWarnings("squid:S2699")
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/ResourceInjectionJUnit4IT.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/ResourceInjectionJUnit4IT.java
index 50e9db5d6a..ba87760a4e 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/ResourceInjectionJUnit4IT.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/ResourceInjectionJUnit4IT.java
@@ -36,7 +36,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class ResourceInjectionJUnit4IT extends JUnit4CitrusSpringSupport {
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/SpringXmlTestLoaderIT.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/SpringXmlTestLoaderIT.java
index ec6f829907..f86c179fb2 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/SpringXmlTestLoaderIT.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/integration/SpringXmlTestLoaderIT.java
@@ -32,9 +32,6 @@
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
-/**
- * @author Thorsten Schlathoelter
- */
 @SpringXmlTestLoaderConfiguration(
         parserConfigurations = {
                 @BeanDefinitionParserConfiguration(name = "testcase", parser = SpringXmlTestLoaderIT.CustomTestCaseParser.class),
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/scan/JustLooksLikeTest.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/scan/JustLooksLikeTest.java
index 19c7b70d03..64a8280a1c 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/scan/JustLooksLikeTest.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/scan/JustLooksLikeTest.java
@@ -17,7 +17,6 @@
 package org.citrusframework.junit.scan;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class JustLooksLikeTest {
diff --git a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/scan/SampleJUnit4Test.java b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/scan/SampleJUnit4Test.java
index 66e8786f2c..2ec985ddfe 100644
--- a/runtime/citrus-junit/src/test/java/org/citrusframework/junit/scan/SampleJUnit4Test.java
+++ b/runtime/citrus-junit/src/test/java/org/citrusframework/junit/scan/SampleJUnit4Test.java
@@ -20,7 +20,6 @@
 import org.junit.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SampleJUnit4Test {
diff --git a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusExtension.java b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusExtension.java
index 17c63ce0d7..f32a95d7a3 100644
--- a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusExtension.java
+++ b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusExtension.java
@@ -60,7 +60,6 @@
  * <p>
  * Extension is based on Citrus Xml test extension that also allows to load test cases from external Spring configuration files.
  *
- * @author Christoph Deppisch
  */
 public class CitrusExtension implements BeforeAllCallback, InvocationInterceptor, AfterTestExecutionCallback, ParameterResolver, TestInstancePostProcessor, TestExecutionExceptionHandler, AfterEachCallback {
 
diff --git a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusExtensionHelper.java b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusExtensionHelper.java
index ec4cb05f52..ab93646659 100644
--- a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusExtensionHelper.java
+++ b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusExtensionHelper.java
@@ -42,9 +42,6 @@
 import org.junit.jupiter.api.extension.ParameterContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 
-/**
- * @author Christoph Deppisch
- */
 public final class CitrusExtensionHelper {
 
     /**
diff --git a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusSupport.java b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusSupport.java
index b747535490..d2a6c0c413 100644
--- a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusSupport.java
+++ b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusSupport.java
@@ -25,9 +25,6 @@
 
 import org.junit.jupiter.api.extension.ExtendWith;
 
-/**
- * @author Christoph Deppisch
- */
 @Documented
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusTestFactory.java b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusTestFactory.java
index 32d84e6e94..fd0399bb94 100644
--- a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusTestFactory.java
+++ b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusTestFactory.java
@@ -23,9 +23,6 @@
 
 import org.junit.jupiter.api.TestFactory;
 
-/**
- * @author Christoph Deppisch
- */
 @Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @TestFactory
diff --git a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusTestFactorySupport.java b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusTestFactorySupport.java
index da530ccb03..ce31b2eb69 100644
--- a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusTestFactorySupport.java
+++ b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/CitrusTestFactorySupport.java
@@ -34,9 +34,6 @@
 import org.citrusframework.util.FileUtils;
 import org.junit.jupiter.api.DynamicTest;
 
-/**
- * @author Christoph Deppisch
- */
 public final class CitrusTestFactorySupport {
 
     private final String type;
diff --git a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/spring/CitrusSpringExtension.java b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/spring/CitrusSpringExtension.java
index 85fd915aab..c92c1a8c4a 100644
--- a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/spring/CitrusSpringExtension.java
+++ b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/spring/CitrusSpringExtension.java
@@ -52,7 +52,6 @@
  * <p>
  * Extension is based on Citrus Xml test extension that also allows to load test cases from external Spring configuration files.
  *
- * @author Christoph Deppisch
  */
 public class CitrusSpringExtension implements BeforeAllCallback, BeforeTestExecutionCallback, InvocationInterceptor, AfterTestExecutionCallback, ParameterResolver, TestInstancePostProcessor, TestExecutionExceptionHandler, AfterEachCallback {
 
diff --git a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/spring/CitrusSpringSupport.java b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/spring/CitrusSpringSupport.java
index 824632d5e0..345a776522 100644
--- a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/spring/CitrusSpringSupport.java
+++ b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/spring/CitrusSpringSupport.java
@@ -26,9 +26,6 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-/**
- * @author Christoph Deppisch
- */
 @Documented
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/spring/CitrusSpringXmlTestFactory.java b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/spring/CitrusSpringXmlTestFactory.java
index 15158fb14e..be01319e82 100644
--- a/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/spring/CitrusSpringXmlTestFactory.java
+++ b/runtime/citrus-junit5/src/main/java/org/citrusframework/junit/jupiter/spring/CitrusSpringXmlTestFactory.java
@@ -23,9 +23,6 @@
 
 import org.junit.jupiter.api.TestFactory;
 
-/**
- * @author Christoph Deppisch
- */
 @Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @TestFactory
diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ApplyTestBehaviorIT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ApplyTestBehaviorIT.java
index e36010ea57..78f493bdd6 100644
--- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ApplyTestBehaviorIT.java
+++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ApplyTestBehaviorIT.java
@@ -28,9 +28,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 import static org.citrusframework.container.Sequence.Builder.sequential;
 
-/**
- * @author Christoph Deppisch
- */
 @ExtendWith(CitrusExtension.class)
 public class ApplyTestBehaviorIT {
 
diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/CitrusConfigurationIT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/CitrusConfigurationIT.java
index 5f8b811d78..31a2e69e4a 100644
--- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/CitrusConfigurationIT.java
+++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/CitrusConfigurationIT.java
@@ -38,9 +38,6 @@
 import static org.citrusframework.actions.ReceiveMessageAction.Builder.receive;
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
-/**
- * @author Christoph Deppisch
- */
 @CitrusSupport
 @CitrusConfiguration(classes = CitrusConfigurationIT.Endpoints.class)
 public class CitrusConfigurationIT {
diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ContextInjectionJUnit5IT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ContextInjectionJUnit5IT.java
index 1edfcabac6..ea98cc61cc 100644
--- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ContextInjectionJUnit5IT.java
+++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ContextInjectionJUnit5IT.java
@@ -25,9 +25,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 @CitrusSupport
 public class ContextInjectionJUnit5IT {
 
diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ContextInjectionJUnit5RunnerIT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ContextInjectionJUnit5RunnerIT.java
index 9bcc97917d..7f5f959afd 100644
--- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ContextInjectionJUnit5RunnerIT.java
+++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ContextInjectionJUnit5RunnerIT.java
@@ -26,9 +26,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 @CitrusSupport
 public class ContextInjectionJUnit5RunnerIT {
 
diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/EchoActionJUnit5JavaIT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/EchoActionJUnit5JavaIT.java
index 492ca4953d..4aa6ef434b 100644
--- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/EchoActionJUnit5JavaIT.java
+++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/EchoActionJUnit5JavaIT.java
@@ -26,9 +26,6 @@
 import static org.citrusframework.actions.CreateVariablesAction.Builder.createVariable;
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 @CitrusSupport
 public class EchoActionJUnit5JavaIT {
 
diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/EndpointInjectionIT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/EndpointInjectionIT.java
index 392da1ad59..4dff67c34c 100644
--- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/EndpointInjectionIT.java
+++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/EndpointInjectionIT.java
@@ -47,9 +47,6 @@
 import static org.citrusframework.actions.ReceiveMessageAction.Builder.receive;
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
-/**
- * @author Christoph Deppisch
- */
 @CitrusSupport
 public class EndpointInjectionIT implements CitrusExtension.TestListener {
 
diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/FailJUnit5IT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/FailJUnit5IT.java
index d24fc2015d..f0395309b2 100644
--- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/FailJUnit5IT.java
+++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/FailJUnit5IT.java
@@ -29,9 +29,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 @ExtendWith({CitrusExtension.class, FailJUnit5IT.ShouldFailExtension.class})
 public class FailJUnit5IT {
 
diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ResourceInjectionJUnit5IT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ResourceInjectionJUnit5IT.java
index 9d8e6189bf..50542296c7 100644
--- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ResourceInjectionJUnit5IT.java
+++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/ResourceInjectionJUnit5IT.java
@@ -35,9 +35,6 @@
 import static org.citrusframework.actions.CreateVariablesAction.Builder.createVariable;
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 @CitrusSupport
 public class ResourceInjectionJUnit5IT {
 
diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/groovy/GroovyScript_IT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/groovy/GroovyScript_IT.java
index 2db57386d0..9c7be8ccc1 100644
--- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/groovy/GroovyScript_IT.java
+++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/groovy/GroovyScript_IT.java
@@ -27,9 +27,6 @@
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @CitrusSupport
 public class GroovyScript_IT {
 
diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringBeanXml_IT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringBeanXml_IT.java
index ad5683fae6..6bf77cbf99 100644
--- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringBeanXml_IT.java
+++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringBeanXml_IT.java
@@ -29,9 +29,6 @@
 import org.junit.jupiter.api.Test;
 import org.springframework.test.context.ContextConfiguration;
 
-/**
- * @author Christoph Deppisch
- */
 @CitrusSpringSupport
 @ContextConfiguration(classes = {CitrusSpringConfig.class})
 class SpringBeanXml_IT {
diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringBean_IT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringBean_IT.java
index a69fe07542..c7b4fad7d3 100644
--- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringBean_IT.java
+++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringBean_IT.java
@@ -42,9 +42,6 @@
 import static org.citrusframework.actions.ReceiveMessageAction.Builder.receive;
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
-/**
- * @author Christoph Deppisch
- */
 @CitrusSpringSupport
 @ContextConfiguration(classes = {CitrusSpringConfig.class, SpringBean_IT.EndpointConfig.class})
 class SpringBean_IT {
diff --git a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringXmlTestLoader_IT.java b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringXmlTestLoader_IT.java
index 9567b9a83f..1058b107bb 100644
--- a/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringXmlTestLoader_IT.java
+++ b/runtime/citrus-junit5/src/test/java/org/citrusframework/junit/jupiter/integration/spring/SpringXmlTestLoader_IT.java
@@ -39,9 +39,6 @@
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
-/**
- * @author Thorsten Schlathoelter
- */
 @CitrusSpringSupport
 @ContextConfiguration(classes = {CitrusSpringConfig.class, CustomConfiguration.class})
 @SpringXmlTestLoaderConfiguration(
diff --git a/runtime/citrus-main/src/main/java/org/citrusframework/main/CitrusApp.java b/runtime/citrus-main/src/main/java/org/citrusframework/main/CitrusApp.java
index 5b7afcb297..a3621b2f6f 100644
--- a/runtime/citrus-main/src/main/java/org/citrusframework/main/CitrusApp.java
+++ b/runtime/citrus-main/src/main/java/org/citrusframework/main/CitrusApp.java
@@ -32,7 +32,6 @@
  * Command line options are passed to the application for optional arguments. Application will run until the
  * duration time option has passed by or until the JVM terminates.
  *
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class CitrusApp {
diff --git a/runtime/citrus-main/src/main/java/org/citrusframework/main/CitrusAppConfiguration.java b/runtime/citrus-main/src/main/java/org/citrusframework/main/CitrusAppConfiguration.java
index 29e8bd40b8..d0559fb472 100644
--- a/runtime/citrus-main/src/main/java/org/citrusframework/main/CitrusAppConfiguration.java
+++ b/runtime/citrus-main/src/main/java/org/citrusframework/main/CitrusAppConfiguration.java
@@ -24,7 +24,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class CitrusAppConfiguration extends TestRunConfiguration {
diff --git a/runtime/citrus-main/src/main/java/org/citrusframework/main/CitrusAppOptions.java b/runtime/citrus-main/src/main/java/org/citrusframework/main/CitrusAppOptions.java
index 13e6565d20..7d6dd3c63f 100644
--- a/runtime/citrus-main/src/main/java/org/citrusframework/main/CitrusAppOptions.java
+++ b/runtime/citrus-main/src/main/java/org/citrusframework/main/CitrusAppOptions.java
@@ -32,7 +32,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class CitrusAppOptions<T extends CitrusAppConfiguration> {
diff --git a/runtime/citrus-main/src/main/java/org/citrusframework/main/spring/CitrusSpringApp.java b/runtime/citrus-main/src/main/java/org/citrusframework/main/spring/CitrusSpringApp.java
index 89504d4843..38034ff2ba 100644
--- a/runtime/citrus-main/src/main/java/org/citrusframework/main/spring/CitrusSpringApp.java
+++ b/runtime/citrus-main/src/main/java/org/citrusframework/main/spring/CitrusSpringApp.java
@@ -23,7 +23,6 @@
  * Command line options are passed to the application for optional arguments. Application will run until the
  * duration time option has passed by or until the JVM terminates.
  *
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class CitrusSpringApp extends CitrusApp {
diff --git a/runtime/citrus-main/src/main/java/org/citrusframework/main/spring/CitrusSpringAppConfiguration.java b/runtime/citrus-main/src/main/java/org/citrusframework/main/spring/CitrusSpringAppConfiguration.java
index 7d5be7cc63..633bb67426 100644
--- a/runtime/citrus-main/src/main/java/org/citrusframework/main/spring/CitrusSpringAppConfiguration.java
+++ b/runtime/citrus-main/src/main/java/org/citrusframework/main/spring/CitrusSpringAppConfiguration.java
@@ -24,9 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public class CitrusSpringAppConfiguration extends CitrusAppConfiguration {
 
     /** Logger */
diff --git a/runtime/citrus-main/src/main/java/org/citrusframework/main/spring/CitrusSpringAppOptions.java b/runtime/citrus-main/src/main/java/org/citrusframework/main/spring/CitrusSpringAppOptions.java
index dd4c497396..97ccf1e1b2 100644
--- a/runtime/citrus-main/src/main/java/org/citrusframework/main/spring/CitrusSpringAppOptions.java
+++ b/runtime/citrus-main/src/main/java/org/citrusframework/main/spring/CitrusSpringAppOptions.java
@@ -18,8 +18,5 @@
 
 import org.citrusframework.main.CitrusAppOptions;
 
-/**
- * @author Christoph Deppisch
- */
 public class CitrusSpringAppOptions extends CitrusAppOptions<CitrusSpringAppConfiguration> {
 }
diff --git a/runtime/citrus-main/src/test/java/org/citrusframework/integration/CitrusStandaloneIT.java b/runtime/citrus-main/src/test/java/org/citrusframework/integration/CitrusStandaloneIT.java
index fe709ef0b2..59e8f66377 100644
--- a/runtime/citrus-main/src/test/java/org/citrusframework/integration/CitrusStandaloneIT.java
+++ b/runtime/citrus-main/src/test/java/org/citrusframework/integration/CitrusStandaloneIT.java
@@ -47,7 +47,6 @@
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
 /**
- * @author Christoph Deppisch
  * @since 2.2
  */
 @ContextConfiguration(classes = { CitrusSpringConfig.class, CitrusStandaloneIT.Config.class } )
diff --git a/runtime/citrus-main/src/test/java/org/citrusframework/junit/scan/SampleJUnit4Test.java b/runtime/citrus-main/src/test/java/org/citrusframework/junit/scan/SampleJUnit4Test.java
index 66e8786f2c..2ec985ddfe 100644
--- a/runtime/citrus-main/src/test/java/org/citrusframework/junit/scan/SampleJUnit4Test.java
+++ b/runtime/citrus-main/src/test/java/org/citrusframework/junit/scan/SampleJUnit4Test.java
@@ -20,7 +20,6 @@
 import org.junit.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SampleJUnit4Test {
diff --git a/runtime/citrus-main/src/test/java/org/citrusframework/main/CitrusAppTest.java b/runtime/citrus-main/src/test/java/org/citrusframework/main/CitrusAppTest.java
index fd168c454c..66939eb76e 100644
--- a/runtime/citrus-main/src/test/java/org/citrusframework/main/CitrusAppTest.java
+++ b/runtime/citrus-main/src/test/java/org/citrusframework/main/CitrusAppTest.java
@@ -21,7 +21,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class CitrusAppTest {
diff --git a/runtime/citrus-main/src/test/java/org/citrusframework/main/CustomConfig.java b/runtime/citrus-main/src/test/java/org/citrusframework/main/CustomConfig.java
index 7ca75ba283..446d9d3d64 100644
--- a/runtime/citrus-main/src/test/java/org/citrusframework/main/CustomConfig.java
+++ b/runtime/citrus-main/src/test/java/org/citrusframework/main/CustomConfig.java
@@ -20,7 +20,6 @@
 import org.springframework.context.annotation.Configuration;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @Configuration
diff --git a/runtime/citrus-main/src/test/java/org/citrusframework/main/TestEngineLookupTest.java b/runtime/citrus-main/src/test/java/org/citrusframework/main/TestEngineLookupTest.java
index e1a5a25ed3..290720b5ee 100644
--- a/runtime/citrus-main/src/test/java/org/citrusframework/main/TestEngineLookupTest.java
+++ b/runtime/citrus-main/src/test/java/org/citrusframework/main/TestEngineLookupTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestEngineLookupTest {
 
     @Test
diff --git a/runtime/citrus-main/src/test/java/org/citrusframework/main/scan/ClassPathTestScannerTest.java b/runtime/citrus-main/src/test/java/org/citrusframework/main/scan/ClassPathTestScannerTest.java
index 0dfae01961..9b05aef798 100644
--- a/runtime/citrus-main/src/test/java/org/citrusframework/main/scan/ClassPathTestScannerTest.java
+++ b/runtime/citrus-main/src/test/java/org/citrusframework/main/scan/ClassPathTestScannerTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class ClassPathTestScannerTest {
diff --git a/runtime/citrus-main/src/test/java/org/citrusframework/testng/scan/SampleTestNGTest.java b/runtime/citrus-main/src/test/java/org/citrusframework/testng/scan/SampleTestNGTest.java
index 70d4edc56b..9578aed2dc 100644
--- a/runtime/citrus-main/src/test/java/org/citrusframework/testng/scan/SampleTestNGTest.java
+++ b/runtime/citrus-main/src/test/java/org/citrusframework/testng/scan/SampleTestNGTest.java
@@ -20,7 +20,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SampleTestNGTest {
diff --git a/runtime/citrus-quarkus/citrus-quarkus-deployment/src/main/java/org/citrusframework/quarkus/deployment/CitrusProcessor.java b/runtime/citrus-quarkus/citrus-quarkus-deployment/src/main/java/org/citrusframework/quarkus/deployment/CitrusProcessor.java
index e8b113b039..cad6ae6581 100644
--- a/runtime/citrus-quarkus/citrus-quarkus-deployment/src/main/java/org/citrusframework/quarkus/deployment/CitrusProcessor.java
+++ b/runtime/citrus-quarkus/citrus-quarkus-deployment/src/main/java/org/citrusframework/quarkus/deployment/CitrusProcessor.java
@@ -22,7 +22,6 @@
 
 /**
  * Processor adding build steps to fully index Citrus API and base modules.
- * @author Christoph Deppisch
  */
 public class CitrusProcessor {
 
diff --git a/runtime/citrus-quarkus/citrus-quarkus-runtime/src/main/java/org/citrusframework/quarkus/CitrusSupport.java b/runtime/citrus-quarkus/citrus-quarkus-runtime/src/main/java/org/citrusframework/quarkus/CitrusSupport.java
index 7281aa72bd..bc9f8c3753 100644
--- a/runtime/citrus-quarkus/citrus-quarkus-runtime/src/main/java/org/citrusframework/quarkus/CitrusSupport.java
+++ b/runtime/citrus-quarkus/citrus-quarkus-runtime/src/main/java/org/citrusframework/quarkus/CitrusSupport.java
@@ -26,7 +26,6 @@
 /**
  * Special Citrus annotation that enables Citrus support on QuarkusTest framework.
  *
- * @author Christoph Deppisch
  */
 @QuarkusTestResource(CitrusTestResource.class)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/runtime/citrus-quarkus/citrus-quarkus-runtime/src/main/java/org/citrusframework/quarkus/CitrusTestResource.java b/runtime/citrus-quarkus/citrus-quarkus-runtime/src/main/java/org/citrusframework/quarkus/CitrusTestResource.java
index 240bd80f15..5bfafff289 100644
--- a/runtime/citrus-quarkus/citrus-quarkus-runtime/src/main/java/org/citrusframework/quarkus/CitrusTestResource.java
+++ b/runtime/citrus-quarkus/citrus-quarkus-runtime/src/main/java/org/citrusframework/quarkus/CitrusTestResource.java
@@ -35,7 +35,6 @@
  * Quarkus test resource that takes care of injecting Citrus resources
  * such as TestContext, TestCaseRunner, CitrusEndpoints and many more.
  *
- * @author Christoph Deppisch
  */
 public class CitrusTestResource implements QuarkusTestResourceLifecycleManager {
 
diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/CitrusParameters.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/CitrusParameters.java
index 8248619723..914f4f5336 100644
--- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/CitrusParameters.java
+++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/CitrusParameters.java
@@ -22,7 +22,6 @@
  * Parameter annotation provides parameter names that are passed to the test case test context
  * as variables. Variable values are provided by TestNG data provider.
  *
- * @author Christoph Deppisch
  * @since 1.3.1
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusMethodInterceptor.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusMethodInterceptor.java
index 3a83a330c7..9348516106 100644
--- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusMethodInterceptor.java
+++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusMethodInterceptor.java
@@ -38,7 +38,6 @@
  * Citrus annotated test method. So TestNG test is executed multiple times respectively for each Citrus test
  * constructed by method annotation.
  *
- * @author Christoph Deppisch
  * @since 1.3.1
  */
 public class TestNGCitrusMethodInterceptor implements IMethodInterceptor {
diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusSupport.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusSupport.java
index 6a759a2a34..fd633f86b0 100644
--- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusSupport.java
+++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGCitrusSupport.java
@@ -52,7 +52,6 @@
  * and resource injection. Users can just extend this class and make use of the action runner methods provided in {@link org.citrusframework.TestActionRunner}
  * and {@link GherkinTestActionRunner}.
  *
- * @author Christoph Deppisch
  */
 @Listeners( { TestNGCitrusMethodInterceptor.class } )
 public class TestNGCitrusSupport implements IHookable, GherkinTestActionRunner {
diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGEngine.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGEngine.java
index 758979dcc1..544224d3e5 100644
--- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGEngine.java
+++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGEngine.java
@@ -45,7 +45,6 @@
 import org.testng.xml.XmlTest;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class TestNGEngine extends AbstractTestEngine {
diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGHelper.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGHelper.java
index b39136d405..f119dfea34 100644
--- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGHelper.java
+++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGHelper.java
@@ -46,9 +46,6 @@
 import org.testng.IHookCallBack;
 import org.testng.ITestResult;
 
-/**
- * @author Christoph Deppisch
- */
 public final class TestNGHelper {
 
     public static final String BUILDER_ATTRIBUTE = "builder";
diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGParameterHelper.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGParameterHelper.java
index 3da72c1ee6..33e268304a 100644
--- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGParameterHelper.java
+++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGParameterHelper.java
@@ -38,9 +38,6 @@
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public final class TestNGParameterHelper {
 
     /**
diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGUtils.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGUtils.java
index 79278dd0ea..2234f9ea93 100644
--- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGUtils.java
+++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/TestNGUtils.java
@@ -18,9 +18,6 @@
 
 import org.testng.SkipException;
 
-/**
- * @author Thorsten Schlathoelter
- */
 public class TestNGUtils {
 
     /**
diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringMethodInterceptor.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringMethodInterceptor.java
index 48288619b2..0aaadb0092 100644
--- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringMethodInterceptor.java
+++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringMethodInterceptor.java
@@ -38,7 +38,6 @@
  * Citrus annotated test method. So TestNG test is executed multiple times respectively for each Citrus test
  * constructed by method annotation.
  *
- * @author Christoph Deppisch
  * @since 1.3.1
  */
 public class TestNGCitrusSpringMethodInterceptor implements IMethodInterceptor {
diff --git a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringSupport.java b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringSupport.java
index dcdb87870b..213a08c22d 100644
--- a/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringSupport.java
+++ b/runtime/citrus-testng/src/main/java/org/citrusframework/testng/spring/TestNGCitrusSpringSupport.java
@@ -61,7 +61,6 @@
  * and {@link GherkinTestActionRunner}. Provides Spring test listener support and
  * loads basic Spring application context for Citrus.
  *
- * @author Christoph Deppisch
  */
 @Listeners( { TestNGCitrusSpringMethodInterceptor.class } )
 @ContextConfiguration(classes =  {CitrusSpringConfig.class})
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/UnitTestSupport.java b/runtime/citrus-testng/src/test/java/org/citrusframework/UnitTestSupport.java
index 050bff46dd..6fcd6fe706 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/UnitTestSupport.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/UnitTestSupport.java
@@ -21,9 +21,6 @@
 import org.citrusframework.validation.DefaultTextEqualsMessageValidator;
 import org.testng.annotations.BeforeMethod;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport {
 
     protected TestContextFactory testContextFactory;
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/AntRunTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/AntRunTestActionBuilderTest.java
index c7fb9db7ab..7f6d53ed7a 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/AntRunTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/AntRunTestActionBuilderTest.java
@@ -32,9 +32,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-/**
- * @author Christoph Deppisch
- */
 public class AntRunTestActionBuilderTest extends UnitTestSupport {
 
     @Test
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ApplyTestBehaviorTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ApplyTestBehaviorTest.java
index fb68c50d78..0b1103434c 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ApplyTestBehaviorTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ApplyTestBehaviorTest.java
@@ -39,7 +39,6 @@
 import static org.citrusframework.container.Sequence.Builder.sequential;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class ApplyTestBehaviorTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/AsyncTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/AsyncTestActionBuilderTest.java
index 507f2ee382..efe6bcbd94 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/AsyncTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/AsyncTestActionBuilderTest.java
@@ -40,7 +40,6 @@
 import static org.testng.Assert.assertTrue;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class AsyncTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/CustomContainerTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/CustomContainerTestActionBuilderTest.java
index 6b04353187..089d5ba863 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/CustomContainerTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/CustomContainerTestActionBuilderTest.java
@@ -30,7 +30,6 @@
 import static org.testng.Assert.assertEquals;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CustomContainerTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/EchoTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/EchoTestActionBuilderTest.java
index a8c4c3d908..7237c104d1 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/EchoTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/EchoTestActionBuilderTest.java
@@ -26,7 +26,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class EchoTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ExpectTimeoutTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ExpectTimeoutTestActionBuilderTest.java
index 09736ad807..e2cba7d348 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ExpectTimeoutTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ExpectTimeoutTestActionBuilderTest.java
@@ -39,7 +39,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class ExpectTimeoutTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/FailTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/FailTestActionBuilderTest.java
index 40fad48f28..efd36d1e3e 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/FailTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/FailTestActionBuilderTest.java
@@ -27,7 +27,6 @@
 import static org.citrusframework.actions.FailAction.Builder.fail;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class FailTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/LoadPropertiesTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/LoadPropertiesTestActionBuilderTest.java
index 4e3ce3157f..ee1ef897a9 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/LoadPropertiesTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/LoadPropertiesTestActionBuilderTest.java
@@ -26,7 +26,6 @@
 import static org.citrusframework.actions.LoadPropertiesAction.Builder.load;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class LoadPropertiesTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/PurgeEndpointTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/PurgeEndpointTestActionBuilderTest.java
index 6add1ac9cb..0b758ea6b6 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/PurgeEndpointTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/PurgeEndpointTestActionBuilderTest.java
@@ -39,7 +39,6 @@
 import static org.mockito.Mockito.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class PurgeEndpointTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageTestActionBuilderTest.java
index ce50b50253..4d20897a23 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageTestActionBuilderTest.java
@@ -55,9 +55,6 @@
 import static org.citrusframework.dsl.MessageSupport.message;
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageTestActionBuilderTest extends UnitTestSupport {
 
     private final Endpoint messageEndpoint = Mockito.mock(Endpoint.class);
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/SendMessageTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/SendMessageTestActionBuilderTest.java
index 496ad0f241..8b4b61ae51 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/SendMessageTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/SendMessageTestActionBuilderTest.java
@@ -52,7 +52,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class SendMessageTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/SequentialTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/SequentialTestActionBuilderTest.java
index 25ec48e4a6..75cf020b36 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/SequentialTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/SequentialTestActionBuilderTest.java
@@ -33,7 +33,6 @@
 import static org.testng.Assert.assertTrue;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class SequentialTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/SleepTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/SleepTestActionBuilderTest.java
index 0875d13c2b..fd51f31cdb 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/SleepTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/SleepTestActionBuilderTest.java
@@ -27,9 +27,6 @@
 
 import static org.citrusframework.actions.SleepAction.Builder.sleep;
 
-/**
- * @author Christoph Deppisch
- */
 public class SleepTestActionBuilderTest extends UnitTestSupport {
 
     @Test
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/StartServerTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/StartServerTestActionBuilderTest.java
index c21d35b5e3..19ff267e4e 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/StartServerTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/StartServerTestActionBuilderTest.java
@@ -31,7 +31,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class StartServerTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/StopServerTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/StopServerTestActionBuilderTest.java
index 6e0a4bdfc0..f673c2e848 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/StopServerTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/StopServerTestActionBuilderTest.java
@@ -31,7 +31,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class StopServerTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/StopTimerTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/StopTimerTestActionBuilderTest.java
index c6aed99415..bab09dc158 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/StopTimerTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/StopTimerTestActionBuilderTest.java
@@ -26,7 +26,6 @@
 import static org.citrusframework.actions.StopTimerAction.Builder.stopTimer;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class StopTimerTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/TimerTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/TimerTestActionBuilderTest.java
index 7615d84ef7..4050fea182 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/TimerTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/TimerTestActionBuilderTest.java
@@ -27,7 +27,6 @@
 import static org.citrusframework.container.Timer.Builder.timer;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class TimerTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/WaitTestActionBuilderTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/WaitTestActionBuilderTest.java
index ccd9f35f93..525c20060f 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/WaitTestActionBuilderTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/actions/dsl/WaitTestActionBuilderTest.java
@@ -39,7 +39,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Martin Maher
  * @since 2.4
  */
 public class WaitTestActionBuilderTest extends UnitTestSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgIT.java
index d7049ee0dd..f0d2b8a57e 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgIT.java
@@ -22,9 +22,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class FailTestNgIT extends TestNGCitrusSpringSupport {
 
     @Test(groups = "org.citrusframework.ShouldFailGroup", expectedExceptions = CitrusRuntimeException.class)
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgJavaIT.java
index 9b00363255..e42ab36808 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgJavaIT.java
@@ -23,9 +23,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 public class FailTestNgJavaIT extends TestNGCitrusSupport {
 
     @Test(groups = "org.citrusframework.ShouldFailGroup", expectedExceptions = CitrusRuntimeException.class)
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgRuntimeExceptionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgRuntimeExceptionIT.java
index 6ba3a950cd..8412620a2c 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgRuntimeExceptionIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/FailTestNgRuntimeExceptionIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.TestNGCitrusSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class FailTestNgRuntimeExceptionIT extends TestNGCitrusSupport {
 
     @Test(groups = "org.citrusframework.ShouldFailGroup", expectedExceptions = TestCaseFailedException.class)
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/AntRunActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/AntRunActionIT.java
index 72838870df..e3f2c7451a 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/AntRunActionIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/AntRunActionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.3
  */
 public class AntRunActionIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/AntRunActionJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/AntRunActionJavaIT.java
index d2aebdcb7f..bd92f60ea6 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/AntRunActionJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/AntRunActionJavaIT.java
@@ -22,9 +22,6 @@
 
 import static org.citrusframework.actions.AntRunAction.Builder.antrun;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class AntRunActionJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/ApplyTestBehaviorIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/ApplyTestBehaviorIT.java
index 5641a614ab..ee795c031b 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/ApplyTestBehaviorIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/ApplyTestBehaviorIT.java
@@ -33,9 +33,6 @@
 import static org.citrusframework.container.FinallySequence.Builder.doFinally;
 import static org.citrusframework.container.Sequence.Builder.sequential;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class ApplyTestBehaviorIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java
index a3ad166268..502ba35fb5 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/CreateVariablesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class CreateVariablesIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/CreateVariablesJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/CreateVariablesJavaIT.java
index 6e847a3aa5..6f1ceea5b4 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/CreateVariablesJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/CreateVariablesJavaIT.java
@@ -23,9 +23,6 @@
 import static org.citrusframework.actions.CreateVariablesAction.Builder.createVariable;
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class CreateVariablesJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/EchoActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/EchoActionIT.java
index d811865630..1d682fd28b 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/EchoActionIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/EchoActionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 @Test
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/EchoActionJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/EchoActionJavaIT.java
index 7438c659dc..64f5ff1aaa 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/EchoActionJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/EchoActionJavaIT.java
@@ -22,9 +22,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class EchoActionJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/FailActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/FailActionIT.java
index fa7ba227f2..8fe51e8aa4 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/FailActionIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/FailActionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class FailActionIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/FailActionJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/FailActionJavaIT.java
index 07ba18ecf6..12c52b6ecf 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/FailActionJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/FailActionJavaIT.java
@@ -25,9 +25,6 @@
 import static org.citrusframework.actions.SleepAction.Builder.sleep;
 import static org.citrusframework.container.Assert.Builder.assertException;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class FailActionJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/GlobalPropertiesIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/GlobalPropertiesIT.java
index 4310baf299..2e4ff9884b 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/GlobalPropertiesIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/GlobalPropertiesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class GlobalPropertiesIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/GlobalPropertiesJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/GlobalPropertiesJavaIT.java
index c782a5b2e6..bb1b82340c 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/GlobalPropertiesJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/GlobalPropertiesJavaIT.java
@@ -22,9 +22,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class GlobalPropertiesJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/InputActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/InputActionIT.java
index 7161eca587..2c6db98ac3 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/InputActionIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/InputActionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class InputActionIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/InputActionJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/InputActionJavaIT.java
index 8db8b5332f..158f4759ba 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/InputActionJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/InputActionJavaIT.java
@@ -23,9 +23,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 import static org.citrusframework.actions.InputAction.Builder.input;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class InputActionJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/JavaActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/JavaActionIT.java
index a36804fe04..ccbf6ed0d8 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/JavaActionIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/JavaActionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class JavaActionIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java
index 3d19584dda..62f5023657 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/LoadPropertiesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class LoadPropertiesIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/LoadPropertiesJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/LoadPropertiesJavaIT.java
index 34ea49c82e..a4768ace17 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/LoadPropertiesJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/LoadPropertiesJavaIT.java
@@ -23,9 +23,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 import static org.citrusframework.actions.LoadPropertiesAction.Builder.load;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class LoadPropertiesJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/ReceiveTimeoutJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/ReceiveTimeoutJavaIT.java
index b735ea4e4f..63879e49e9 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/ReceiveTimeoutJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/ReceiveTimeoutJavaIT.java
@@ -22,9 +22,6 @@
 
 import static org.citrusframework.actions.ReceiveTimeoutAction.Builder.receiveTimeout;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class ReceiveTimeoutJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/SleepActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/SleepActionIT.java
index 2bc897fbb4..1fde0d279a 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/SleepActionIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/SleepActionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class SleepActionIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/SleepActionJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/SleepActionJavaIT.java
index 0dfbf63ccb..35d4aef38d 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/SleepActionJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/SleepActionJavaIT.java
@@ -22,9 +22,6 @@
 
 import static org.citrusframework.actions.SleepAction.Builder.sleep;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class SleepActionJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StartStopServerActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StartStopServerActionIT.java
index 72c3142dc6..d793462451 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StartStopServerActionIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StartStopServerActionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.2
  */
 public class StartStopServerActionIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StopTimeIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StopTimeIT.java
index 441b5df60e..8595546511 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StopTimeIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StopTimeIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class StopTimeIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StopTimeJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StopTimeJavaIT.java
index fb711cbd58..b32ccf39e3 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StopTimeJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/StopTimeJavaIT.java
@@ -23,9 +23,6 @@
 import static org.citrusframework.actions.SleepAction.Builder.sleep;
 import static org.citrusframework.actions.StopTimeAction.Builder.stopTime;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class StopTimeJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionIT.java
index cb82f7649d..f28f26acf5 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Philipp Komninos
  * @since 2010
  */
 public class TransformActionIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionJavaIT.java
index 1bc92df731..5f19e0e465 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/actions/TransformActionJavaIT.java
@@ -24,9 +24,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 import static org.citrusframework.actions.TransformAction.Builder.transform;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class TransformActionJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/CitrusXmlAnnotationIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/CitrusXmlAnnotationIT.java
index bd85e11bc4..8465dc1ff5 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/CitrusXmlAnnotationIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/CitrusXmlAnnotationIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.1
  */
 @Test
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/SampleIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/SampleIT.java
index 3b46f5ca60..b82cbde4f7 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/SampleIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/annotation/SampleIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.1
  */
 public class SampleIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AssertIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AssertIT.java
index 55e23d73f6..5e3c7cc179 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AssertIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AssertIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2009
  */
 public class AssertIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AssertJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AssertJavaIT.java
index 033baa79f9..52436afd58 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AssertJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AssertJavaIT.java
@@ -29,9 +29,6 @@
 import static org.citrusframework.actions.FailAction.Builder.fail;
 import static org.citrusframework.container.Assert.Builder.assertException;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class AssertJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncFailIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncFailIT.java
index 06399fccfe..6c76fdc881 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncFailIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncFailIT.java
@@ -22,9 +22,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AsyncFailIT extends TestNGCitrusSpringSupport {
 
     @Test(groups = "org.citrusframework.ShouldFailGroup", expectedExceptions = TestCaseFailedException.class)
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncIT.java
index 703de534df..0d5fee9a04 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AsyncIT extends TestNGCitrusSpringSupport {
 
     @Test
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncJavaIT.java
index 39d64430e4..20f1a3e5e7 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/AsyncJavaIT.java
@@ -30,7 +30,6 @@
 import static org.citrusframework.container.Async.Builder.async;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class AsyncJavaIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CatchIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CatchIT.java
index b673f36b90..c30ea18d73 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CatchIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CatchIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class CatchIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CatchJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CatchJavaIT.java
index fd3cad33ed..2e7fb2b833 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CatchJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CatchJavaIT.java
@@ -24,9 +24,6 @@
 import static org.citrusframework.actions.FailAction.Builder.fail;
 import static org.citrusframework.container.Catch.Builder.catchException;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class CatchJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ConditionalIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ConditionalIT.java
index d464d1cac8..c1c6b219c0 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ConditionalIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ConditionalIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ConditionalIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CustomContainerJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CustomContainerJavaIT.java
index 00f37c0075..16743bffde 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CustomContainerJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/CustomContainerJavaIT.java
@@ -28,7 +28,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 @Test
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/IterateIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/IterateIT.java
index 6bcfdfee02..ab3db46fb4 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/IterateIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/IterateIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class IterateIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/IterateJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/IterateJavaIT.java
index 69b0c7e9ef..d7af9d9e38 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/IterateJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/IterateJavaIT.java
@@ -26,9 +26,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 import static org.citrusframework.container.Iterate.Builder.iterate;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class IterateJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ParallelIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ParallelIT.java
index 5a8c49b4e8..039f21b6b8 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ParallelIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ParallelIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class ParallelIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ParallelJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ParallelJavaIT.java
index 89a3d9d65b..60465e6452 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ParallelJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/ParallelJavaIT.java
@@ -29,9 +29,6 @@
 import static org.citrusframework.container.Parallel.Builder.parallel;
 import static org.citrusframework.container.Sequence.Builder.sequential;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class ParallelJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatOnErrorIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatOnErrorIT.java
index b754c74464..649fc5e722 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatOnErrorIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatOnErrorIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class RepeatOnErrorIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatOnErrorJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatOnErrorJavaIT.java
index 494dab404b..73d1a3dde7 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatOnErrorJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatOnErrorJavaIT.java
@@ -26,9 +26,6 @@
 import static org.citrusframework.container.Assert.Builder.assertException;
 import static org.citrusframework.container.RepeatOnErrorUntilTrue.Builder.repeatOnError;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class RepeatOnErrorJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatUntilTrueIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatUntilTrueIT.java
index e55982707a..4e1d3d0a3f 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatUntilTrueIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatUntilTrueIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class RepeatUntilTrueIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatUntilTrueJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatUntilTrueJavaIT.java
index 8537dbc9df..3985eee844 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatUntilTrueJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/RepeatUntilTrueJavaIT.java
@@ -23,9 +23,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 import static org.citrusframework.container.RepeatUntilTrue.Builder.repeat;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class RepeatUntilTrueJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/SequentialIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/SequentialIT.java
index 18537236b3..518419d40d 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/SequentialIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/SequentialIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class SequentialIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/SequentialJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/SequentialJavaIT.java
index aa2a836039..7f19896e85 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/SequentialJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/SequentialJavaIT.java
@@ -26,9 +26,6 @@
 import static org.citrusframework.actions.StopTimeAction.Builder.stopTime;
 import static org.citrusframework.container.Sequence.Builder.sequential;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class SequentialJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TemplateIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TemplateIT.java
index da7bda4d79..a72b18bcb1 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TemplateIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TemplateIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class TemplateIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerIT.java
index 5fa142a58f..9cdb28008e 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class TimerIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerJavaIT.java
index 86eeea1f2e..0dbe2733fe 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerJavaIT.java
@@ -27,7 +27,6 @@
 import static org.citrusframework.container.Timer.Builder.timer;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 @Test
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerParallelIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerParallelIT.java
index b61f118867..6ac222c231 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerParallelIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/TimerParallelIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class TimerParallelIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/WaitIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/WaitIT.java
index 46c441a2d3..d02ef0c9ac 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/WaitIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/container/WaitIT.java
@@ -29,7 +29,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public class WaitIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/ConcatFunctionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/ConcatFunctionIT.java
index f5156057cf..d4ed734c43 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/ConcatFunctionIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/ConcatFunctionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class ConcatFunctionIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/CustomFunctionIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/CustomFunctionIT.java
index a1cd53344e..2cc03ebb82 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/CustomFunctionIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/CustomFunctionIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class CustomFunctionIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/FunctionsIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/FunctionsIT.java
index 4f07ab1dc7..44052c65cd 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/FunctionsIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/functions/FunctionsIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class FunctionsIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/inject/ContextInjectionJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/inject/ContextInjectionJavaIT.java
index b4bacbfc21..b2b93d2876 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/inject/ContextInjectionJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/inject/ContextInjectionJavaIT.java
@@ -29,7 +29,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class ContextInjectionJavaIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/inject/EndpointInjectionJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/inject/EndpointInjectionJavaIT.java
index 81cbe1331b..3ca6b3cd57 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/inject/EndpointInjectionJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/inject/EndpointInjectionJavaIT.java
@@ -36,7 +36,6 @@
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class EndpointInjectionJavaIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/inject/ResourceInjectionJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/inject/ResourceInjectionJavaIT.java
index 763ad8770d..303219ceda 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/inject/ResourceInjectionJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/inject/ResourceInjectionJavaIT.java
@@ -38,7 +38,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class ResourceInjectionJavaIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/parameter/DataProviderIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/parameter/DataProviderIT.java
index 1239197794..471d2489e4 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/parameter/DataProviderIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/parameter/DataProviderIT.java
@@ -23,7 +23,6 @@
 import org.testng.annotations.*;
 
 /**
- * @author Christoph Deppisch
  * @since 2011
  */
 public class DataProviderIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/provider/DataProviderJavaIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/provider/DataProviderJavaIT.java
index 3e59df8e3f..f61499c1fc 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/provider/DataProviderJavaIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/provider/DataProviderJavaIT.java
@@ -25,9 +25,6 @@
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 import static org.citrusframework.actions.SleepAction.Builder.sleep;
 
-/**
- * @author Christoph Deppisch
- */
 public class DataProviderJavaIT extends TestNGCitrusSpringSupport {
 
     @CitrusTest
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/server/SimpleServer.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/server/SimpleServer.java
index 9c5741b18e..b0c6c572d4 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/server/SimpleServer.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/server/SimpleServer.java
@@ -26,7 +26,6 @@
 
 /**
  * Simple server implementation used in start/stop server integration test.
- * @author Christoph Deppisch
  * @since 2.2
  */
 public class SimpleServer extends AbstractServer {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/util/InvocationDummy.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/util/InvocationDummy.java
index d96576b7f6..63469e47c1 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/util/InvocationDummy.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/util/InvocationDummy.java
@@ -24,7 +24,6 @@
 
 /**
  * Test class only used to explain the usage of java reflection in test examples
- * @author Christoph Deppisch
  * @since 2006
  */
 public class InvocationDummy {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/validation/DateRangeValidationMatcherIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/validation/DateRangeValidationMatcherIT.java
index c33b217b87..1be54f5126 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/validation/DateRangeValidationMatcherIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/validation/DateRangeValidationMatcherIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Martin Maher
  * @since 2.5
  */
 public class DateRangeValidationMatcherIT  extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java
index 038ff5f155..27e14c7dda 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/GlobalVariablesIT.java
@@ -26,7 +26,6 @@
  * Global variables are loaded in advance to this test. Variables are printed within this test
  * to show that global property loader works fine.
  *
- * @author Philipp Komninos
  * @since 2010
  */
 public class GlobalVariablesIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/VariablesOrderIT.java b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/VariablesOrderIT.java
index 1dc6f36ebb..16c0415c18 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/VariablesOrderIT.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/integration/variables/VariablesOrderIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class VariablesOrderIT extends TestNGCitrusSpringSupport {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/testng/CitrusSpringConfigTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/testng/CitrusSpringConfigTest.java
index 18b31cb396..db7fa13f12 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/testng/CitrusSpringConfigTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/testng/CitrusSpringConfigTest.java
@@ -61,9 +61,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 @ContextConfiguration(classes = CitrusSpringConfigTest.CustomConfig.class)
 public class CitrusSpringConfigTest extends TestNGCitrusSpringSupport {
 
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/testng/TestNGEngineTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/testng/TestNGEngineTest.java
index b84e926f03..00a562531e 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/testng/TestNGEngineTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/testng/TestNGEngineTest.java
@@ -29,7 +29,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class TestNGEngineTest {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/testng/scan/JustLooksLikeTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/testng/scan/JustLooksLikeTest.java
index 0d3e22c39e..6e5ffb2e0a 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/testng/scan/JustLooksLikeTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/testng/scan/JustLooksLikeTest.java
@@ -17,7 +17,6 @@
 package org.citrusframework.testng.scan;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class JustLooksLikeTest {
diff --git a/runtime/citrus-testng/src/test/java/org/citrusframework/testng/scan/SampleTestNGTest.java b/runtime/citrus-testng/src/test/java/org/citrusframework/testng/scan/SampleTestNGTest.java
index 70d4edc56b..9578aed2dc 100644
--- a/runtime/citrus-testng/src/test/java/org/citrusframework/testng/scan/SampleTestNGTest.java
+++ b/runtime/citrus-testng/src/test/java/org/citrusframework/testng/scan/SampleTestNGTest.java
@@ -20,7 +20,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SampleTestNGTest {
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/TestActions.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/TestActions.java
index a46092cf74..4756266133 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/TestActions.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/TestActions.java
@@ -45,9 +45,6 @@
 import org.citrusframework.xml.container.WaitFor;
 import org.w3c.dom.Node;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestActions {
 
     /** Unmarshaller cache filled with instances created for custom action Xml element refs */
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/XmlTemplateLoader.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/XmlTemplateLoader.java
index c283a2f30c..1d6e9b86b5 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/XmlTemplateLoader.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/XmlTemplateLoader.java
@@ -29,9 +29,6 @@
 import org.citrusframework.util.FileUtils;
 import org.citrusframework.xml.container.Template;
 
-/**
- * @author Christoph Deppisch
- */
 public class XmlTemplateLoader implements TemplateLoader, ReferenceResolverAware {
 
     private final JAXBContext jaxbContext;
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/XmlTestCase.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/XmlTestCase.java
index 85c4ec6a8c..b86b7b08f7 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/XmlTestCase.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/XmlTestCase.java
@@ -36,9 +36,6 @@
 import org.citrusframework.variable.VariableUtils;
 import org.citrusframework.xml.actions.script.ScriptDefinitionType;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "test")
 public class XmlTestCase {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/XmlTestLoader.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/XmlTestLoader.java
index 81388fce5e..fe7c71fa6a 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/XmlTestLoader.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/XmlTestLoader.java
@@ -36,7 +36,6 @@
  * for test case and a parent application context. At runtime this class loads the Spring application context and gets
  * test case bean instance from context.
  *
- * @author Christoph Deppisch
  */
 public class XmlTestLoader extends DefaultTestLoader implements TestSourceAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Action.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Action.java
index f0ed00762e..5427774d00 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Action.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Action.java
@@ -25,9 +25,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "action")
 public class Action implements TestActionBuilder<TestAction>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/AntRun.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/AntRun.java
index 0cc76d48be..0666fa962b 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/AntRun.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/AntRun.java
@@ -30,9 +30,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "ant")
 public class AntRun implements TestActionBuilder<AntRunAction>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/ApplyTemplate.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/ApplyTemplate.java
index d461e70d8a..d8a45b21a2 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/ApplyTemplate.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/ApplyTemplate.java
@@ -31,9 +31,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.xml.XmlTemplateLoader;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "apply-template")
 public class ApplyTemplate implements TestActionBuilder<Template>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/CreateVariables.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/CreateVariables.java
index 3209562baf..d9358190a1 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/CreateVariables.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/CreateVariables.java
@@ -33,9 +33,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 import org.citrusframework.util.FileUtils;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "create-variables")
 public class CreateVariables implements TestActionBuilder<CreateVariablesAction> {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Delay.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Delay.java
index 72ad172bc3..05379a9ea9 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Delay.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Delay.java
@@ -18,9 +18,6 @@
 
 import jakarta.xml.bind.annotation.XmlRootElement;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "delay")
 public class Delay extends Sleep {
 }
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Echo.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Echo.java
index 67b8d5ff5a..93b8125ca9 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Echo.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Echo.java
@@ -23,9 +23,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.EchoAction;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "echo")
 public class Echo implements TestActionBuilder<EchoAction> {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/ExpectTimeout.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/ExpectTimeout.java
index 6970074d0e..e1cef02af8 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/ExpectTimeout.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/ExpectTimeout.java
@@ -30,9 +30,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.ReceiveTimeoutAction;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "expect-timeout")
 public class ExpectTimeout implements TestActionBuilder<ReceiveTimeoutAction> {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Fail.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Fail.java
index e4d4aab44b..b93fa48705 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Fail.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Fail.java
@@ -23,9 +23,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.FailAction;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "fail")
 public class Fail implements TestActionBuilder<FailAction> {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/LoadProperties.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/LoadProperties.java
index 18c16a2334..076baf1b10 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/LoadProperties.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/LoadProperties.java
@@ -26,9 +26,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.LoadPropertiesAction;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "load")
 public class LoadProperties implements TestActionBuilder<LoadPropertiesAction> {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Message.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Message.java
index ba4d7d7e7a..7fa9b207e5 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Message.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Message.java
@@ -29,9 +29,6 @@
 
 import org.citrusframework.xml.actions.script.ScriptDefinitionType;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
         "headers",
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/MessageSupport.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/MessageSupport.java
index 98ea995637..4139c2b325 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/MessageSupport.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/MessageSupport.java
@@ -36,9 +36,6 @@
 import static org.citrusframework.dsl.MessageSupport.MessageBodySupport.fromBody;
 import static org.citrusframework.dsl.MessageSupport.MessageHeaderSupport.fromHeaders;
 
-/**
- * @author Christoph Deppisch
- */
 public final class MessageSupport {
 
     private MessageSupport() {
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Print.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Print.java
index 4a3f419293..3e6a9c3240 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Print.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Print.java
@@ -18,9 +18,6 @@
 
 import jakarta.xml.bind.annotation.XmlRootElement;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "print")
 public class Print extends Echo {
 }
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/PurgeEndpoint.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/PurgeEndpoint.java
index be93fc60a8..1e6be0a1a7 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/PurgeEndpoint.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/PurgeEndpoint.java
@@ -32,9 +32,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "purge-endpoint")
 public class PurgeEndpoint implements TestActionBuilder<PurgeEndpointAction>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Sleep.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Sleep.java
index 9f2a365650..17f47ea989 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Sleep.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Sleep.java
@@ -24,9 +24,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.SleepAction;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "sleep")
 public class Sleep implements TestActionBuilder<SleepAction> {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Start.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Start.java
index c3177ac379..9ca853f4d8 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Start.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Start.java
@@ -31,9 +31,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "start")
 public class Start implements TestActionBuilder<StartServerAction>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Stop.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Stop.java
index ef73abac2a..b3bd73f77f 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Stop.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Stop.java
@@ -31,9 +31,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "stop")
 public class Stop implements TestActionBuilder<StopServerAction>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/StopTime.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/StopTime.java
index 25493d7f79..a40d139cbc 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/StopTime.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/StopTime.java
@@ -23,9 +23,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.StopTimeAction;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "stop-time")
 public class StopTime implements TestActionBuilder<StopTimeAction> {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/StopTimer.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/StopTimer.java
index fd94e3dcf3..e121d9d0f8 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/StopTimer.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/StopTimer.java
@@ -23,9 +23,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.StopTimerAction;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "stop-timer")
 public class StopTimer implements TestActionBuilder<StopTimerAction> {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Trace.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Trace.java
index caa5d22b5c..a1e608a1bc 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Trace.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Trace.java
@@ -18,9 +18,6 @@
 
 import jakarta.xml.bind.annotation.XmlRootElement;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "trace")
 public class Trace extends TraceVariables {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/TraceVariables.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/TraceVariables.java
index 407e7fe61b..10b21a1a05 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/TraceVariables.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/TraceVariables.java
@@ -28,9 +28,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.TraceVariablesAction;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "trace-variables")
 public class TraceVariables implements TestActionBuilder<TraceVariablesAction> {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Transform.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Transform.java
index 41a39860b9..48503f87e2 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Transform.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/Transform.java
@@ -27,9 +27,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.TransformAction;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "transform")
 public class Transform implements TestActionBuilder<TransformAction> {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/XmlTestActionBuilder.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/XmlTestActionBuilder.java
index 91ab5b0f57..bc2bb97ffb 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/XmlTestActionBuilder.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/actions/XmlTestActionBuilder.java
@@ -24,9 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public interface XmlTestActionBuilder {
 
     /** Logger */
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Assert.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Assert.java
index d8deaac041..d28b983486 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Assert.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Assert.java
@@ -25,9 +25,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.xml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "assert")
 public class Assert implements TestActionBuilder<org.citrusframework.container.Assert>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Catch.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Catch.java
index ec1e273e8b..e08e9ebe9e 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Catch.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Catch.java
@@ -25,9 +25,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.xml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "catch")
 public class Catch implements TestActionBuilder<org.citrusframework.container.Catch>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Conditional.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Conditional.java
index d7385c0448..c0c0c95d0b 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Conditional.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Conditional.java
@@ -25,9 +25,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.xml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "conditional")
 public class Conditional implements TestActionBuilder<org.citrusframework.container.Conditional>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Iterate.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Iterate.java
index 99756a02b6..edfa082879 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Iterate.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Iterate.java
@@ -25,9 +25,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.xml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "iterate")
 public class Iterate implements TestActionBuilder<org.citrusframework.container.Iterate>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Parallel.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Parallel.java
index 853ba856f5..aee8f914b7 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Parallel.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Parallel.java
@@ -24,9 +24,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.xml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "parallel")
 public class Parallel implements TestActionBuilder<org.citrusframework.container.Parallel>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Repeat.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Repeat.java
index 5c780e0e83..32b70a459d 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Repeat.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Repeat.java
@@ -25,9 +25,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.xml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "repeat")
 public class Repeat implements TestActionBuilder<org.citrusframework.container.RepeatUntilTrue>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/RepeatOnError.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/RepeatOnError.java
index 73c3bbef3b..7dcdc89fe1 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/RepeatOnError.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/RepeatOnError.java
@@ -25,9 +25,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.xml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "repeat-on-error")
 public class RepeatOnError implements TestActionBuilder<org.citrusframework.container.RepeatOnErrorUntilTrue>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Sequential.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Sequential.java
index 4404cb6b3d..a50f7cbfca 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Sequential.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Sequential.java
@@ -25,9 +25,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.xml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "sequential")
 public class Sequential implements TestActionBuilder<Sequence>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Template.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Template.java
index 1e15a18188..b443478a7a 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Template.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Template.java
@@ -30,9 +30,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.xml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "template")
 public class Template implements TestActionBuilder<org.citrusframework.container.Template>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Timer.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Timer.java
index c82d8c0236..cc148efc15 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Timer.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/container/Timer.java
@@ -25,9 +25,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.xml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 @XmlRootElement(name = "timer")
 public class Timer implements TestActionBuilder<org.citrusframework.container.Timer>, ReferenceResolverAware {
 
diff --git a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/util/PayloadElementParser.java b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/util/PayloadElementParser.java
index 6b8cc7d044..346728afab 100644
--- a/runtime/citrus-xml/src/main/java/org/citrusframework/xml/util/PayloadElementParser.java
+++ b/runtime/citrus-xml/src/main/java/org/citrusframework/xml/util/PayloadElementParser.java
@@ -35,7 +35,6 @@
 /**
  * Payload element parser used in send and receive actions is able to serialize XML body elements.
  *
- * @author Christoph Deppisch
  */
 public abstract class PayloadElementParser {
 
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/integration/XmlTestLoaderIT.java b/runtime/citrus-xml/src/test/java/org/citrusframework/integration/XmlTestLoaderIT.java
index af0096cfaa..7276516baf 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/integration/XmlTestLoaderIT.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/integration/XmlTestLoaderIT.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.1
  */
 @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/NoopMessageProcessor.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/NoopMessageProcessor.java
index f93c8ea5bb..ab3910281b 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/NoopMessageProcessor.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/NoopMessageProcessor.java
@@ -20,9 +20,6 @@
 import org.citrusframework.message.Message;
 import org.citrusframework.message.MessageProcessor;
 
-/**
- * @author Christoph Deppisch
- */
 public class NoopMessageProcessor implements MessageProcessor {
 
     @Override
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/NoopVariableExtractor.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/NoopVariableExtractor.java
index c6c61cdaae..a555a68246 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/NoopVariableExtractor.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/NoopVariableExtractor.java
@@ -22,9 +22,6 @@
 import org.citrusframework.message.Message;
 import org.citrusframework.variable.VariableExtractor;
 
-/**
- * @author Christoph Deppisch
- */
 public class NoopVariableExtractor implements VariableExtractor {
     @Override
     public void extractVariables(Message message, TestContext context) {
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/TestLoaderTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/TestLoaderTest.java
index d242e99f45..f9bdc39c74 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/TestLoaderTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/TestLoaderTest.java
@@ -20,9 +20,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestLoaderTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/XmlTestLoaderTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/XmlTestLoaderTest.java
index bce55b8c97..8e1512b237 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/XmlTestLoaderTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/XmlTestLoaderTest.java
@@ -19,9 +19,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class XmlTestLoaderTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/AbstractXmlActionTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/AbstractXmlActionTest.java
index 0e809c5228..e2e07421ca 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/AbstractXmlActionTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/AbstractXmlActionTest.java
@@ -36,9 +36,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractXmlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ActionTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ActionTest.java
index 8377ae7c8e..6407aeee43 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ActionTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ActionTest.java
@@ -25,9 +25,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 public class ActionTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/AntRunTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/AntRunTest.java
index e52afab4ef..8e4ac97f72 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/AntRunTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/AntRunTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AntRunTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ApplyTemplateTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ApplyTemplateTest.java
index 7285e2f219..2421709f4f 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ApplyTemplateTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ApplyTemplateTest.java
@@ -25,9 +25,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 public class ApplyTemplateTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/CreateVariablesTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/CreateVariablesTest.java
index addbbfe398..ca20b41379 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/CreateVariablesTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/CreateVariablesTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CreateVariablesTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/DelayTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/DelayTest.java
index de449c023e..234afeec1b 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/DelayTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/DelayTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DelayTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/EchoTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/EchoTest.java
index 3c5fdc0be2..4bafcc1fef 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/EchoTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/EchoTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class EchoTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ExpectTimeoutTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ExpectTimeoutTest.java
index e2b474e25b..c35450dd30 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ExpectTimeoutTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ExpectTimeoutTest.java
@@ -27,9 +27,6 @@
 
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 
-/**
- * @author Christoph Deppisch
- */
 public class ExpectTimeoutTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/FailTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/FailTest.java
index 454174ee81..8ae11ab2a2 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/FailTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/FailTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class FailTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/LoadPropertiesTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/LoadPropertiesTest.java
index b345ffe0ff..46e488d1c3 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/LoadPropertiesTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/LoadPropertiesTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class LoadPropertiesTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/PurgeEndpointTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/PurgeEndpointTest.java
index afea953a39..f4f3fe1cd8 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/PurgeEndpointTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/PurgeEndpointTest.java
@@ -27,9 +27,6 @@
 
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 
-/**
- * @author Christoph Deppisch
- */
 public class PurgeEndpointTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ReceiveTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ReceiveTest.java
index ee297c93c7..2a9ea085bb 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ReceiveTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/ReceiveTest.java
@@ -50,9 +50,6 @@
 
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveTest extends AbstractXmlActionTest {
 
     @BindToRegistry
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/SendTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/SendTest.java
index 8cafc536aa..4a5c5dcfe5 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/SendTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/SendTest.java
@@ -45,9 +45,6 @@
 
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendTest extends AbstractXmlActionTest {
 
     @BindToRegistry
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/SleepTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/SleepTest.java
index 182157f228..58b94a9b3f 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/SleepTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/SleepTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SleepTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StartTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StartTest.java
index 7127140f0c..b5e3f8ea1c 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StartTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StartTest.java
@@ -29,9 +29,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class StartTest extends AbstractXmlActionTest {
 
     @BindToRegistry
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StopTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StopTest.java
index 7a369c0ff2..0d19300412 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StopTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StopTest.java
@@ -29,9 +29,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopTest extends AbstractXmlActionTest {
 
     @BindToRegistry
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StopTimeTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StopTimeTest.java
index 57bf4c5ff5..2af1ad7ad2 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StopTimeTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StopTimeTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopTimeTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StopTimerTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StopTimerTest.java
index a64f7d39a5..2c44ef01ea 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StopTimerTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/StopTimerTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopTimerTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/TraceVariablesTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/TraceVariablesTest.java
index de154d135e..8e9e05efc8 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/TraceVariablesTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/TraceVariablesTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TraceVariablesTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/TransformTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/TransformTest.java
index 7398a830b4..2dfcd7d637 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/TransformTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/actions/TransformTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TransformTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/AssertTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/AssertTest.java
index a1d7ce189e..60c748f641 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/AssertTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/AssertTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AssertTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/AsyncTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/AsyncTest.java
index ee67cb5bab..47c93fb129 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/AsyncTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/AsyncTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AsyncTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/CatchTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/CatchTest.java
index dec447e25d..8a380c4845 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/CatchTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/CatchTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CatchTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/ConditionalTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/ConditionalTest.java
index 4bfef4e489..0c230b0f4a 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/ConditionalTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/ConditionalTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ConditionalTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/IterateTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/IterateTest.java
index 38ab75adf2..24f51bf61e 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/IterateTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/IterateTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class IterateTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/ParallelTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/ParallelTest.java
index 0b48335968..55f2aca6bd 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/ParallelTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/ParallelTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ParallelTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/RepeatOnErrorTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/RepeatOnErrorTest.java
index 6f132aae74..06ec32673b 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/RepeatOnErrorTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/RepeatOnErrorTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RepeatOnErrorTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/RepeatTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/RepeatTest.java
index 6fb29eb704..2165d3834c 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/RepeatTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/RepeatTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RepeatTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/SequentialTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/SequentialTest.java
index a4b591fabb..f511fa66e8 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/SequentialTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/SequentialTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SequentialTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/TemplateTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/TemplateTest.java
index 038eea1cb9..3ae394b6f8 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/TemplateTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/TemplateTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TemplateTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/TimerTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/TimerTest.java
index 0c4137bf46..60c01d8fe8 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/TimerTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/TimerTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TimerTest extends AbstractXmlActionTest {
 
     @Test
diff --git a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/WaitForTest.java b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/WaitForTest.java
index 4962540015..40bea3f589 100644
--- a/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/WaitForTest.java
+++ b/runtime/citrus-xml/src/test/java/org/citrusframework/xml/container/WaitForTest.java
@@ -33,9 +33,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class WaitForTest extends AbstractXmlActionTest {
 
     private static final String DEFAULT_WAIT_TIME = "5000";
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/TestActions.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/TestActions.java
index 5996f2b685..4fdd0a2a1d 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/TestActions.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/TestActions.java
@@ -32,9 +32,6 @@
 import org.citrusframework.yaml.container.Timer;
 import org.citrusframework.yaml.container.WaitFor;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestActions implements Supplier<TestActionBuilder<?>> {
 
     private TestActionBuilder<?> builder;
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/YamlTemplateLoader.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/YamlTemplateLoader.java
index 1f2aaae7f1..afb062d76f 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/YamlTemplateLoader.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/YamlTemplateLoader.java
@@ -29,9 +29,6 @@
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.Constructor;
 
-/**
- * @author Christoph Deppisch
- */
 public class YamlTemplateLoader implements ReferenceResolverAware, TemplateLoader {
 
     private final Yaml yaml;
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/YamlTestCase.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/YamlTestCase.java
index 71c0389eb2..1fa9cdf11c 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/YamlTestCase.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/YamlTestCase.java
@@ -29,9 +29,6 @@
 import org.citrusframework.variable.VariableUtils;
 import org.citrusframework.yaml.actions.script.ScriptDefinitionType;
 
-/**
- * @author Christoph Deppisch
- */
 public class YamlTestCase {
 
     private final DefaultTestCase delegate = new DefaultTestCase();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/YamlTestLoader.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/YamlTestLoader.java
index a48d9a65c6..6b5297e469 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/YamlTestLoader.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/YamlTestLoader.java
@@ -39,7 +39,6 @@
 
 /**
  * Loads test case from given YAML source.
- * @author Christoph Deppisch
  */
 public class YamlTestLoader extends DefaultTestLoader implements TestSourceAware {
 
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Action.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Action.java
index 4d8e41c390..80fae1dad9 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Action.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Action.java
@@ -22,9 +22,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 public class Action implements TestActionBuilder<TestAction>, ReferenceResolverAware {
 
     private String reference;
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/AntRun.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/AntRun.java
index 0b65ff8c8d..5a044e806b 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/AntRun.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/AntRun.java
@@ -23,9 +23,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 public class AntRun implements TestActionBuilder<AntRunAction>, ReferenceResolverAware {
 
     private final AntRunAction.Builder builder = new AntRunAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/ApplyTemplate.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/ApplyTemplate.java
index ff97016f16..22d6888da1 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/ApplyTemplate.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/ApplyTemplate.java
@@ -24,9 +24,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.yaml.YamlTemplateLoader;
 
-/**
- * @author Christoph Deppisch
- */
 public class ApplyTemplate implements TestActionBuilder<Template>, ReferenceResolverAware {
 
     private final Template.Builder builder = new Template.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/CreateVariables.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/CreateVariables.java
index 56a5e8c504..cd168ee9a2 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/CreateVariables.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/CreateVariables.java
@@ -26,9 +26,6 @@
 import org.citrusframework.exceptions.CitrusRuntimeException;
 import org.citrusframework.util.FileUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class CreateVariables implements TestActionBuilder<CreateVariablesAction> {
 
     private final CreateVariablesAction.Builder builder = new CreateVariablesAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Delay.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Delay.java
index d8dfd1c680..ccbf31c93d 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Delay.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Delay.java
@@ -16,8 +16,5 @@
 
 package org.citrusframework.yaml.actions;
 
-/**
- * @author Christoph Deppisch
- */
 public class Delay extends Sleep {
 }
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Echo.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Echo.java
index cb43c1cdc5..228b2137cc 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Echo.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Echo.java
@@ -19,9 +19,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.EchoAction;
 
-/**
- * @author Christoph Deppisch
- */
 public class Echo implements TestActionBuilder<EchoAction> {
 
     private final EchoAction.Builder builder = new EchoAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/ExpectTimeout.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/ExpectTimeout.java
index 985b79adcf..333162fe5a 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/ExpectTimeout.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/ExpectTimeout.java
@@ -24,9 +24,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.ReceiveTimeoutAction;
 
-/**
- * @author Christoph Deppisch
- */
 public class ExpectTimeout implements TestActionBuilder<ReceiveTimeoutAction> {
 
     private final ReceiveTimeoutAction.Builder builder = new ReceiveTimeoutAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Fail.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Fail.java
index f3a1459da0..c9dfaa4545 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Fail.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Fail.java
@@ -19,9 +19,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.FailAction;
 
-/**
- * @author Christoph Deppisch
- */
 public class Fail implements TestActionBuilder<FailAction> {
 
     private final FailAction.Builder builder = new FailAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/LoadProperties.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/LoadProperties.java
index ecdc5c1a17..9d273121d2 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/LoadProperties.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/LoadProperties.java
@@ -19,9 +19,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.LoadPropertiesAction;
 
-/**
- * @author Christoph Deppisch
- */
 public class LoadProperties implements TestActionBuilder<LoadPropertiesAction> {
 
     private final LoadPropertiesAction.Builder builder = new LoadPropertiesAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Message.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Message.java
index 9743ff0510..1d06cd2873 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Message.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Message.java
@@ -22,9 +22,6 @@
 
 import org.citrusframework.yaml.actions.script.ScriptDefinitionType;
 
-/**
- * @author Christoph Deppisch
- */
 public class Message {
     protected String headerIgnoreCase;
     protected List<Header> headers;
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/MessageSupport.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/MessageSupport.java
index 17aeca8aa2..e06bb0aeb8 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/MessageSupport.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/MessageSupport.java
@@ -35,9 +35,6 @@
 import static org.citrusframework.dsl.MessageSupport.MessageBodySupport.fromBody;
 import static org.citrusframework.dsl.MessageSupport.MessageHeaderSupport.fromHeaders;
 
-/**
- * @author Christoph Deppisch
- */
 public final class MessageSupport {
 
     private MessageSupport() {
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Print.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Print.java
index 2f64353b86..e1c7560c43 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Print.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Print.java
@@ -16,8 +16,5 @@
 
 package org.citrusframework.yaml.actions;
 
-/**
- * @author Christoph Deppisch
- */
 public class Print extends Echo {
 }
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/PurgeEndpoint.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/PurgeEndpoint.java
index 82cd1cb9dd..69c602f623 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/PurgeEndpoint.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/PurgeEndpoint.java
@@ -26,9 +26,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 public class PurgeEndpoint implements TestActionBuilder<PurgeEndpointAction>, ReferenceResolverAware {
 
     private final PurgeEndpointAction.Builder builder = new PurgeEndpointAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Sleep.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Sleep.java
index 8b1419a9bf..db372e7b8d 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Sleep.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Sleep.java
@@ -21,9 +21,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.SleepAction;
 
-/**
- * @author Christoph Deppisch
- */
 public class Sleep implements TestActionBuilder<SleepAction> {
 
     private final SleepAction.Builder builder = new SleepAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Start.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Start.java
index 38d35a2e33..54575ade6e 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Start.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Start.java
@@ -23,9 +23,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 public class Start implements TestActionBuilder<StartServerAction>, ReferenceResolverAware {
 
     private final StartServerAction.Builder builder = new StartServerAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Stop.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Stop.java
index 7b7a338c58..f07ca74d12 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Stop.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Stop.java
@@ -23,9 +23,6 @@
 import org.citrusframework.spi.ReferenceResolver;
 import org.citrusframework.spi.ReferenceResolverAware;
 
-/**
- * @author Christoph Deppisch
- */
 public class Stop implements TestActionBuilder<StopServerAction>, ReferenceResolverAware {
 
     private final StopServerAction.Builder builder = new StopServerAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/StopTime.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/StopTime.java
index 36ebfc864c..7b0c168a40 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/StopTime.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/StopTime.java
@@ -19,9 +19,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.StopTimeAction;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopTime implements TestActionBuilder<StopTimeAction> {
 
     private final StopTimeAction.Builder builder = new StopTimeAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/StopTimer.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/StopTimer.java
index 0d29608c81..fe6e3d0db2 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/StopTimer.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/StopTimer.java
@@ -19,9 +19,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.StopTimerAction;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopTimer implements TestActionBuilder<StopTimerAction> {
 
     private final StopTimerAction.Builder builder = new StopTimerAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/TraceVariables.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/TraceVariables.java
index 8516ef0cd2..abf64dad3f 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/TraceVariables.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/TraceVariables.java
@@ -22,9 +22,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.TraceVariablesAction;
 
-/**
- * @author Christoph Deppisch
- */
 public class TraceVariables implements TestActionBuilder<TraceVariablesAction> {
 
     private final TraceVariablesAction.Builder builder = new TraceVariablesAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Transform.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Transform.java
index 0162b7d98d..da80fe7386 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Transform.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/Transform.java
@@ -19,9 +19,6 @@
 import org.citrusframework.TestActionBuilder;
 import org.citrusframework.actions.TransformAction;
 
-/**
- * @author Christoph Deppisch
- */
 public class Transform implements TestActionBuilder<TransformAction> {
 
     private final TransformAction.Builder builder = new TransformAction.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/YamlTestActionBuilder.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/YamlTestActionBuilder.java
index 6ac762a110..827d496287 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/YamlTestActionBuilder.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/actions/YamlTestActionBuilder.java
@@ -25,9 +25,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @author Christoph Deppisch
- */
 public interface YamlTestActionBuilder {
 
     /** Logger */
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Assert.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Assert.java
index c9d7929cbc..f417b62a9a 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Assert.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Assert.java
@@ -23,9 +23,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.yaml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 public class Assert implements TestActionBuilder<org.citrusframework.container.Assert>, ReferenceResolverAware {
 
     private final org.citrusframework.container.Assert.Builder builder = new org.citrusframework.container.Assert.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Async.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Async.java
index 3bfcbff7c0..94e4d6a917 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Async.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Async.java
@@ -23,9 +23,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.yaml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 public class Async implements TestActionBuilder<org.citrusframework.container.Async>, ReferenceResolverAware {
 
     private final org.citrusframework.container.Async.Builder builder = new org.citrusframework.container.Async.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Catch.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Catch.java
index 20ee4d5925..e254e81951 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Catch.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Catch.java
@@ -23,9 +23,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.yaml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 public class Catch implements TestActionBuilder<org.citrusframework.container.Catch>, ReferenceResolverAware {
 
     private final org.citrusframework.container.Catch.Builder builder = new org.citrusframework.container.Catch.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Conditional.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Conditional.java
index c96ef9bc73..42dbda3313 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Conditional.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Conditional.java
@@ -23,9 +23,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.yaml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 public class Conditional implements TestActionBuilder<org.citrusframework.container.Conditional>, ReferenceResolverAware {
 
     private final org.citrusframework.container.Conditional.Builder builder = new org.citrusframework.container.Conditional.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Iterate.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Iterate.java
index 9cc6b5ae3f..7e96da4f2c 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Iterate.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Iterate.java
@@ -23,9 +23,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.yaml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 public class Iterate implements TestActionBuilder<org.citrusframework.container.Iterate>, ReferenceResolverAware {
 
     private final org.citrusframework.container.Iterate.Builder builder = new org.citrusframework.container.Iterate.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Parallel.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Parallel.java
index 0db7facc8d..dc3ca821b6 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Parallel.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Parallel.java
@@ -23,9 +23,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.yaml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 public class Parallel implements TestActionBuilder<org.citrusframework.container.Parallel>, ReferenceResolverAware {
 
     private final org.citrusframework.container.Parallel.Builder builder = new org.citrusframework.container.Parallel.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Repeat.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Repeat.java
index 5f55ce4d8b..f05108df69 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Repeat.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Repeat.java
@@ -24,9 +24,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.yaml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 public class Repeat implements TestActionBuilder<RepeatUntilTrue>, ReferenceResolverAware {
 
     private final RepeatUntilTrue.Builder builder = new RepeatUntilTrue.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/RepeatOnError.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/RepeatOnError.java
index 0faebac1ca..d9cd020949 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/RepeatOnError.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/RepeatOnError.java
@@ -24,9 +24,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.yaml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 public class RepeatOnError implements TestActionBuilder<RepeatOnErrorUntilTrue>, ReferenceResolverAware {
 
     private final RepeatOnErrorUntilTrue.Builder builder = new RepeatOnErrorUntilTrue.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Sequence.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Sequence.java
index e2f4d0a280..dd16ee2a68 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Sequence.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Sequence.java
@@ -23,9 +23,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.yaml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 public class Sequence implements TestActionBuilder<org.citrusframework.container.Sequence>, ReferenceResolverAware {
 
     private final org.citrusframework.container.Sequence.Builder builder = new org.citrusframework.container.Sequence.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Template.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Template.java
index 56b6b7d71b..7e6094ac76 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Template.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Template.java
@@ -23,9 +23,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.yaml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 public class Template implements TestActionBuilder<org.citrusframework.container.Template>, ReferenceResolverAware {
 
     private final org.citrusframework.container.Template.Builder builder = new org.citrusframework.container.Template.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Timer.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Timer.java
index 87a60fc8d8..86d10068e6 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Timer.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/Timer.java
@@ -23,9 +23,6 @@
 import org.citrusframework.spi.ReferenceResolverAware;
 import org.citrusframework.yaml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 public class Timer implements TestActionBuilder<org.citrusframework.container.Timer>, ReferenceResolverAware {
 
     private final org.citrusframework.container.Timer.Builder builder = new org.citrusframework.container.Timer.Builder();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/WaitFor.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/WaitFor.java
index 56a4cfe3c0..776f186de0 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/WaitFor.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/container/WaitFor.java
@@ -28,9 +28,6 @@
 import org.citrusframework.util.StringUtils;
 import org.citrusframework.yaml.TestActions;
 
-/**
- * @author Christoph Deppisch
- */
 public class WaitFor implements TestActionBuilder<Wait>, ReferenceResolverAware {
 
     private final Wait.Builder<Condition> builder = new Wait.Builder<>();
diff --git a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/util/PayloadElementParser.java b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/util/PayloadElementParser.java
index 4914f5e1d6..7d7fe14dee 100644
--- a/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/util/PayloadElementParser.java
+++ b/runtime/citrus-yaml/src/main/java/org/citrusframework/yaml/util/PayloadElementParser.java
@@ -34,7 +34,6 @@
 /**
  * Payload element parser used in send and receive actions is able to serialize XML body elements.
  *
- * @author Christoph Deppisch
  */
 public abstract class PayloadElementParser {
 
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/integration/YamlTestLoaderIT.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/integration/YamlTestLoaderIT.java
index 31718baf12..902e45d58e 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/integration/YamlTestLoaderIT.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/integration/YamlTestLoaderIT.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.1
  */
 @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/NoopMessageProcessor.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/NoopMessageProcessor.java
index 49e8a825db..e0eaea4d81 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/NoopMessageProcessor.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/NoopMessageProcessor.java
@@ -20,9 +20,6 @@
 import org.citrusframework.message.Message;
 import org.citrusframework.message.MessageProcessor;
 
-/**
- * @author Christoph Deppisch
- */
 public class NoopMessageProcessor implements MessageProcessor {
 
     @Override
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/NoopVariableExtractor.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/NoopVariableExtractor.java
index 17d8dffc24..a33e913eea 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/NoopVariableExtractor.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/NoopVariableExtractor.java
@@ -22,9 +22,6 @@
 import org.citrusframework.message.Message;
 import org.citrusframework.variable.VariableExtractor;
 
-/**
- * @author Christoph Deppisch
- */
 public class NoopVariableExtractor implements VariableExtractor {
     @Override
     public void extractVariables(Message message, TestContext context) {
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/TestLoaderTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/TestLoaderTest.java
index b62d6263a8..c58c8dafea 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/TestLoaderTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/TestLoaderTest.java
@@ -20,9 +20,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TestLoaderTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/AbstractYamlActionTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/AbstractYamlActionTest.java
index bd2ba491df..3d59a6af0c 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/AbstractYamlActionTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/AbstractYamlActionTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class AbstractYamlActionTest extends AbstractTestNGUnitTest {
 
     protected Citrus citrus;
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ActionTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ActionTest.java
index e2bf4bcbcc..2cd7118825 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ActionTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ActionTest.java
@@ -25,9 +25,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 public class ActionTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/AntRunTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/AntRunTest.java
index ac4925d430..d0f7690065 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/AntRunTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/AntRunTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AntRunTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ApplyTemplateTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ApplyTemplateTest.java
index 1b5df1df7e..d75fee489a 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ApplyTemplateTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ApplyTemplateTest.java
@@ -25,9 +25,6 @@
 
 import static org.citrusframework.actions.EchoAction.Builder.echo;
 
-/**
- * @author Christoph Deppisch
- */
 public class ApplyTemplateTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/CreateVariablesTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/CreateVariablesTest.java
index 4124190b7e..aaeaef2794 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/CreateVariablesTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/CreateVariablesTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CreateVariablesTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/EchoTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/EchoTest.java
index 62e15b7d86..3fe19eba36 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/EchoTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/EchoTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class EchoTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ExpectTimeoutTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ExpectTimeoutTest.java
index 4389c05f80..17f384a6ee 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ExpectTimeoutTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ExpectTimeoutTest.java
@@ -27,9 +27,6 @@
 
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 
-/**
- * @author Christoph Deppisch
- */
 public class ExpectTimeoutTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/FailTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/FailTest.java
index 75f3d8c566..aa4ebda9a3 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/FailTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/FailTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class FailTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/LoadPropertiesTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/LoadPropertiesTest.java
index 8cbdacab4c..f7c873ea93 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/LoadPropertiesTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/LoadPropertiesTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class LoadPropertiesTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/PurgeEndpointTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/PurgeEndpointTest.java
index c405f45f12..c1421b457f 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/PurgeEndpointTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/PurgeEndpointTest.java
@@ -27,9 +27,6 @@
 
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 
-/**
- * @author Christoph Deppisch
- */
 public class PurgeEndpointTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ReceiveTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ReceiveTest.java
index fdb6f7b328..33c6280160 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ReceiveTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/ReceiveTest.java
@@ -49,9 +49,6 @@
 
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveTest extends AbstractYamlActionTest {
 
     @BindToRegistry
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/SendTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/SendTest.java
index a8a287c39f..5bc8b0880a 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/SendTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/SendTest.java
@@ -44,9 +44,6 @@
 
 import static org.citrusframework.endpoint.direct.DirectEndpoints.direct;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendTest extends AbstractYamlActionTest {
 
     @BindToRegistry
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/SleepTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/SleepTest.java
index 05ec020d15..326c008e3b 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/SleepTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/SleepTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SleepTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StartTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StartTest.java
index b673be4ed2..56c4d3525e 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StartTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StartTest.java
@@ -29,9 +29,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class StartTest extends AbstractYamlActionTest {
 
     @BindToRegistry
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StopTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StopTest.java
index 31106e790d..f9bcbd576f 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StopTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StopTest.java
@@ -29,9 +29,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopTest extends AbstractYamlActionTest {
 
     @BindToRegistry
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StopTimeTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StopTimeTest.java
index c6b9a995f0..43fe2da6b2 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StopTimeTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StopTimeTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopTimeTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StopTimerTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StopTimerTest.java
index 8555356359..761250b2e3 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StopTimerTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/StopTimerTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class StopTimerTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/TraceVariablesTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/TraceVariablesTest.java
index 1e43b8e3f6..d718a5d22f 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/TraceVariablesTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/TraceVariablesTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TraceVariablesTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/TransformTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/TransformTest.java
index 08f3e0c730..671a1b7a40 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/TransformTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/actions/TransformTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TransformTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/AssertTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/AssertTest.java
index c4cd2dc3ba..430da3556e 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/AssertTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/AssertTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AssertTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/AsyncTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/AsyncTest.java
index 75d76a7845..d96b7a6ed8 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/AsyncTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/AsyncTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class AsyncTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/CatchTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/CatchTest.java
index 93da0eafb2..0dd88fe291 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/CatchTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/CatchTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CatchTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/ConditionalTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/ConditionalTest.java
index 354f026410..44c1e8e30e 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/ConditionalTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/ConditionalTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ConditionalTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/IterateTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/IterateTest.java
index c212fbf3d0..9c6a4abf36 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/IterateTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/IterateTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class IterateTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/ParallelTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/ParallelTest.java
index af649d4efa..d858a954c0 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/ParallelTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/ParallelTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ParallelTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/RepeatOnErrorTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/RepeatOnErrorTest.java
index 927addac5a..de8d8f9901 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/RepeatOnErrorTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/RepeatOnErrorTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RepeatOnErrorTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/RepeatTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/RepeatTest.java
index 8b000fe3d5..3647641ff4 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/RepeatTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/RepeatTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RepeatTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/SequentialTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/SequentialTest.java
index 6de1d2da06..74c517d185 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/SequentialTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/SequentialTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SequentialTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/TemplateTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/TemplateTest.java
index e9cd3cbe7e..1e57d535bf 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/TemplateTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/TemplateTest.java
@@ -22,9 +22,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TemplateTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/TimerTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/TimerTest.java
index c0f813d65c..22a2aaec36 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/TimerTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/TimerTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class TimerTest extends AbstractYamlActionTest {
 
     @Test
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/WaitForTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/WaitForTest.java
index 898ad27b29..83933741b8 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/WaitForTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/container/WaitForTest.java
@@ -33,9 +33,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class WaitForTest extends AbstractYamlActionTest {
 
     private static final String DEFAULT_WAIT_TIME = "5000";
diff --git a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/main/TestNGEngineTest.java b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/main/TestNGEngineTest.java
index 3847c78ed4..e87e44c81d 100644
--- a/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/main/TestNGEngineTest.java
+++ b/runtime/citrus-yaml/src/test/java/org/citrusframework/yaml/main/TestNGEngineTest.java
@@ -28,7 +28,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class TestNGEngineTest {
diff --git a/tools/archetypes/jms/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java b/tools/archetypes/jms/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java
index e646f2ea60..e3b84f2d58 100644
--- a/tools/archetypes/jms/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java
+++ b/tools/archetypes/jms/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java
@@ -8,7 +8,6 @@
 
 /**
  * This is a sample Citrus integration test using SOAP client and server.
- * @author Citrus
  */
 @Test
 public class HelloService_Ok_IT extends TestNGCitrusSpringSupport {
diff --git a/tools/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/SampleJavaIT.java b/tools/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/SampleJavaIT.java
index cdd0f869b2..c72e7abc5b 100644
--- a/tools/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/SampleJavaIT.java
+++ b/tools/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/SampleJavaIT.java
@@ -10,7 +10,6 @@
 /**
  * This is a sample Java DSL Citrus integration test.
  *
- * @author Citrus
  */
 @Test
 public class SampleJavaIT extends TestNGCitrusSpringSupport {
diff --git a/tools/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/SampleXmlIT.java b/tools/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/SampleXmlIT.java
index dabfc5e00b..f6668503b9 100644
--- a/tools/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/SampleXmlIT.java
+++ b/tools/archetypes/quickstart/src/main/resources/archetype-resources/src/test/java/SampleXmlIT.java
@@ -9,7 +9,6 @@
 /**
  * This is a sample Citrus integration test for loading XML syntax test case.
  *
- * @author Citrus
  */
 @Test
 public class SampleXmlIT extends TestNGCitrusSpringSupport {
diff --git a/tools/archetypes/soap/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java b/tools/archetypes/soap/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java
index e646f2ea60..e3b84f2d58 100644
--- a/tools/archetypes/soap/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java
+++ b/tools/archetypes/soap/src/main/resources/archetype-resources/src/test/java/HelloService_Ok_IT.java
@@ -8,7 +8,6 @@
 
 /**
  * This is a sample Citrus integration test using SOAP client and server.
- * @author Citrus
  */
 @Test
 public class HelloService_Ok_IT extends TestNGCitrusSpringSupport {
diff --git a/tools/docs-generator/src/main/java/org/citrusframework/docs/ExcelTestDocsGenerator.java b/tools/docs-generator/src/main/java/org/citrusframework/docs/ExcelTestDocsGenerator.java
index 68087fa8c5..5bb6a6a9f4 100644
--- a/tools/docs-generator/src/main/java/org/citrusframework/docs/ExcelTestDocsGenerator.java
+++ b/tools/docs-generator/src/main/java/org/citrusframework/docs/ExcelTestDocsGenerator.java
@@ -39,7 +39,6 @@
 /**
  * Class to automatically generate a list of all available tests in MS Excel.
  *
- * @author Christoph Deppisch
  * @since 2007
  */
 public class ExcelTestDocsGenerator extends AbstractTestDocsGenerator {
diff --git a/tools/docs-generator/src/main/java/org/citrusframework/docs/HtmlTestDocsGenerator.java b/tools/docs-generator/src/main/java/org/citrusframework/docs/HtmlTestDocsGenerator.java
index 688a788e2d..8a7d57ca76 100644
--- a/tools/docs-generator/src/main/java/org/citrusframework/docs/HtmlTestDocsGenerator.java
+++ b/tools/docs-generator/src/main/java/org/citrusframework/docs/HtmlTestDocsGenerator.java
@@ -30,7 +30,6 @@
 /**
  * Class to automatically generate a list of all available tests in HTML.
  *
- * @author Christoph Deppisch
  * @since 2007
  */
 public class HtmlTestDocsGenerator extends AbstractTestDocsGenerator {
diff --git a/tools/docs-generator/src/main/java/org/citrusframework/docs/SvgTestDocsGenerator.java b/tools/docs-generator/src/main/java/org/citrusframework/docs/SvgTestDocsGenerator.java
index dec78d6abe..35fb0e6bef 100644
--- a/tools/docs-generator/src/main/java/org/citrusframework/docs/SvgTestDocsGenerator.java
+++ b/tools/docs-generator/src/main/java/org/citrusframework/docs/SvgTestDocsGenerator.java
@@ -31,7 +31,6 @@
 /**
  * Class to automatically generate a visual representation of a {@link org.citrusframework.TestCase} in SVG.
  *
- * @author Christoph Deppisch
  * @since 2007
  */
 public final class SvgTestDocsGenerator extends AbstractTestDocsGenerator {
diff --git a/tools/docs-generator/src/main/java/org/citrusframework/docs/TestDocsGenerator.java b/tools/docs-generator/src/main/java/org/citrusframework/docs/TestDocsGenerator.java
index 6b5459038c..6aff13fd7f 100644
--- a/tools/docs-generator/src/main/java/org/citrusframework/docs/TestDocsGenerator.java
+++ b/tools/docs-generator/src/main/java/org/citrusframework/docs/TestDocsGenerator.java
@@ -16,9 +16,6 @@
 
 package org.citrusframework.docs;
 
-/**
- * @author Christoph Deppisch
- */
 public interface TestDocsGenerator {
 
     /**
diff --git a/tools/docs-generator/src/test/java/org/citrusframework/docs/ExcelTestDocsGeneratorTest.java b/tools/docs-generator/src/test/java/org/citrusframework/docs/ExcelTestDocsGeneratorTest.java
index 7c034947cd..e0b21064e5 100644
--- a/tools/docs-generator/src/test/java/org/citrusframework/docs/ExcelTestDocsGeneratorTest.java
+++ b/tools/docs-generator/src/test/java/org/citrusframework/docs/ExcelTestDocsGeneratorTest.java
@@ -31,9 +31,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ExcelTestDocsGeneratorTest {
 
     private final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
diff --git a/tools/docs-generator/src/test/java/org/citrusframework/docs/HtmlTestDocsGeneratorTest.java b/tools/docs-generator/src/test/java/org/citrusframework/docs/HtmlTestDocsGeneratorTest.java
index 55245e86b7..c6c373c3db 100644
--- a/tools/docs-generator/src/test/java/org/citrusframework/docs/HtmlTestDocsGeneratorTest.java
+++ b/tools/docs-generator/src/test/java/org/citrusframework/docs/HtmlTestDocsGeneratorTest.java
@@ -28,9 +28,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class HtmlTestDocsGeneratorTest {
 
     @BeforeClass
diff --git a/tools/docs-generator/src/test/java/org/citrusframework/docs/SvgTestDocsGeneratorTest.java b/tools/docs-generator/src/test/java/org/citrusframework/docs/SvgTestDocsGeneratorTest.java
index 31566e7d84..eb23209720 100644
--- a/tools/docs-generator/src/test/java/org/citrusframework/docs/SvgTestDocsGeneratorTest.java
+++ b/tools/docs-generator/src/test/java/org/citrusframework/docs/SvgTestDocsGeneratorTest.java
@@ -27,9 +27,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SvgTestDocsGeneratorTest {
 
     @BeforeClass
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/AbstractCitrusMojo.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/AbstractCitrusMojo.java
index 2393d8bb5a..5f445939e2 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/AbstractCitrusMojo.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/AbstractCitrusMojo.java
@@ -27,7 +27,6 @@
 import java.util.List;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public abstract class AbstractCitrusMojo extends AbstractMojo {
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/CreateDocsMojo.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/CreateDocsMojo.java
index 1ac0cf31e3..14c688ccd1 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/CreateDocsMojo.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/CreateDocsMojo.java
@@ -32,7 +32,6 @@
  * Creates test documentation in interactive mode. Either uses mode excel for MS Excel output or
  * html for HTML web page output.
  *
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 @Mojo(name = "create-docs")
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/CreateTestMojo.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/CreateTestMojo.java
index 4f1292c150..b861a77276 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/CreateTestMojo.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/CreateTestMojo.java
@@ -47,7 +47,6 @@
  *
  * Mojo offers an interactive mode, where the plugin prompts for parameters during execution.
  *
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 @Mojo(name = "create-test")
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/GenerateDocsMojo.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/GenerateDocsMojo.java
index 351b1fdea9..f136b3e224 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/GenerateDocsMojo.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/GenerateDocsMojo.java
@@ -28,7 +28,6 @@
  * contains a list of all available tests with meta information. Excel documentation creates a table of all available tests with
  * meta information such as name, author, status and so on.
  *
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 @Mojo(name = "generate-docs", defaultPhase = LifecyclePhase.PROCESS_TEST_RESOURCES)
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/GenerateTestMojo.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/GenerateTestMojo.java
index d4b7ee2a55..d7a360f63b 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/GenerateTestMojo.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/GenerateTestMojo.java
@@ -39,7 +39,6 @@
 import org.citrusframework.util.StringUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 @Mojo( name = "generate-tests", defaultPhase = LifecyclePhase.GENERATE_TEST_SOURCES)
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/dictionary/DataDictionaryConfiguration.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/dictionary/DataDictionaryConfiguration.java
index 5bd5052557..6ddb867f00 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/dictionary/DataDictionaryConfiguration.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/dictionary/DataDictionaryConfiguration.java
@@ -21,7 +21,6 @@
 import java.io.Serializable;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class DataDictionaryConfiguration implements Serializable {
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/dictionary/MappingsConfiguration.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/dictionary/MappingsConfiguration.java
index 1736ffbad9..ec9ba8b6c7 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/dictionary/MappingsConfiguration.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/dictionary/MappingsConfiguration.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class MappingsConfiguration implements Serializable {
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/docs/DocsConfiguration.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/docs/DocsConfiguration.java
index 170c07b04a..7d049093b6 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/docs/DocsConfiguration.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/docs/DocsConfiguration.java
@@ -21,7 +21,6 @@
 import java.io.Serializable;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class DocsConfiguration implements Serializable {
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/docs/ExcelDocConfiguration.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/docs/ExcelDocConfiguration.java
index 27ba662c10..71677e0a0f 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/docs/ExcelDocConfiguration.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/docs/ExcelDocConfiguration.java
@@ -19,7 +19,6 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class ExcelDocConfiguration {
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/docs/HtmlDocConfiguration.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/docs/HtmlDocConfiguration.java
index 6d6ba9f59b..924708790d 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/docs/HtmlDocConfiguration.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/docs/HtmlDocConfiguration.java
@@ -21,7 +21,6 @@
 import java.io.Serializable;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class HtmlDocConfiguration implements Serializable {
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/MappingsConfiguration.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/MappingsConfiguration.java
index 849bc0412e..79121d89b7 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/MappingsConfiguration.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/MappingsConfiguration.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class MappingsConfiguration implements Serializable {
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/SwaggerConfiguration.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/SwaggerConfiguration.java
index 078c24b9df..8e54148495 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/SwaggerConfiguration.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/SwaggerConfiguration.java
@@ -22,7 +22,6 @@
 import java.io.Serializable;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SwaggerConfiguration implements Serializable {
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/TestConfiguration.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/TestConfiguration.java
index cc709cffc4..f9893821e4 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/TestConfiguration.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/TestConfiguration.java
@@ -22,7 +22,6 @@
 import java.io.Serializable;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class TestConfiguration implements Serializable {
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/WsdlConfiguration.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/WsdlConfiguration.java
index 2017a836e9..f0ce3f5a35 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/WsdlConfiguration.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/WsdlConfiguration.java
@@ -22,7 +22,6 @@
 import java.io.Serializable;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class WsdlConfiguration implements Serializable {
diff --git a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/XsdConfiguration.java b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/XsdConfiguration.java
index 01796d703e..38688c4c4f 100644
--- a/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/XsdConfiguration.java
+++ b/tools/maven/citrus-maven-plugin/src/main/java/org/citrusframework/mvn/plugin/config/tests/XsdConfiguration.java
@@ -22,7 +22,6 @@
 import java.io.Serializable;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class XsdConfiguration implements Serializable {
diff --git a/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/CreateDocsMojoTest.java b/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/CreateDocsMojoTest.java
index 4cba95df69..a20a5ea5ab 100644
--- a/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/CreateDocsMojoTest.java
+++ b/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/CreateDocsMojoTest.java
@@ -37,9 +37,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class CreateDocsMojoTest {
 
     private Prompter prompter = Mockito.mock(Prompter.class);
diff --git a/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/CreateTestMojoTest.java b/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/CreateTestMojoTest.java
index 9d9c18f72a..8eecca7f00 100644
--- a/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/CreateTestMojoTest.java
+++ b/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/CreateTestMojoTest.java
@@ -32,9 +32,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class CreateTestMojoTest {
 
     private Prompter prompter = Mockito.mock(Prompter.class);
diff --git a/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/GenerateDocsMojoTest.java b/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/GenerateDocsMojoTest.java
index 103e3b5424..8eb9720427 100644
--- a/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/GenerateDocsMojoTest.java
+++ b/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/GenerateDocsMojoTest.java
@@ -32,9 +32,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class GenerateDocsMojoTest {
 
     private ExcelTestDocsGenerator excelTestDocGenerator = Mockito.mock(ExcelTestDocsGenerator.class);
diff --git a/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/GenerateTestMojoTest.java b/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/GenerateTestMojoTest.java
index 41462d65b3..30af00f16d 100644
--- a/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/GenerateTestMojoTest.java
+++ b/tools/maven/citrus-maven-plugin/src/test/java/org/citrusframework/mvn/plugin/GenerateTestMojoTest.java
@@ -31,9 +31,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class GenerateTestMojoTest {
 
     private XmlTestGenerator xmlTestGenerator = Mockito.mock(XmlTestGenerator.class);
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/handler/RestDocConfigNamespaceHandler.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/handler/RestDocConfigNamespaceHandler.java
index c79f738157..50110cdf22 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/handler/RestDocConfigNamespaceHandler.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/handler/RestDocConfigNamespaceHandler.java
@@ -20,7 +20,6 @@
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocConfigNamespaceHandler extends NamespaceHandlerSupport {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/xml/RestDocClientInterceptorParser.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/xml/RestDocClientInterceptorParser.java
index 66b91773b2..8ac40af10d 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/xml/RestDocClientInterceptorParser.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/xml/RestDocClientInterceptorParser.java
@@ -31,7 +31,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocClientInterceptorParser extends AbstractBeanDefinitionParser {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/xml/RestDocConfigurerParser.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/xml/RestDocConfigurerParser.java
index a88d2d3d56..40aee7298b 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/xml/RestDocConfigurerParser.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/xml/RestDocConfigurerParser.java
@@ -27,7 +27,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocConfigurerParser extends AbstractBeanDefinitionParser {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/xml/RestDocDocumentationParser.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/xml/RestDocDocumentationParser.java
index 82e9997ec6..4399d6536a 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/xml/RestDocDocumentationParser.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/config/xml/RestDocDocumentationParser.java
@@ -25,7 +25,6 @@
 import org.w3c.dom.Element;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocDocumentationParser extends AbstractBeanDefinitionParser {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CachedBodyHttpRequest.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CachedBodyHttpRequest.java
index 449e3be0fc..cbf5956691 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CachedBodyHttpRequest.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CachedBodyHttpRequest.java
@@ -26,7 +26,6 @@
  * Helper Http request wrapper implementation provides access to the request body for usage
  * in RestDoc converters. Delegates other method calls to original Http request instance.
  *
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CachedBodyHttpRequest implements HttpRequest {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CachedBodyHttpResponse.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CachedBodyHttpResponse.java
index 45c3796f5a..66cdeaac55 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CachedBodyHttpResponse.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CachedBodyHttpResponse.java
@@ -30,7 +30,6 @@
  * Helper Http response wrapper implementation provides access to the response body for usage
  * in RestDoc converters. Delegates other method calls to original Http response instance.
  *
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CachedBodyHttpResponse implements ClientHttpResponse {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CitrusRestDocConfigurer.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CitrusRestDocConfigurer.java
index e84efcde1e..1573589f54 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CitrusRestDocConfigurer.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CitrusRestDocConfigurer.java
@@ -33,7 +33,6 @@
  * the interceptor uses a special Http request wrapper for next interceptors in line. These interceptors can then read the
  * RestDoc configuration and context from the request wrapper implementation.
  *
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusRestDocConfigurer extends RestDocumentationConfigurer<CitrusSnippetConfigurer, CitrusSnippetConfigurer, CitrusRestDocConfigurer>
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CitrusRestDocsSupport.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CitrusRestDocsSupport.java
index f02871737f..bc338635b0 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CitrusRestDocsSupport.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CitrusRestDocsSupport.java
@@ -24,7 +24,6 @@
 
 /**
  * Support class provides static factory methods for RestDoc configurer and interceptor.
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusRestDocsSupport {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CitrusSnippetConfigurer.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CitrusSnippetConfigurer.java
index 74ce1a3f0d..2aeffba805 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CitrusSnippetConfigurer.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/CitrusSnippetConfigurer.java
@@ -23,7 +23,6 @@
 import java.io.IOException;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusSnippetConfigurer extends SnippetConfigurer<CitrusRestDocConfigurer, CitrusSnippetConfigurer>
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocClientInterceptor.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocClientInterceptor.java
index 7177a5d66b..2a1d741de0 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocClientInterceptor.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocClientInterceptor.java
@@ -31,7 +31,6 @@
  * Http request wrapper for later usage in converter. Optional RestDoc configuration is read from special request wrapper implementation
  * if present. Optional RestDoc configurer interceptor may have created this wrapper in prior to this interceptor execution.
  *
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocClientInterceptor implements ClientHttpRequestInterceptor {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocConfiguredHttpRequest.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocConfiguredHttpRequest.java
index 733d01f668..0e844a1501 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocConfiguredHttpRequest.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocConfiguredHttpRequest.java
@@ -28,7 +28,6 @@
  * Special Http request wrapper holding RestDoc configuration and context. Usually configurer interceptor creates this request wrapper
  * when providing RestDoc configuration. Next RestDoc generating interceptor in line reads configuration from this wrapper.
  *
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocConfiguredHttpRequest implements HttpRequest {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocRequestConverter.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocRequestConverter.java
index 113d2dd26d..fdaaf9c92a 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocRequestConverter.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocRequestConverter.java
@@ -28,7 +28,6 @@
 
 /**
  * Converts a Http request to RestDoc operation request instance.
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocRequestConverter implements RequestConverter<CachedBodyHttpRequest> {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocResponseConverter.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocResponseConverter.java
index 55b5cdfc4e..434a58d623 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocResponseConverter.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/http/RestDocResponseConverter.java
@@ -25,7 +25,6 @@
 
 /**
  * Converts a Http response to RestDoc operation response instance.
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocResponseConverter implements ResponseConverter<ClientHttpResponse> {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/CitrusRestDocSoapConfigurer.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/CitrusRestDocSoapConfigurer.java
index 5dcab82249..ef7de35f5e 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/CitrusRestDocSoapConfigurer.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/CitrusRestDocSoapConfigurer.java
@@ -33,7 +33,6 @@
  * the interceptor uses a special Http request wrapper for next interceptors in line. These interceptors can then read the
  * RestDoc configuration and context from the request wrapper implementation.
  *
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusRestDocSoapConfigurer extends RestDocumentationConfigurer<CitrusSnippetConfigurer, CitrusSnippetConfigurer, CitrusRestDocSoapConfigurer>
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/CitrusRestDocsSoapSupport.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/CitrusRestDocsSoapSupport.java
index 7bc4815648..336dbea57b 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/CitrusRestDocsSoapSupport.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/CitrusRestDocsSoapSupport.java
@@ -25,7 +25,6 @@
 
 /**
  * Support class provides static factory methods for RestDoc configurer and interceptor.
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusRestDocsSoapSupport {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/CitrusSnippetConfigurer.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/CitrusSnippetConfigurer.java
index e35b51ac7b..d8606ffea1 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/CitrusSnippetConfigurer.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/CitrusSnippetConfigurer.java
@@ -22,7 +22,6 @@
 import org.springframework.ws.context.MessageContext;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class CitrusSnippetConfigurer extends SnippetConfigurer<CitrusRestDocSoapConfigurer, CitrusSnippetConfigurer>
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/RestDocSoapClientInterceptor.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/RestDocSoapClientInterceptor.java
index 7c73196bb3..0d680d1eb8 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/RestDocSoapClientInterceptor.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/RestDocSoapClientInterceptor.java
@@ -28,7 +28,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocSoapClientInterceptor implements ClientInterceptor {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/RestDocSoapRequestConverter.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/RestDocSoapRequestConverter.java
index b1fccbcc47..3d2df3787c 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/RestDocSoapRequestConverter.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/RestDocSoapRequestConverter.java
@@ -43,7 +43,6 @@
 
 /**
  * Converts a Http request to RestDoc operation request instance.
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocSoapRequestConverter implements RequestConverter<MessageContext> {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/RestDocSoapResponseConverter.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/RestDocSoapResponseConverter.java
index 2fb0796172..8902855968 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/RestDocSoapResponseConverter.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/soap/RestDocSoapResponseConverter.java
@@ -28,7 +28,6 @@
 
 /**
  * Converts a Http response to RestDoc operation response instance.
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocSoapResponseConverter implements ResponseConverter<WebServiceMessage> {
diff --git a/tools/restdocs/src/main/java/org/citrusframework/restdocs/util/RestDocTestNameFormatter.java b/tools/restdocs/src/main/java/org/citrusframework/restdocs/util/RestDocTestNameFormatter.java
index 8406177cf4..2abd72ec4b 100644
--- a/tools/restdocs/src/main/java/org/citrusframework/restdocs/util/RestDocTestNameFormatter.java
+++ b/tools/restdocs/src/main/java/org/citrusframework/restdocs/util/RestDocTestNameFormatter.java
@@ -17,7 +17,6 @@
 package org.citrusframework.restdocs.util;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public final class RestDocTestNameFormatter {
diff --git a/tools/restdocs/src/test/java/org/citrusframework/restdocs/config/xml/RestDocClientInterceptorParserTest.java b/tools/restdocs/src/test/java/org/citrusframework/restdocs/config/xml/RestDocClientInterceptorParserTest.java
index 43897ecb6b..12f7e7e435 100644
--- a/tools/restdocs/src/test/java/org/citrusframework/restdocs/config/xml/RestDocClientInterceptorParserTest.java
+++ b/tools/restdocs/src/test/java/org/citrusframework/restdocs/config/xml/RestDocClientInterceptorParserTest.java
@@ -25,7 +25,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocClientInterceptorParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/tools/restdocs/src/test/java/org/citrusframework/restdocs/config/xml/RestDocConfigurerParserTest.java b/tools/restdocs/src/test/java/org/citrusframework/restdocs/config/xml/RestDocConfigurerParserTest.java
index 7935182fe1..35f79d2af2 100644
--- a/tools/restdocs/src/test/java/org/citrusframework/restdocs/config/xml/RestDocConfigurerParserTest.java
+++ b/tools/restdocs/src/test/java/org/citrusframework/restdocs/config/xml/RestDocConfigurerParserTest.java
@@ -25,7 +25,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocConfigurerParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/tools/restdocs/src/test/java/org/citrusframework/restdocs/config/xml/RestDocDocumentationParserTest.java b/tools/restdocs/src/test/java/org/citrusframework/restdocs/config/xml/RestDocDocumentationParserTest.java
index a5fffe6a1e..dbded4ddee 100644
--- a/tools/restdocs/src/test/java/org/citrusframework/restdocs/config/xml/RestDocDocumentationParserTest.java
+++ b/tools/restdocs/src/test/java/org/citrusframework/restdocs/config/xml/RestDocDocumentationParserTest.java
@@ -30,7 +30,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocDocumentationParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/tools/restdocs/src/test/java/org/citrusframework/restdocs/http/RestDocClientInterceptorTest.java b/tools/restdocs/src/test/java/org/citrusframework/restdocs/http/RestDocClientInterceptorTest.java
index d271f4fb82..f115983ebb 100644
--- a/tools/restdocs/src/test/java/org/citrusframework/restdocs/http/RestDocClientInterceptorTest.java
+++ b/tools/restdocs/src/test/java/org/citrusframework/restdocs/http/RestDocClientInterceptorTest.java
@@ -44,7 +44,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocClientInterceptorTest {
diff --git a/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/HttpRestDocsIT.java b/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/HttpRestDocsIT.java
index dcdbf6afcc..47b9f03249 100644
--- a/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/HttpRestDocsIT.java
+++ b/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/HttpRestDocsIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class HttpRestDocsIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING, name = "HttpRestDocsIT")
diff --git a/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/RestDocConfigurationIT.java b/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/RestDocConfigurationIT.java
index 0e29ccf5f8..3eb14e3f0f 100644
--- a/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/RestDocConfigurationIT.java
+++ b/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/RestDocConfigurationIT.java
@@ -38,7 +38,6 @@
 import static org.citrusframework.restdocs.http.CitrusRestDocsSupport.restDocsInterceptor;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocConfigurationIT extends TestNGCitrusSpringSupport {
diff --git a/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/SoapRestDocsIT.java b/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/SoapRestDocsIT.java
index 07d9cc183c..7ec2955409 100644
--- a/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/SoapRestDocsIT.java
+++ b/tools/restdocs/src/test/java/org/citrusframework/restdocs/integration/SoapRestDocsIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SoapRestDocsIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING, name = "SoapRestDocsIT")
diff --git a/tools/restdocs/src/test/java/org/citrusframework/restdocs/soap/RestDocSoapClientInterceptorTest.java b/tools/restdocs/src/test/java/org/citrusframework/restdocs/soap/RestDocSoapClientInterceptorTest.java
index 73f90fbb9d..a5ac333f57 100644
--- a/tools/restdocs/src/test/java/org/citrusframework/restdocs/soap/RestDocSoapClientInterceptorTest.java
+++ b/tools/restdocs/src/test/java/org/citrusframework/restdocs/soap/RestDocSoapClientInterceptorTest.java
@@ -50,7 +50,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocSoapClientInterceptorTest {
diff --git a/tools/restdocs/src/test/java/org/citrusframework/restdocs/util/RestDocTestNameFormatterTest.java b/tools/restdocs/src/test/java/org/citrusframework/restdocs/util/RestDocTestNameFormatterTest.java
index e749c2e253..3d1368ae76 100644
--- a/tools/restdocs/src/test/java/org/citrusframework/restdocs/util/RestDocTestNameFormatterTest.java
+++ b/tools/restdocs/src/test/java/org/citrusframework/restdocs/util/RestDocTestNameFormatterTest.java
@@ -20,7 +20,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class RestDocTestNameFormatterTest {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/AbstractTemplateBasedTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/AbstractTemplateBasedTestGenerator.java
index 00c53d99a1..6d3565517a 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/AbstractTemplateBasedTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/AbstractTemplateBasedTestGenerator.java
@@ -30,7 +30,6 @@
 /**
  * Generator creating a new test case from a template.
  *
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public abstract class AbstractTemplateBasedTestGenerator<T extends TestGenerator> extends AbstractTestGenerator<T> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/AbstractTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/AbstractTestGenerator.java
index 38d2a6383f..7d7affb59c 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/AbstractTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/AbstractTestGenerator.java
@@ -23,7 +23,6 @@
 import org.citrusframework.CitrusSettings;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public abstract class AbstractTestGenerator<T extends TestGenerator> implements TestGenerator<T> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/SwaggerTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/SwaggerTestGenerator.java
index ec6c9d1320..7be0662944 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/SwaggerTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/SwaggerTestGenerator.java
@@ -19,7 +19,6 @@
 import java.util.Map;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public interface SwaggerTestGenerator<T extends SwaggerTestGenerator> extends TestGenerator<T> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/TestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/TestGenerator.java
index 9b91b01bb1..b492a89508 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/TestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/TestGenerator.java
@@ -17,7 +17,6 @@
 package org.citrusframework.generate;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public interface TestGenerator<T extends TestGenerator> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/TestGeneratorMain.java b/tools/test-generator/src/main/java/org/citrusframework/generate/TestGeneratorMain.java
index 59efb3d7d5..3808d03647 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/TestGeneratorMain.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/TestGeneratorMain.java
@@ -28,7 +28,6 @@
 import org.apache.commons.cli.ParseException;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class TestGeneratorMain {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/WsdlTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/WsdlTestGenerator.java
index 3cd47ea787..7d05bfca94 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/WsdlTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/WsdlTestGenerator.java
@@ -17,7 +17,6 @@
 package org.citrusframework.generate;
 
 import java.util.Map; /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public interface WsdlTestGenerator<T extends WsdlTestGenerator> extends TestGenerator<T> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/XsdTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/XsdTestGenerator.java
index 7f8e70035e..f9e6e95b0d 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/XsdTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/XsdTestGenerator.java
@@ -17,7 +17,6 @@
 package org.citrusframework.generate;
 
 import java.util.Map; /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public interface XsdTestGenerator<T extends XsdTestGenerator> extends TestGenerator<T> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/dictionary/InboundXmlDataDictionary.java b/tools/test-generator/src/main/java/org/citrusframework/generate/dictionary/InboundXmlDataDictionary.java
index b7c3b58f49..e482b2d41c 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/dictionary/InboundXmlDataDictionary.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/dictionary/InboundXmlDataDictionary.java
@@ -26,9 +26,6 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-/**
- * @author Christoph Deppisch
- */
 public class InboundXmlDataDictionary extends XpathMappingDataDictionary {
 
     @Override
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/dictionary/OutboundXmlDataDictionary.java b/tools/test-generator/src/main/java/org/citrusframework/generate/dictionary/OutboundXmlDataDictionary.java
index e4a2043eda..1f77d8399b 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/dictionary/OutboundXmlDataDictionary.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/dictionary/OutboundXmlDataDictionary.java
@@ -20,9 +20,6 @@
 import org.citrusframework.variable.dictionary.xml.XpathMappingDataDictionary;
 import org.w3c.dom.Node;
 
-/**
- * @author Christoph Deppisch
- */
 public class OutboundXmlDataDictionary extends XpathMappingDataDictionary {
 
     @Override
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/JavaDslTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/JavaDslTestGenerator.java
index 035abd0dc6..a54c5ddeb8 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/JavaDslTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/JavaDslTestGenerator.java
@@ -28,7 +28,6 @@
 import com.squareup.javapoet.TypeSpec;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class JavaDslTestGenerator<T extends JavaDslTestGenerator<T>> extends JavaTestGenerator<T> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/MessagingJavaTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/MessagingJavaTestGenerator.java
index 1b99772add..269ad4d36f 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/MessagingJavaTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/MessagingJavaTestGenerator.java
@@ -36,7 +36,6 @@
 import com.squareup.javapoet.TypeSpec;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class MessagingJavaTestGenerator<T extends MessagingJavaTestGenerator<T>> extends JavaDslTestGenerator<T> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/SwaggerJavaTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/SwaggerJavaTestGenerator.java
index f20e03d678..6232c56ecf 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/SwaggerJavaTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/SwaggerJavaTestGenerator.java
@@ -64,7 +64,6 @@
 
 /**
  * Test generator creates one to many test cases based on operations defined in a XML schema XSD.
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SwaggerJavaTestGenerator extends MessagingJavaTestGenerator<SwaggerJavaTestGenerator> implements SwaggerTestGenerator<SwaggerJavaTestGenerator> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/WsdlJavaTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/WsdlJavaTestGenerator.java
index cba4ee5b3a..1084e810c5 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/WsdlJavaTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/WsdlJavaTestGenerator.java
@@ -47,7 +47,6 @@
 
 /**
  * Test generator creates one to many test cases based on operations defined in a XML schema XSD.
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class WsdlJavaTestGenerator extends MessagingJavaTestGenerator<WsdlJavaTestGenerator> implements WsdlTestGenerator<WsdlJavaTestGenerator> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/XsdJavaTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/XsdJavaTestGenerator.java
index 70b703a35a..6b21e7d9e1 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/XsdJavaTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/javadsl/XsdJavaTestGenerator.java
@@ -40,7 +40,6 @@
 
 /**
  * Test generator creates one to many test cases based on operations defined in a XML schema XSD.
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class XsdJavaTestGenerator extends MessagingJavaTestGenerator<XsdJavaTestGenerator> implements XsdTestGenerator<XsdJavaTestGenerator> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/CodeProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/CodeProvider.java
index 85a40591fb..536d84c9f6 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/CodeProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/CodeProvider.java
@@ -20,7 +20,6 @@
 import com.squareup.javapoet.CodeBlock;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public interface CodeProvider<M extends Message> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/MessageActionProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/MessageActionProvider.java
index ba9aaa7715..ac8b857d81 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/MessageActionProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/MessageActionProvider.java
@@ -19,7 +19,6 @@
 import org.citrusframework.message.Message;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public interface MessageActionProvider<T, M extends Message> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/ReceiveActionProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/ReceiveActionProvider.java
index b65f52dd83..e9085b5953 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/ReceiveActionProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/ReceiveActionProvider.java
@@ -23,7 +23,6 @@
 import org.citrusframework.model.testcase.core.ReceiveModel;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class ReceiveActionProvider implements MessageActionProvider<ReceiveModel, Message> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/ReceiveCodeProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/ReceiveCodeProvider.java
index f73b8ecfef..46e0b54029 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/ReceiveCodeProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/ReceiveCodeProvider.java
@@ -20,7 +20,6 @@
 import com.squareup.javapoet.CodeBlock;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class ReceiveCodeProvider implements CodeProvider<Message> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/SendActionProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/SendActionProvider.java
index fb341ac742..cb5732b2fb 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/SendActionProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/SendActionProvider.java
@@ -23,7 +23,6 @@
 import org.citrusframework.model.testcase.core.SendModel;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SendActionProvider implements MessageActionProvider<SendModel, Message> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/SendCodeProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/SendCodeProvider.java
index 8e4c83a17b..09d74d6194 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/SendCodeProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/SendCodeProvider.java
@@ -20,7 +20,6 @@
 import com.squareup.javapoet.CodeBlock;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SendCodeProvider implements CodeProvider<Message> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/ReceiveHttpRequestActionProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/ReceiveHttpRequestActionProvider.java
index 8c04adce28..0b5fcfa834 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/ReceiveHttpRequestActionProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/ReceiveHttpRequestActionProvider.java
@@ -29,7 +29,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/ReceiveHttpResponseActionProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/ReceiveHttpResponseActionProvider.java
index 63fd4b3b61..3049ccd5ca 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/ReceiveHttpResponseActionProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/ReceiveHttpResponseActionProvider.java
@@ -25,7 +25,6 @@
 import java.util.Optional;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class ReceiveHttpResponseActionProvider implements MessageActionProvider<ReceiveResponseModel, HttpMessage> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/ReceiveHttpResponseCodeProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/ReceiveHttpResponseCodeProvider.java
index 6e264389de..93d8f1826a 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/ReceiveHttpResponseCodeProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/ReceiveHttpResponseCodeProvider.java
@@ -21,7 +21,6 @@
 import com.squareup.javapoet.CodeBlock;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class ReceiveHttpResponseCodeProvider implements CodeProvider<HttpMessage> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpRequestActionProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpRequestActionProvider.java
index 07921c8687..190b9151c9 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpRequestActionProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpRequestActionProvider.java
@@ -30,7 +30,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SendHttpRequestActionProvider implements MessageActionProvider<SendRequestModel, HttpMessage> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpResponseActionProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpResponseActionProvider.java
index 540b66b9fb..afd2787b59 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpResponseActionProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpResponseActionProvider.java
@@ -25,7 +25,6 @@
 import java.util.Optional;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SendHttpResponseActionProvider implements MessageActionProvider<SendResponseModel, HttpMessage> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpResponseCodeProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpResponseCodeProvider.java
index 06c9f1291a..da959262b9 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpResponseCodeProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/http/SendHttpResponseCodeProvider.java
@@ -21,7 +21,6 @@
 import com.squareup.javapoet.CodeBlock;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SendHttpResponseCodeProvider implements CodeProvider<HttpMessage> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/ReceiveSoapRequestActionProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/ReceiveSoapRequestActionProvider.java
index 6f3e7f7449..ffa53c209f 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/ReceiveSoapRequestActionProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/ReceiveSoapRequestActionProvider.java
@@ -24,7 +24,6 @@
 import org.citrusframework.ws.message.SoapMessage;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class ReceiveSoapRequestActionProvider implements MessageActionProvider<ReceiveModel, SoapMessage> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/ReceiveSoapResponseActionProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/ReceiveSoapResponseActionProvider.java
index 235045c1cc..9e6ffdab32 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/ReceiveSoapResponseActionProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/ReceiveSoapResponseActionProvider.java
@@ -24,7 +24,6 @@
 import org.citrusframework.ws.message.SoapMessage;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class ReceiveSoapResponseActionProvider implements MessageActionProvider<ReceiveModel, SoapMessage> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/SendSoapRequestActionProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/SendSoapRequestActionProvider.java
index e0a8a63d32..25fbaea666 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/SendSoapRequestActionProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/SendSoapRequestActionProvider.java
@@ -24,7 +24,6 @@
 import org.citrusframework.ws.message.SoapMessage;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SendSoapRequestActionProvider implements MessageActionProvider<SendModel, SoapMessage> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/SendSoapResponseActionProvider.java b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/SendSoapResponseActionProvider.java
index 0c0519b107..c76b0dcc95 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/SendSoapResponseActionProvider.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/provider/soap/SendSoapResponseActionProvider.java
@@ -24,7 +24,6 @@
 import org.citrusframework.ws.message.SoapMessage;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SendSoapResponseActionProvider implements MessageActionProvider<SendModel, SoapMessage> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/MessagingXmlTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/MessagingXmlTestGenerator.java
index 6c6147b836..695520e6ab 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/MessagingXmlTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/MessagingXmlTestGenerator.java
@@ -27,7 +27,6 @@
 import java.util.Optional;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class MessagingXmlTestGenerator<T extends MessagingXmlTestGenerator> extends XmlTestGenerator<T> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/SwaggerXmlTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/SwaggerXmlTestGenerator.java
index 290dc51e49..e7c6055e62 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/SwaggerXmlTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/SwaggerXmlTestGenerator.java
@@ -63,7 +63,6 @@
 
 /**
  * Test generator creates one to many test cases based on operations defined in a XML schema XSD.
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SwaggerXmlTestGenerator extends MessagingXmlTestGenerator<SwaggerXmlTestGenerator> implements SwaggerTestGenerator<SwaggerXmlTestGenerator> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/TestActionMarshaller.java b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/TestActionMarshaller.java
index f0154dbd22..86dc8f929d 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/TestActionMarshaller.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/TestActionMarshaller.java
@@ -26,7 +26,6 @@
 import org.citrusframework.xml.namespace.CitrusNamespacePrefixMapper;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class TestActionMarshaller implements Marshaller {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/WsdlXmlTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/WsdlXmlTestGenerator.java
index 4f3d0ff8d7..106f37f230 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/WsdlXmlTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/WsdlXmlTestGenerator.java
@@ -49,7 +49,6 @@
 
 /**
  * Test generator creates one to many test cases based on operations defined in a XML schema XSD.
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class WsdlXmlTestGenerator extends MessagingXmlTestGenerator<WsdlXmlTestGenerator> implements WsdlTestGenerator<WsdlXmlTestGenerator> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XmlTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XmlTestGenerator.java
index 378ee42c77..90933fca6b 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XmlTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XmlTestGenerator.java
@@ -36,7 +36,6 @@
 import org.citrusframework.xml.StringResult;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class XmlTestGenerator<T extends XmlTestGenerator> extends AbstractTemplateBasedTestGenerator<T> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XmlTestMarshaller.java b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XmlTestMarshaller.java
index 6d0a1508fc..6f4183678f 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XmlTestMarshaller.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XmlTestMarshaller.java
@@ -41,7 +41,6 @@
 import org.xml.sax.XMLReader;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class XmlTestMarshaller {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XsdXmlTestGenerator.java b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XsdXmlTestGenerator.java
index 3636693a5e..b06ef48f48 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XsdXmlTestGenerator.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/generate/xml/XsdXmlTestGenerator.java
@@ -40,7 +40,6 @@
 
 /**
  * Test generator creates one to many test cases based on operations defined in a XML schema XSD.
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class XsdXmlTestGenerator extends MessagingXmlTestGenerator<XsdXmlTestGenerator> implements XsdTestGenerator<XsdXmlTestGenerator> {
diff --git a/tools/test-generator/src/main/java/org/citrusframework/xml/namespace/CitrusNamespacePrefixMapper.java b/tools/test-generator/src/main/java/org/citrusframework/xml/namespace/CitrusNamespacePrefixMapper.java
index 3c70981211..48236bd5e0 100644
--- a/tools/test-generator/src/main/java/org/citrusframework/xml/namespace/CitrusNamespacePrefixMapper.java
+++ b/tools/test-generator/src/main/java/org/citrusframework/xml/namespace/CitrusNamespacePrefixMapper.java
@@ -21,9 +21,6 @@
 
 import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper;
 
-/**
- * @author Christoph Deppisch
- */
 public class CitrusNamespacePrefixMapper extends NamespacePrefixMapper {
 
     /** List of known namespaces with mapping to prefix */
diff --git a/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/MessagingJavaTestGeneratorTest.java b/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/MessagingJavaTestGeneratorTest.java
index 97fd449b9e..40dc70da83 100644
--- a/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/MessagingJavaTestGeneratorTest.java
+++ b/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/MessagingJavaTestGeneratorTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessagingJavaTestGeneratorTest {
 
     @Test
diff --git a/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/SwaggerJavaTestGeneratorTest.java b/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/SwaggerJavaTestGeneratorTest.java
index 72655625c3..2c0e08dab1 100644
--- a/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/SwaggerJavaTestGeneratorTest.java
+++ b/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/SwaggerJavaTestGeneratorTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SwaggerJavaTestGeneratorTest {
diff --git a/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/WsdlJavaTestGeneratorTest.java b/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/WsdlJavaTestGeneratorTest.java
index 15438adde8..69e6b87d5c 100644
--- a/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/WsdlJavaTestGeneratorTest.java
+++ b/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/WsdlJavaTestGeneratorTest.java
@@ -29,7 +29,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class WsdlJavaTestGeneratorTest {
diff --git a/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/XsdJavaTestGeneratorTest.java b/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/XsdJavaTestGeneratorTest.java
index b0ee7829b3..b98323b915 100644
--- a/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/XsdJavaTestGeneratorTest.java
+++ b/tools/test-generator/src/test/java/org/citrusframework/generate/javadsl/XsdJavaTestGeneratorTest.java
@@ -28,7 +28,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class XsdJavaTestGeneratorTest {
diff --git a/tools/test-generator/src/test/java/org/citrusframework/generate/xml/MessagingXmlTestGeneratorTest.java b/tools/test-generator/src/test/java/org/citrusframework/generate/xml/MessagingXmlTestGeneratorTest.java
index 5da92785f9..89336f66b5 100644
--- a/tools/test-generator/src/test/java/org/citrusframework/generate/xml/MessagingXmlTestGeneratorTest.java
+++ b/tools/test-generator/src/test/java/org/citrusframework/generate/xml/MessagingXmlTestGeneratorTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessagingXmlTestGeneratorTest {
 
     @Test
diff --git a/tools/test-generator/src/test/java/org/citrusframework/generate/xml/SwaggerXmlTestGeneratorTest.java b/tools/test-generator/src/test/java/org/citrusframework/generate/xml/SwaggerXmlTestGeneratorTest.java
index f7def9c58d..916e350b9f 100644
--- a/tools/test-generator/src/test/java/org/citrusframework/generate/xml/SwaggerXmlTestGeneratorTest.java
+++ b/tools/test-generator/src/test/java/org/citrusframework/generate/xml/SwaggerXmlTestGeneratorTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class SwaggerXmlTestGeneratorTest {
diff --git a/tools/test-generator/src/test/java/org/citrusframework/generate/xml/WsdlXmlTestGeneratorTest.java b/tools/test-generator/src/test/java/org/citrusframework/generate/xml/WsdlXmlTestGeneratorTest.java
index 2191267a36..b8909aac10 100644
--- a/tools/test-generator/src/test/java/org/citrusframework/generate/xml/WsdlXmlTestGeneratorTest.java
+++ b/tools/test-generator/src/test/java/org/citrusframework/generate/xml/WsdlXmlTestGeneratorTest.java
@@ -26,7 +26,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class WsdlXmlTestGeneratorTest {
diff --git a/tools/test-generator/src/test/java/org/citrusframework/generate/xml/XmlTestGeneratorTest.java b/tools/test-generator/src/test/java/org/citrusframework/generate/xml/XmlTestGeneratorTest.java
index 69c367c3fe..0bdc13e48c 100644
--- a/tools/test-generator/src/test/java/org/citrusframework/generate/xml/XmlTestGeneratorTest.java
+++ b/tools/test-generator/src/test/java/org/citrusframework/generate/xml/XmlTestGeneratorTest.java
@@ -28,9 +28,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class XmlTestGeneratorTest {
 
     @Test
diff --git a/tools/test-generator/src/test/java/org/citrusframework/generate/xml/XsdXmlTestGeneratorTest.java b/tools/test-generator/src/test/java/org/citrusframework/generate/xml/XsdXmlTestGeneratorTest.java
index 7f4216c0b1..831c276270 100644
--- a/tools/test-generator/src/test/java/org/citrusframework/generate/xml/XsdXmlTestGeneratorTest.java
+++ b/tools/test-generator/src/test/java/org/citrusframework/generate/xml/XsdXmlTestGeneratorTest.java
@@ -28,7 +28,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class XsdXmlTestGeneratorTest {
diff --git a/utils/citrus-test-support/src/main/java/org/citrusframework/testng/AbstractActionParserTest.java b/utils/citrus-test-support/src/main/java/org/citrusframework/testng/AbstractActionParserTest.java
index d436b615cb..f28417a726 100644
--- a/utils/citrus-test-support/src/main/java/org/citrusframework/testng/AbstractActionParserTest.java
+++ b/utils/citrus-test-support/src/main/java/org/citrusframework/testng/AbstractActionParserTest.java
@@ -26,7 +26,6 @@
  * Abstract base testng test for Citrus bean definition parser unit testing. Provides access to
  * an application context holding bean definitions parsed from Citrus bean definition parsers.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractActionParserTest<T extends TestAction> extends AbstractBeanDefinitionParserTest {
 
diff --git a/utils/citrus-test-support/src/main/java/org/citrusframework/testng/AbstractBeanDefinitionParserTest.java b/utils/citrus-test-support/src/main/java/org/citrusframework/testng/AbstractBeanDefinitionParserTest.java
index 44c76e0184..91f9d9d477 100644
--- a/utils/citrus-test-support/src/main/java/org/citrusframework/testng/AbstractBeanDefinitionParserTest.java
+++ b/utils/citrus-test-support/src/main/java/org/citrusframework/testng/AbstractBeanDefinitionParserTest.java
@@ -24,7 +24,6 @@
  * Abstract base testng test for Citrus bean definition parser unit testing. Provides access to
  * an application context holding bean definitions parsed from Citrus bean definition parsers.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractBeanDefinitionParserTest extends AbstractTestNGUnitTest {
 
diff --git a/utils/citrus-test-support/src/main/java/org/citrusframework/testng/AbstractTestNGUnitTest.java b/utils/citrus-test-support/src/main/java/org/citrusframework/testng/AbstractTestNGUnitTest.java
index 45adb440dc..b30da7fa00 100644
--- a/utils/citrus-test-support/src/main/java/org/citrusframework/testng/AbstractTestNGUnitTest.java
+++ b/utils/citrus-test-support/src/main/java/org/citrusframework/testng/AbstractTestNGUnitTest.java
@@ -28,7 +28,6 @@
  * Abstract base testng test implementation for Citrus unit testing. Provides access to
  * a test context and injected function registry as well as global variables.
  *
- * @author Christoph Deppisch
  */
 @ContextConfiguration(classes = UnitTestConfig.class)
 public abstract class AbstractTestNGUnitTest extends AbstractTestNGSpringContextTests {
diff --git a/utils/citrus-test-support/src/main/java/org/citrusframework/testng/UnitTestConfig.java b/utils/citrus-test-support/src/main/java/org/citrusframework/testng/UnitTestConfig.java
index 092d6c1efb..333c5633c8 100644
--- a/utils/citrus-test-support/src/main/java/org/citrusframework/testng/UnitTestConfig.java
+++ b/utils/citrus-test-support/src/main/java/org/citrusframework/testng/UnitTestConfig.java
@@ -19,9 +19,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-/**
- * @author Christoph Deppisch
- */
 @Configuration
 @Import(UnitTestConfigImportSelector.class)
 public class UnitTestConfig {
diff --git a/utils/citrus-test-support/src/main/java/org/citrusframework/testng/UnitTestConfigImportSelector.java b/utils/citrus-test-support/src/main/java/org/citrusframework/testng/UnitTestConfigImportSelector.java
index 53c8b8e276..8840df07f4 100644
--- a/utils/citrus-test-support/src/main/java/org/citrusframework/testng/UnitTestConfigImportSelector.java
+++ b/utils/citrus-test-support/src/main/java/org/citrusframework/testng/UnitTestConfigImportSelector.java
@@ -22,9 +22,6 @@
 import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.util.ClassUtils;
 
-/**
- * @author Christoph Deppisch
- */
 public class UnitTestConfigImportSelector implements DeferredImportSelector {
     @Override
     public String[] selectImports(AnnotationMetadata importingClassMetadata) {
diff --git a/validation/citrus-validation-binary/src/main/java/org/citrusframework/validation/binary/BinaryMessageValidator.java b/validation/citrus-validation-binary/src/main/java/org/citrusframework/validation/binary/BinaryMessageValidator.java
index 7921556040..6080aae987 100644
--- a/validation/citrus-validation-binary/src/main/java/org/citrusframework/validation/binary/BinaryMessageValidator.java
+++ b/validation/citrus-validation-binary/src/main/java/org/citrusframework/validation/binary/BinaryMessageValidator.java
@@ -33,7 +33,6 @@
  * Message validator compares binary streams. Assumes control
  * message payload is convertable to an input stream so we can compare the stream data with buffer read.
  *
- * @author Christoph Deppisch
  */
 public class BinaryMessageValidator extends DefaultMessageValidator {
 
diff --git a/validation/citrus-validation-binary/src/test/java/org/citrusframework/validation/MessageValidatorTest.java b/validation/citrus-validation-binary/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
index 72422aa50d..388ee25011 100644
--- a/validation/citrus-validation-binary/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
+++ b/validation/citrus-validation-binary/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageValidatorTest {
 
     @Test
diff --git a/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/GroovyJsonMessageValidator.java b/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/GroovyJsonMessageValidator.java
index 859bebe16f..a727d7eabc 100644
--- a/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/GroovyJsonMessageValidator.java
+++ b/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/GroovyJsonMessageValidator.java
@@ -25,7 +25,6 @@
  * Extended groovy message validator providing specific Json slurper support.
  * With Json slurper the tester can validate the message payload with closures for instance.
  *
- * @author DanielP
  * @since 1.2
  */
 public class GroovyJsonMessageValidator extends GroovyScriptMessageValidator {
diff --git a/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/GroovyScriptMessageValidator.java b/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/GroovyScriptMessageValidator.java
index ea158bcc78..34774d3967 100644
--- a/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/GroovyScriptMessageValidator.java
+++ b/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/GroovyScriptMessageValidator.java
@@ -44,7 +44,6 @@
  * Available objects inside groovy script are 'receivedMessage' which is the actual {@link Message} object
  * to validate and 'context' the current {@link TestContext}.
  *
- * @author Christoph Deppisch
  */
 public class GroovyScriptMessageValidator extends AbstractMessageValidator<ScriptValidationContext> {
 
diff --git a/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/GroovyXmlMessageValidator.java b/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/GroovyXmlMessageValidator.java
index 169ca726da..83e272904f 100644
--- a/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/GroovyXmlMessageValidator.java
+++ b/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/GroovyXmlMessageValidator.java
@@ -26,7 +26,6 @@
  * With XML slurper the tester can validate the message payload with closures and without having
  * to deal with XPath for instance.
  *
- * @author Christoph Deppisch
  */
 public class GroovyXmlMessageValidator extends GroovyScriptMessageValidator {
 
diff --git a/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/sql/GroovySqlResultSetValidator.java b/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/sql/GroovySqlResultSetValidator.java
index 13b6b58d40..44f3af0f68 100644
--- a/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/sql/GroovySqlResultSetValidator.java
+++ b/validation/citrus-validation-groovy/src/main/java/org/citrusframework/validation/script/sql/GroovySqlResultSetValidator.java
@@ -39,7 +39,6 @@
 /**
  * Groovy script validator capable of validating SQL result sets.
  *
- * @author Christoph Deppisch
  */
 public class GroovySqlResultSetValidator implements SqlResultSetScriptValidator {
 
diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/UnitTestSupport.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/UnitTestSupport.java
index dd2dd000d7..e292b9083d 100644
--- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/UnitTestSupport.java
+++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/UnitTestSupport.java
@@ -20,9 +20,6 @@
 import org.citrusframework.context.TestContextFactory;
 import org.testng.annotations.BeforeMethod;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport {
 
     protected TestContextFactory testContextFactory;
diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/actions/dsl/ExecuteSQLQueryTestActionBuilderTest.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/actions/dsl/ExecuteSQLQueryTestActionBuilderTest.java
index dd0a1cc6af..f691af28d1 100644
--- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/actions/dsl/ExecuteSQLQueryTestActionBuilderTest.java
+++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/actions/dsl/ExecuteSQLQueryTestActionBuilderTest.java
@@ -44,7 +44,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class ExecuteSQLQueryTestActionBuilderTest extends UnitTestSupport {
diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java
index 487dede64c..6d69445900 100644
--- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java
+++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java
@@ -50,9 +50,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageActionBuilderTest extends AbstractTestNGUnitTest {
 
     private final Endpoint messageEndpoint = Mockito.mock(Endpoint.class);
diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/JsonGroovyValidationIT.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/JsonGroovyValidationIT.java
index 3213a1362f..af26465e76 100644
--- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/JsonGroovyValidationIT.java
+++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/JsonGroovyValidationIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class JsonGroovyValidationIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ScriptMessageValidationIT.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ScriptMessageValidationIT.java
index e9a73f7ed0..7c2fc4b079 100644
--- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ScriptMessageValidationIT.java
+++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ScriptMessageValidationIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ScriptMessageValidationIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ValidateSqlResultSetIT.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ValidateSqlResultSetIT.java
index 9bfc9cda2e..8937b1e508 100644
--- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ValidateSqlResultSetIT.java
+++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ValidateSqlResultSetIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class ValidateSqlResultSetIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ValidateSqlResultSetJavaIT.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ValidateSqlResultSetJavaIT.java
index bfb8512189..1bfe0b16f4 100644
--- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ValidateSqlResultSetJavaIT.java
+++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/integration/ValidateSqlResultSetJavaIT.java
@@ -29,9 +29,6 @@
 import static org.citrusframework.actions.ExecuteSQLQueryAction.Builder.query;
 import static org.citrusframework.container.FinallySequence.Builder.doFinally;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class ValidateSqlResultSetJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/MessageValidatorTest.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
index 5773de904a..1d66ef66e8 100644
--- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
+++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageValidatorTest {
 
     @Test
diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/GroovyJsonMessageValidatorTest.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/GroovyJsonMessageValidatorTest.java
index b5fcf45299..c6e8f8de5a 100644
--- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/GroovyJsonMessageValidatorTest.java
+++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/GroovyJsonMessageValidatorTest.java
@@ -32,9 +32,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author DanielP
- */
 public class GroovyJsonMessageValidatorTest extends AbstractTestNGUnitTest {
 
     private final GroovyJsonMessageValidator validator = new GroovyJsonMessageValidator();
diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/GroovyScriptMessageValidatorTest.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/GroovyScriptMessageValidatorTest.java
index 811e454666..5f5fd79bb1 100644
--- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/GroovyScriptMessageValidatorTest.java
+++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/GroovyScriptMessageValidatorTest.java
@@ -32,9 +32,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyScriptMessageValidatorTest extends AbstractTestNGUnitTest {
 
     GroovyScriptMessageValidator validator = new GroovyScriptMessageValidator();
diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/GroovyXmlMessageValidatorTest.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/GroovyXmlMessageValidatorTest.java
index f6292296eb..a7ec6eec3f 100644
--- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/GroovyXmlMessageValidatorTest.java
+++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/GroovyXmlMessageValidatorTest.java
@@ -33,9 +33,6 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class GroovyXmlMessageValidatorTest extends AbstractTestNGUnitTest {
 
     private final GroovyXmlMessageValidator validator = new GroovyXmlMessageValidator();
diff --git a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/ReceiveMessageActionTest.java b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/ReceiveMessageActionTest.java
index 205454a60b..ab4cbcbcd9 100644
--- a/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/ReceiveMessageActionTest.java
+++ b/validation/citrus-validation-groovy/src/test/java/org/citrusframework/validation/script/ReceiveMessageActionTest.java
@@ -47,9 +47,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageActionTest extends AbstractTestNGUnitTest {
 
     @Mock
diff --git a/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/container/HamcrestConditionExpression.java b/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/container/HamcrestConditionExpression.java
index 0cf9fd928c..feddea404e 100644
--- a/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/container/HamcrestConditionExpression.java
+++ b/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/container/HamcrestConditionExpression.java
@@ -23,7 +23,6 @@
  * Condition expression that evaluates a Hamcrest matcher. The matcher is invoked with given
  * index of iterating test container.
  *
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class HamcrestConditionExpression implements IteratingConditionExpression, ConditionExpression {
diff --git a/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/HamcrestHeaderValidator.java b/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/HamcrestHeaderValidator.java
index 509ecb1555..cc59034f56 100644
--- a/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/HamcrestHeaderValidator.java
+++ b/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/HamcrestHeaderValidator.java
@@ -25,7 +25,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 3.0.0
  */
 public class HamcrestHeaderValidator implements HeaderValidator {
diff --git a/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/HamcrestValueMatcher.java b/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/HamcrestValueMatcher.java
index 1215aafb9c..0e49259e0f 100644
--- a/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/HamcrestValueMatcher.java
+++ b/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/HamcrestValueMatcher.java
@@ -20,9 +20,6 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.core.IsEqual;
 
-/**
- * @author Christoph Deppisch
- */
 public class HamcrestValueMatcher implements ValueMatcher {
 
     @Override
diff --git a/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/matcher/hamcrest/HamcrestValidationMatcher.java b/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/matcher/hamcrest/HamcrestValidationMatcher.java
index b4f9b5e382..43fc52f08b 100644
--- a/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/matcher/hamcrest/HamcrestValidationMatcher.java
+++ b/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/matcher/hamcrest/HamcrestValidationMatcher.java
@@ -47,7 +47,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 @SuppressWarnings("unchecked")
diff --git a/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/matcher/hamcrest/provider/AntPathMatcherProvider.java b/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/matcher/hamcrest/provider/AntPathMatcherProvider.java
index 49a81be640..f1a7ba5b3e 100644
--- a/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/matcher/hamcrest/provider/AntPathMatcherProvider.java
+++ b/validation/citrus-validation-hamcrest/src/main/java/org/citrusframework/validation/matcher/hamcrest/provider/AntPathMatcherProvider.java
@@ -23,9 +23,6 @@
 
 import static java.lang.String.format;
 
-/**
- * @author Christoph Deppisch
- */
 public class AntPathMatcherProvider implements HamcrestMatcherProvider {
 
     @Override
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/UnitTestSupport.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/UnitTestSupport.java
index 050bff46dd..6fcd6fe706 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/UnitTestSupport.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/UnitTestSupport.java
@@ -21,9 +21,6 @@
 import org.citrusframework.validation.DefaultTextEqualsMessageValidator;
 import org.testng.annotations.BeforeMethod;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport {
 
     protected TestContextFactory testContextFactory;
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/actions/ReceiveMessageTestActionBuilderTest.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/actions/ReceiveMessageTestActionBuilderTest.java
index 0e55c04f8b..9d682f6573 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/actions/ReceiveMessageTestActionBuilderTest.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/actions/ReceiveMessageTestActionBuilderTest.java
@@ -44,9 +44,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageTestActionBuilderTest extends UnitTestSupport {
 
     private final Endpoint messageEndpoint = Mockito.mock(Endpoint.class);
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/IterateTest.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/IterateTest.java
index f8514781fe..99aad324f2 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/IterateTest.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/IterateTest.java
@@ -28,9 +28,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-/**
- * @author Christoph Deppisch
- */
 public class IterateTest extends AbstractTestNGUnitTest {
 
     private TestAction action = Mockito.mock(TestAction.class);
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/RepeatOnErrorUntilTrueTest.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/RepeatOnErrorUntilTrueTest.java
index e367f8cdab..a7b61525bf 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/RepeatOnErrorUntilTrueTest.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/RepeatOnErrorUntilTrueTest.java
@@ -29,9 +29,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-/**
- * @author Christoph Deppisch
- */
 public class RepeatOnErrorUntilTrueTest extends AbstractTestNGUnitTest {
 
     private TestAction action = Mockito.mock(TestAction.class);
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java
index 1ec513959f..0519b7a513 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/container/RepeatUntilTrueTest.java
@@ -29,9 +29,6 @@
 import static org.mockito.Mockito.verify;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class RepeatUntilTrueTest extends AbstractTestNGUnitTest {
 
     private TestAction action = Mockito.mock(TestAction.class);
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/ConditionalIT.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/ConditionalIT.java
index cd01ebef34..0747b5d4a9 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/ConditionalIT.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/ConditionalIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ConditionalIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java
index a1de285b45..fe79f01781 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class HamcrestValidationMatcherIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/IterateIT.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/IterateIT.java
index 09cd16cdb9..41d57e24cb 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/IterateIT.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/IterateIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class IterateIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatOnErrorIT.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatOnErrorIT.java
index 9767b4b3f9..91ef78c10c 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatOnErrorIT.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatOnErrorIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class RepeatOnErrorIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatUntilTrueIT.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatUntilTrueIT.java
index d75e042b0e..a9c6814607 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatUntilTrueIT.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/integration/RepeatUntilTrueIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class RepeatUntilTrueIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/DefaultMessageHeaderValidatorTest.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/DefaultMessageHeaderValidatorTest.java
index 03f68b4ffc..625f9bff88 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/DefaultMessageHeaderValidatorTest.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/DefaultMessageHeaderValidatorTest.java
@@ -27,7 +27,6 @@
 import static org.hamcrest.Matchers.startsWith;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class DefaultMessageHeaderValidatorTest extends AbstractTestNGUnitTest {
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/HamcrestHeaderValidatorTest.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/HamcrestHeaderValidatorTest.java
index 2a04494da0..1d485a3bdd 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/HamcrestHeaderValidatorTest.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/HamcrestHeaderValidatorTest.java
@@ -25,7 +25,6 @@
 import static org.hamcrest.Matchers.is;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.6
  */
 public class HamcrestHeaderValidatorTest extends AbstractTestNGUnitTest {
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/HeaderValidatorTest.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/HeaderValidatorTest.java
index 3f5d5c8684..187efa7cf7 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/HeaderValidatorTest.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/HeaderValidatorTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class HeaderValidatorTest {
 
     @Test
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/ValidationUtilsTest.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/ValidationUtilsTest.java
index 5a0dc1d300..250722c217 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/ValidationUtilsTest.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/ValidationUtilsTest.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class ValidationUtilsTest extends AbstractTestNGUnitTest {
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/ValueMatcherTest.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/ValueMatcherTest.java
index 9f04732d92..3249cf7d2c 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/ValueMatcherTest.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/ValueMatcherTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class ValueMatcherTest {
 
     @Test
diff --git a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/matcher/hamcrest/HamcrestValidationMatcherTest.java b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/matcher/hamcrest/HamcrestValidationMatcherTest.java
index 86a663f87b..dd6976384a 100644
--- a/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/matcher/hamcrest/HamcrestValidationMatcherTest.java
+++ b/validation/citrus-validation-hamcrest/src/test/java/org/citrusframework/validation/matcher/hamcrest/HamcrestValidationMatcherTest.java
@@ -30,7 +30,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class HamcrestValidationMatcherTest extends AbstractTestNGUnitTest {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonDataDictionaryParser.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonDataDictionaryParser.java
index dee6e1452a..a889c330b0 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonDataDictionaryParser.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonDataDictionaryParser.java
@@ -20,7 +20,6 @@
 import org.citrusframework.variable.dictionary.json.JsonMappingDataDictionary;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class JsonDataDictionaryParser extends AbstractDataDictionaryParser {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonPathDataDictionaryParser.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonPathDataDictionaryParser.java
index fbdbf82701..e238e6356b 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonPathDataDictionaryParser.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonPathDataDictionaryParser.java
@@ -20,7 +20,6 @@
 import org.citrusframework.variable.dictionary.json.JsonPathMappingDataDictionary;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class JsonPathDataDictionaryParser extends AbstractDataDictionaryParser {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonSchemaParser.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonSchemaParser.java
index 6143c179ac..7bcb8aed51 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonSchemaParser.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonSchemaParser.java
@@ -24,9 +24,6 @@
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
-/**
- * @author Christoph Deppisch
- */
 public class JsonSchemaParser extends AbstractBeanDefinitionParser {
 
     @Override
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonSchemaRepositoryParser.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonSchemaRepositoryParser.java
index 137a47ec60..53ce0c465b 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonSchemaRepositoryParser.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/config/xml/JsonSchemaRepositoryParser.java
@@ -23,9 +23,6 @@
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
-/**
- * @author Christoph Deppisch
- */
 public class JsonSchemaRepositoryParser extends AbstractBeanDefinitionParser {
     @Override
     protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/dsl/JsonPathSupport.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/dsl/JsonPathSupport.java
index 610056644f..263c35a8ec 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/dsl/JsonPathSupport.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/dsl/JsonPathSupport.java
@@ -28,9 +28,6 @@
 import org.citrusframework.validation.json.JsonPathVariableExtractor;
 import org.citrusframework.variable.VariableExtractor;
 
-/**
- * @author Christoph Deppisch
- */
 public class JsonPathSupport implements WithExpressions<JsonPathSupport>, PathExpressionAdapter {
 
     private final Map<String, Object> expressions = new LinkedHashMap<>();
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/dsl/JsonSupport.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/dsl/JsonSupport.java
index 39eb1f13ee..c5ad73294a 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/dsl/JsonSupport.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/dsl/JsonSupport.java
@@ -21,9 +21,6 @@
 import org.citrusframework.validation.json.JsonMappingValidationProcessor;
 import org.citrusframework.validation.json.JsonMessageValidationContext;
 
-/**
- * @author Christoph Deppisch
- */
 public class JsonSupport {
 
     /**
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/endpoint/adapter/mapping/JsonPayloadMappingKeyExtractor.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/endpoint/adapter/mapping/JsonPayloadMappingKeyExtractor.java
index 8fc8d081c4..f537b57655 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/endpoint/adapter/mapping/JsonPayloadMappingKeyExtractor.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/endpoint/adapter/mapping/JsonPayloadMappingKeyExtractor.java
@@ -20,7 +20,6 @@
 import org.citrusframework.message.Message;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class JsonPayloadMappingKeyExtractor extends AbstractMappingKeyExtractor {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/functions/JsonFunctions.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/functions/JsonFunctions.java
index f8595590ba..81a1e73f52 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/functions/JsonFunctions.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/functions/JsonFunctions.java
@@ -21,9 +21,6 @@
 import org.citrusframework.context.TestContext;
 import org.citrusframework.functions.core.JsonPathFunction;
 
-/**
- * @author Christoph Deppisch
- */
 public final class JsonFunctions {
 
     /**
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/functions/core/JsonPathFunction.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/functions/core/JsonPathFunction.java
index 63f8da29a4..a0fc8288ab 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/functions/core/JsonPathFunction.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/functions/core/JsonPathFunction.java
@@ -24,7 +24,6 @@
 import org.citrusframework.json.JsonPathUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class JsonPathFunction implements Function {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonPathSegmentVariableExtractor.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonPathSegmentVariableExtractor.java
index d314480ca5..5111007448 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonPathSegmentVariableExtractor.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonPathSegmentVariableExtractor.java
@@ -24,9 +24,6 @@
 import org.citrusframework.variable.SegmentVariableExtractorRegistry;
 import org.citrusframework.variable.VariableExpressionSegmentMatcher;
 
-/**
- * @author Thorsten Schlathoelter
- */
 public class JsonPathSegmentVariableExtractor extends SegmentVariableExtractorRegistry.AbstractSegmentVariableExtractor {
 
     @Override
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonPathUtils.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonPathUtils.java
index 91af590138..0425d5c661 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonPathUtils.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonPathUtils.java
@@ -30,7 +30,6 @@
 import org.citrusframework.validation.json.JsonPathFunctions;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7.4
  */
 public class JsonPathUtils {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonSettings.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonSettings.java
index 5d2b5ca380..0550b3b677 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonSettings.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/json/JsonSettings.java
@@ -23,9 +23,6 @@
 import static net.minidev.json.parser.JSONParser.MODE_RFC4627;
 import static net.minidev.json.parser.JSONParser.MODE_STRICTEST;
 
-/**
- * @author Christoph Deppisch
- */
 public final class JsonSettings {
 
     private static final String MESSAGE_VALIDATION_STRICT_PROPERTY = "citrus.json.message.validation.strict";
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingHeaderDataBuilder.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingHeaderDataBuilder.java
index 7a58907bf6..01bff3fbdb 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingHeaderDataBuilder.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingHeaderDataBuilder.java
@@ -23,9 +23,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-/**
- * @author Christoph Deppisch
- */
 public class ObjectMappingHeaderDataBuilder extends DefaultHeaderDataBuilder {
 
     private final ObjectMapper mapper;
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingPayloadBuilder.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingPayloadBuilder.java
index 2f39210ace..27d9273d61 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingPayloadBuilder.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/message/builder/ObjectMappingPayloadBuilder.java
@@ -23,9 +23,6 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-/**
- * @author Christoph Deppisch
- */
 public class ObjectMappingPayloadBuilder extends DefaultPayloadBuilder {
 
     private final ObjectMapper mapper;
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/message/selector/JsonPathPayloadMessageSelector.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/message/selector/JsonPathPayloadMessageSelector.java
index f7b4a69f74..827717773f 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/message/selector/JsonPathPayloadMessageSelector.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/message/selector/JsonPathPayloadMessageSelector.java
@@ -29,7 +29,6 @@
  *
  * Syntax is jsonPath:$.root.element
  *
- * @author Christoph Deppisch
  * @since 3.0
  */
 public class JsonPathPayloadMessageSelector extends AbstractMessageSelector {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonMappingValidationProcessor.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonMappingValidationProcessor.java
index 181a532947..720344de2f 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonMappingValidationProcessor.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonMappingValidationProcessor.java
@@ -33,7 +33,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public abstract class JsonMappingValidationProcessor<T> extends AbstractValidationProcessor<T> {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathFunctions.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathFunctions.java
index e4692ea26d..9ed0f04e54 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathFunctions.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathFunctions.java
@@ -27,7 +27,6 @@
 /**
  * Custom JsonPath function support for size(), keySet() and toString() operations on Json objects and arrays.
  *
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class JsonPathFunctions {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathMessageProcessor.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathMessageProcessor.java
index 74f508240f..9d83d69fa6 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathMessageProcessor.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathMessageProcessor.java
@@ -37,7 +37,6 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class JsonPathMessageProcessor extends AbstractMessageProcessor {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathMessageValidator.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathMessageValidator.java
index 07af6bbd25..fe4194cdf0 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathMessageValidator.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathMessageValidator.java
@@ -39,7 +39,6 @@
 
 /**
  * Message validator evaluates set of JSONPath expressions on message payload and checks that values are as expected.
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class JsonPathMessageValidator extends AbstractMessageValidator<JsonPathMessageValidationContext> {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathVariableExtractor.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathVariableExtractor.java
index 981702c23b..e1fc2da296 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathVariableExtractor.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonPathVariableExtractor.java
@@ -44,7 +44,6 @@
  * Extractor implementation reads message elements via JSONPath expressions and saves the
  * values as new test variables. JSONObject and JSONArray items will be saved as String representation.
  *
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class JsonPathVariableExtractor implements VariableExtractor {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonTextMessageValidator.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonTextMessageValidator.java
index 3762e5150f..20e3b8f0b6 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonTextMessageValidator.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/validation/json/JsonTextMessageValidator.java
@@ -38,7 +38,6 @@
  * control object fields to match. No additional fields in received JSON data structure will be accepted. In soft mode validator
  * allows additional fields in received JSON data structure so the control JSON object can be a partial subset.
  *
- * @author Christoph Deppisch
  */
 public class JsonTextMessageValidator extends AbstractMessageValidator<JsonMessageValidationContext> {
 
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/variable/dictionary/json/AbstractJsonDataDictionary.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/variable/dictionary/json/AbstractJsonDataDictionary.java
index 819a55c259..2a08c0aabc 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/variable/dictionary/json/AbstractJsonDataDictionary.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/variable/dictionary/json/AbstractJsonDataDictionary.java
@@ -22,7 +22,6 @@
 /**
  * Abstract json data dictionary works on json message data. Each value is translated with dictionary.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public abstract class AbstractJsonDataDictionary extends AbstractDataDictionary<String> {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/variable/dictionary/json/JsonMappingDataDictionary.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/variable/dictionary/json/JsonMappingDataDictionary.java
index 98b4274a67..3eece0c64c 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/variable/dictionary/json/JsonMappingDataDictionary.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/variable/dictionary/json/JsonMappingDataDictionary.java
@@ -36,7 +36,6 @@
  * json object graph. Parses message payload to json object tree. Traverses
  * through json data supporting nested json objects, arrays and values.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JsonMappingDataDictionary extends AbstractJsonDataDictionary {
diff --git a/validation/citrus-validation-json/src/main/java/org/citrusframework/variable/dictionary/json/JsonPathMappingDataDictionary.java b/validation/citrus-validation-json/src/main/java/org/citrusframework/variable/dictionary/json/JsonPathMappingDataDictionary.java
index 23fa1db2e2..2c2ffd6a85 100644
--- a/validation/citrus-validation-json/src/main/java/org/citrusframework/variable/dictionary/json/JsonPathMappingDataDictionary.java
+++ b/validation/citrus-validation-json/src/main/java/org/citrusframework/variable/dictionary/json/JsonPathMappingDataDictionary.java
@@ -30,7 +30,6 @@
  * Json data dictionary implementation maps elements via JsonPath expressions. When element is identified by some expression
  * in dictionary value is overwritten accordingly.
  *
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class JsonPathMappingDataDictionary extends AbstractJsonDataDictionary {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/UnitTestSupport.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/UnitTestSupport.java
index c8a145abcc..fb0a998fda 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/UnitTestSupport.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/UnitTestSupport.java
@@ -31,9 +31,6 @@
 import org.citrusframework.validation.json.JsonTextMessageValidator;
 import org.testng.Assert;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport extends AbstractTestNGUnitTest {
 
     @Override
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java
index 3d396e8551..ccf4bb05d6 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java
@@ -67,9 +67,6 @@
 import static org.hamcrest.Matchers.nullValue;
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageActionBuilderTest extends UnitTestSupport {
 
     private final Endpoint messageEndpoint = Mockito.mock(Endpoint.class);
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java
index 7743bd7d7e..0e752a0226 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java
@@ -52,9 +52,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendMessageActionBuilderTest extends UnitTestSupport {
 
     private final ReferenceResolver referenceResolver = Mockito.mock(ReferenceResolver.class);
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/actions/dsl/TestRequest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/actions/dsl/TestRequest.java
index 5704927bdc..004070394b 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/actions/dsl/TestRequest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/actions/dsl/TestRequest.java
@@ -19,7 +19,6 @@
 /**
  * Sample model object mapped to message payload.
  *
- * @author Christoph Deppisch
  */
 public class TestRequest {
 
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/config/xml/JsonDataDictionaryParserTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/config/xml/JsonDataDictionaryParserTest.java
index 1c3a67aa75..2791d6ffb7 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/config/xml/JsonDataDictionaryParserTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/config/xml/JsonDataDictionaryParserTest.java
@@ -26,7 +26,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class JsonDataDictionaryParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/config/xml/JsonPathDataDictionaryParserTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/config/xml/JsonPathDataDictionaryParserTest.java
index 6ba0a8992a..90373140d8 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/config/xml/JsonPathDataDictionaryParserTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/config/xml/JsonPathDataDictionaryParserTest.java
@@ -26,7 +26,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class JsonPathDataDictionaryParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/config/xml/JsonSchemaRepositoryParserTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/config/xml/JsonSchemaRepositoryParserTest.java
index f03d8c525a..f0dd47ff1e 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/config/xml/JsonSchemaRepositoryParserTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/config/xml/JsonSchemaRepositoryParserTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class JsonSchemaRepositoryParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/endpoint/adapter/mapping/JsonPayloadMappingKeyExtractorTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/endpoint/adapter/mapping/JsonPayloadMappingKeyExtractorTest.java
index 6493505d8b..cb2c71296f 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/endpoint/adapter/mapping/JsonPayloadMappingKeyExtractorTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/endpoint/adapter/mapping/JsonPayloadMappingKeyExtractorTest.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class JsonPayloadMappingKeyExtractorTest {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/functions/core/JsonPathFunctionTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/functions/core/JsonPathFunctionTest.java
index 9d7a7ae53a..d8536d9c2a 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/functions/core/JsonPathFunctionTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/functions/core/JsonPathFunctionTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class JsonPathFunctionTest extends AbstractTestNGUnitTest {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java
index a1de285b45..fe79f01781 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class HamcrestValidationMatcherIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonMappingValidationProcessorIT.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonMappingValidationProcessorIT.java
index 355752306c..f3cf0f7335 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonMappingValidationProcessorIT.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonMappingValidationProcessorIT.java
@@ -35,7 +35,6 @@
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 
 /**
- * @author Christoph Deppisch
  * @since 3.3.1
  */
 public class JsonMappingValidationProcessorIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathExpressionValidationIT.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathExpressionValidationIT.java
index c3b67847df..eb8ff916a1 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathExpressionValidationIT.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathExpressionValidationIT.java
@@ -33,7 +33,6 @@
 import static org.citrusframework.dsl.JsonPathSupport.jsonPath;
 
 /**
- * @author Christoph Deppisch
  * @since 3.3.1
  */
 public class JsonPathExpressionValidationIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathValidationIT.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathValidationIT.java
index c85e0051e4..577282f0f7 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathValidationIT.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathValidationIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class JsonPathValidationIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathVariableExtractorIT.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathVariableExtractorIT.java
index bf79feb824..45601b1a6f 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathVariableExtractorIT.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonPathVariableExtractorIT.java
@@ -36,7 +36,6 @@
 import static org.citrusframework.dsl.JsonPathSupport.jsonPath;
 
 /**
- * @author Christoph Deppisch
  * @since 3.3.1
  */
 public class JsonPathVariableExtractorIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonTextValidationIT.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonTextValidationIT.java
index d9e7e11d95..7df50de140 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonTextValidationIT.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/JsonTextValidationIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2011
  */
 public class JsonTextValidationIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/MessageValidationIT.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/MessageValidationIT.java
index 34556ffab3..f566bd7195 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/MessageValidationIT.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/integration/MessageValidationIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageValidationIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/message/builder/ObjectMappingHeaderDataBuilderTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/message/builder/ObjectMappingHeaderDataBuilderTest.java
index 3fa4b0e132..ad9d616d3a 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/message/builder/ObjectMappingHeaderDataBuilderTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/message/builder/ObjectMappingHeaderDataBuilderTest.java
@@ -28,9 +28,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ObjectMappingHeaderDataBuilderTest extends UnitTestSupport {
 
     private final ObjectMapper mapper = new ObjectMapper();
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/message/builder/ObjectMappingPayloadBuilderTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/message/builder/ObjectMappingPayloadBuilderTest.java
index aa589183e7..50342854b6 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/message/builder/ObjectMappingPayloadBuilderTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/message/builder/ObjectMappingPayloadBuilderTest.java
@@ -28,9 +28,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ObjectMappingPayloadBuilderTest extends UnitTestSupport {
 
     private final ObjectMapper mapper = new ObjectMapper();
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/message/selector/DelegatingMessageSelectorTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/message/selector/DelegatingMessageSelectorTest.java
index 5bcd588890..d403c9233f 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/message/selector/DelegatingMessageSelectorTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/message/selector/DelegatingMessageSelectorTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DelegatingMessageSelectorTest extends UnitTestSupport {
 
     @Test
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/message/selector/JsonPathPayloadMessageSelectorTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/message/selector/JsonPathPayloadMessageSelectorTest.java
index 7b29e17181..bbd617c6d3 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/message/selector/JsonPathPayloadMessageSelectorTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/message/selector/JsonPathPayloadMessageSelectorTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class JsonPathPayloadMessageSelectorTest extends UnitTestSupport {
 
     @Test
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/MessageValidatorTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
index c89ebe29b8..7953e35d8b 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
@@ -24,9 +24,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageValidatorTest {
 
     @Test
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonMappingValidationProcessorTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonMappingValidationProcessorTest.java
index 1bc8821f50..e30a772a9b 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonMappingValidationProcessorTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonMappingValidationProcessorTest.java
@@ -27,9 +27,6 @@
 
 import static org.citrusframework.validation.json.JsonMappingValidationProcessor.Builder.validate;
 
-/**
- * @author Christoph Deppisch
- */
 public class JsonMappingValidationProcessorTest extends AbstractTestNGUnitTest {
 
     private final ObjectMapper mapper = new ObjectMapper();
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonPathMessageProcessorTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonPathMessageProcessorTest.java
index de115290a0..57d93ec8b5 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonPathMessageProcessorTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonPathMessageProcessorTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class JsonPathMessageProcessorTest extends AbstractTestNGUnitTest {
 
     @Test
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonPathMessageValidatorTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonPathMessageValidatorTest.java
index 31388db515..2e7a21db97 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonPathMessageValidatorTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonPathMessageValidatorTest.java
@@ -45,7 +45,6 @@
 import static org.hamcrest.Matchers.startsWith;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class JsonPathMessageValidatorTest extends UnitTestSupport {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonPathVariableExtractorTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonPathVariableExtractorTest.java
index 5a7368bdc4..219ed3e1aa 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonPathVariableExtractorTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonPathVariableExtractorTest.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class JsonPathVariableExtractorTest extends AbstractTestNGUnitTest {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonTextMessageValidatorTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonTextMessageValidatorTest.java
index df6aa948d0..b649ca02ed 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonTextMessageValidatorTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/JsonTextMessageValidatorTest.java
@@ -40,9 +40,6 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class JsonTextMessageValidatorTest extends UnitTestSupport {
 
     private JsonTextMessageValidator fixture;
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/ReceiveMessageActionTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/ReceiveMessageActionTest.java
index 43471c7d4f..1916625bea 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/ReceiveMessageActionTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/ReceiveMessageActionTest.java
@@ -45,9 +45,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageActionTest extends AbstractTestNGUnitTest {
 
     @Mock
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/SendMessageActionTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/SendMessageActionTest.java
index f18484eaa0..c4850d40c1 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/SendMessageActionTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/validation/json/SendMessageActionTest.java
@@ -47,9 +47,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendMessageActionTest extends AbstractTestNGUnitTest {
 
     private Endpoint endpoint = Mockito.mock(Endpoint.class);
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/variable/dictionary/json/JsonMappingDataDictionaryTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/variable/dictionary/json/JsonMappingDataDictionaryTest.java
index 7467f41a36..d45b0ddf76 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/variable/dictionary/json/JsonMappingDataDictionaryTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/variable/dictionary/json/JsonMappingDataDictionaryTest.java
@@ -29,7 +29,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class JsonMappingDataDictionaryTest extends UnitTestSupport {
diff --git a/validation/citrus-validation-json/src/test/java/org/citrusframework/variable/dictionary/json/JsonPathMappingDataDictionaryTest.java b/validation/citrus-validation-json/src/test/java/org/citrusframework/variable/dictionary/json/JsonPathMappingDataDictionaryTest.java
index 42b945446e..f9615902a1 100644
--- a/validation/citrus-validation-json/src/test/java/org/citrusframework/variable/dictionary/json/JsonPathMappingDataDictionaryTest.java
+++ b/validation/citrus-validation-json/src/test/java/org/citrusframework/variable/dictionary/json/JsonPathMappingDataDictionaryTest.java
@@ -28,7 +28,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.7
  */
 public class JsonPathMappingDataDictionaryTest extends UnitTestSupport {
diff --git a/validation/citrus-validation-text/src/main/java/org/citrusframework/validation/text/BinaryBase64MessageValidator.java b/validation/citrus-validation-text/src/main/java/org/citrusframework/validation/text/BinaryBase64MessageValidator.java
index fcc6c48478..a86923a5c7 100644
--- a/validation/citrus-validation-text/src/main/java/org/citrusframework/validation/text/BinaryBase64MessageValidator.java
+++ b/validation/citrus-validation-text/src/main/java/org/citrusframework/validation/text/BinaryBase64MessageValidator.java
@@ -27,7 +27,6 @@
  * Message validator automatically converts received binary data message payload to base64 String. Assumes control
  * message payload is also base64 encoded String so we can compare the text data with normal plain text validation.
  *
- * @author Christoph Deppisch
  */
 public class BinaryBase64MessageValidator extends PlainTextMessageValidator {
 
diff --git a/validation/citrus-validation-text/src/main/java/org/citrusframework/validation/text/GzipBinaryBase64MessageValidator.java b/validation/citrus-validation-text/src/main/java/org/citrusframework/validation/text/GzipBinaryBase64MessageValidator.java
index 627b1be4e7..552358d8f4 100644
--- a/validation/citrus-validation-text/src/main/java/org/citrusframework/validation/text/GzipBinaryBase64MessageValidator.java
+++ b/validation/citrus-validation-text/src/main/java/org/citrusframework/validation/text/GzipBinaryBase64MessageValidator.java
@@ -32,7 +32,6 @@
  * Message validator automatically converts received binary data message payload to base64 String. Assumes control
  * message payload is also base64 encoded String so we can compare the text data with normal plain text validation.
  *
- * @author Christoph Deppisch
  */
 public class GzipBinaryBase64MessageValidator extends BinaryBase64MessageValidator {
 
diff --git a/validation/citrus-validation-text/src/main/java/org/citrusframework/validation/text/PlainTextMessageValidator.java b/validation/citrus-validation-text/src/main/java/org/citrusframework/validation/text/PlainTextMessageValidator.java
index d7152db132..42e53308e2 100644
--- a/validation/citrus-validation-text/src/main/java/org/citrusframework/validation/text/PlainTextMessageValidator.java
+++ b/validation/citrus-validation-text/src/main/java/org/citrusframework/validation/text/PlainTextMessageValidator.java
@@ -35,7 +35,6 @@
 /**
  * Plain text validator using simple String comparison.
  *
- * @author Christoph Deppisch
  */
 public class PlainTextMessageValidator extends DefaultMessageValidator {
 
diff --git a/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/MessageValidationIT.java b/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/MessageValidationIT.java
index 34556ffab3..f566bd7195 100644
--- a/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/MessageValidationIT.java
+++ b/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/MessageValidationIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageValidationIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/PlainTextValidationIT.java b/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/PlainTextValidationIT.java
index 3c8d963e11..5622350ee7 100644
--- a/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/PlainTextValidationIT.java
+++ b/validation/citrus-validation-text/src/test/java/org/citrusframework/integration/PlainTextValidationIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2011
  */
 public class PlainTextValidationIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/MessageValidatorTest.java b/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
index 6c10946794..25b2d5ce0d 100644
--- a/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
+++ b/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageValidatorTest {
 
     @Test
diff --git a/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/text/BinaryBase64MessageValidatorTest.java b/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/text/BinaryBase64MessageValidatorTest.java
index 04da9a4a32..626e3d16d7 100644
--- a/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/text/BinaryBase64MessageValidatorTest.java
+++ b/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/text/BinaryBase64MessageValidatorTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class BinaryBase64MessageValidatorTest extends AbstractTestNGUnitTest {
 
     private BinaryBase64MessageValidator validator = new BinaryBase64MessageValidator();
diff --git a/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/text/GzipBinaryBase64MessageValidatorTest.java b/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/text/GzipBinaryBase64MessageValidatorTest.java
index 7c828e7a74..ab5c4ea632 100644
--- a/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/text/GzipBinaryBase64MessageValidatorTest.java
+++ b/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/text/GzipBinaryBase64MessageValidatorTest.java
@@ -34,9 +34,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class GzipBinaryBase64MessageValidatorTest extends AbstractTestNGUnitTest {
 
     private final GzipBinaryBase64MessageValidator validator = new GzipBinaryBase64MessageValidator();
diff --git a/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/text/PlainTextMessageValidatorTest.java b/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/text/PlainTextMessageValidatorTest.java
index da3b1c1b0a..b955a5052f 100644
--- a/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/text/PlainTextMessageValidatorTest.java
+++ b/validation/citrus-validation-text/src/test/java/org/citrusframework/validation/text/PlainTextMessageValidatorTest.java
@@ -32,9 +32,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class PlainTextMessageValidatorTest extends AbstractTestNGUnitTest {
 
     private PlainTextMessageValidator validator = new PlainTextMessageValidator();
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/XmlValidationHelper.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/XmlValidationHelper.java
index 4eaacd2d54..2a71f0e1b3 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/XmlValidationHelper.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/XmlValidationHelper.java
@@ -23,9 +23,6 @@
 import org.citrusframework.xml.XsdSchemaRepository;
 import org.citrusframework.xml.namespace.NamespaceContextBuilder;
 
-/**
- * @author Christoph Deppisch
- */
 public class XmlValidationHelper {
 
     private static final NamespaceContextBuilder NAMESPACE_CONTEXT_BUILDER = new NamespaceContextBuilder();
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/SchemaCollectionParser.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/SchemaCollectionParser.java
index 27e547a6e7..558c1f40d3 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/SchemaCollectionParser.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/SchemaCollectionParser.java
@@ -30,7 +30,6 @@
 /**
  * Bean definition parser for schema configuration.
  *
- * @author Christoph Deppisch
  * @since 1.3.1
  */
 public class SchemaCollectionParser implements BeanDefinitionParser {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/WsdlSchemaParser.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/WsdlSchemaParser.java
index 373f9945db..74bc64a4b2 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/WsdlSchemaParser.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/WsdlSchemaParser.java
@@ -24,9 +24,6 @@
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
-/**
- * @author Christoph Deppisch
- */
 public class WsdlSchemaParser extends AbstractBeanDefinitionParser {
     @Override
     protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XmlDataDictionaryParser.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XmlDataDictionaryParser.java
index 47b7661b62..0c1d098a22 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XmlDataDictionaryParser.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XmlDataDictionaryParser.java
@@ -20,7 +20,6 @@
 import org.citrusframework.variable.dictionary.xml.NodeMappingDataDictionary;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class XmlDataDictionaryParser extends AbstractDataDictionaryParser {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XpathDataDictionaryParser.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XpathDataDictionaryParser.java
index 520056f170..8e5e167d7e 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XpathDataDictionaryParser.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XpathDataDictionaryParser.java
@@ -20,7 +20,6 @@
 import org.citrusframework.variable.dictionary.xml.XpathMappingDataDictionary;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class XpathDataDictionaryParser extends AbstractDataDictionaryParser {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XsdSchemaParser.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XsdSchemaParser.java
index b315ea80f5..769119d18c 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XsdSchemaParser.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XsdSchemaParser.java
@@ -24,9 +24,6 @@
 import org.springframework.xml.xsd.SimpleXsdSchema;
 import org.w3c.dom.Element;
 
-/**
- * @author Christoph Deppisch
- */
 public class XsdSchemaParser extends AbstractBeanDefinitionParser {
     @Override
     protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XsdSchemaRepositoryParser.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XsdSchemaRepositoryParser.java
index 1a332a476f..fb6e157c31 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XsdSchemaRepositoryParser.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/config/xml/XsdSchemaRepositoryParser.java
@@ -24,9 +24,6 @@
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
-/**
- * @author Christoph Deppisch
- */
 public class XsdSchemaRepositoryParser extends AbstractBeanDefinitionParser {
     @Override
     protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/dsl/XmlSupport.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/dsl/XmlSupport.java
index df7f719ab0..a78d54ec44 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/dsl/XmlSupport.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/dsl/XmlSupport.java
@@ -20,9 +20,6 @@
 import org.citrusframework.validation.xml.XmlMarshallingValidationProcessor;
 import org.citrusframework.validation.xml.XmlMessageValidationContext;
 
-/**
- * @author Christoph Deppisch
- */
 public class XmlSupport {
 
     /**
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/dsl/XpathSupport.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/dsl/XpathSupport.java
index 0a89d8d64e..73890ca410 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/dsl/XpathSupport.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/dsl/XpathSupport.java
@@ -28,9 +28,6 @@
 import org.citrusframework.validation.xml.XpathPayloadVariableExtractor;
 import org.citrusframework.variable.VariableExtractor;
 
-/**
- * @author Christoph Deppisch
- */
 public class XpathSupport implements WithExpressions<XpathSupport>, PathExpressionAdapter {
 
     private final Map<String, Object> expressions = new LinkedHashMap<>();
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/endpoint/adapter/mapping/XPathPayloadMappingKeyExtractor.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/endpoint/adapter/mapping/XPathPayloadMappingKeyExtractor.java
index 16e090a392..a9c6ec12e9 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/endpoint/adapter/mapping/XPathPayloadMappingKeyExtractor.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/endpoint/adapter/mapping/XPathPayloadMappingKeyExtractor.java
@@ -26,7 +26,6 @@
 /**
  * Extracts predicate from message payload via XPath expression evaluation.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class XPathPayloadMappingKeyExtractor extends AbstractMappingKeyExtractor {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/XmlFunctions.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/XmlFunctions.java
index cc4818d007..74f7dfb812 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/XmlFunctions.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/XmlFunctions.java
@@ -24,9 +24,6 @@
 import org.citrusframework.functions.core.EscapeXmlFunction;
 import org.citrusframework.functions.core.XpathFunction;
 
-/**
- * @author Christoph Deppisch
- */
 public final class XmlFunctions {
 
     /**
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/core/CreateCDataSectionFunction.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/core/CreateCDataSectionFunction.java
index 274bfe4af8..19df65afd0 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/core/CreateCDataSectionFunction.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/core/CreateCDataSectionFunction.java
@@ -28,7 +28,6 @@
  * nested CDATA sections are not allowed. This function adds the CDATA section tags
  * at runtime.
  *
- * @author Christoph Deppisch
  */
 public class CreateCDataSectionFunction implements Function {
 
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/core/EscapeXmlFunction.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/core/EscapeXmlFunction.java
index 8b6f30d237..98c90a308b 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/core/EscapeXmlFunction.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/core/EscapeXmlFunction.java
@@ -27,7 +27,6 @@
 /**
  * Escapes XML fragment with escaped characters for '<', '>'.
  *
- * @author Christoph Deppisch
  */
 public class EscapeXmlFunction implements Function {
 
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/core/XpathFunction.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/core/XpathFunction.java
index a2c65397a7..1b436957a9 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/core/XpathFunction.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/functions/core/XpathFunction.java
@@ -26,7 +26,6 @@
 import org.citrusframework.xml.xpath.XPathUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class XpathFunction implements Function {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/builder/MarshallingHeaderDataBuilder.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/builder/MarshallingHeaderDataBuilder.java
index 9b05e6a2e6..04475e9179 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/builder/MarshallingHeaderDataBuilder.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/builder/MarshallingHeaderDataBuilder.java
@@ -23,9 +23,6 @@
 import org.citrusframework.xml.Marshaller;
 import org.citrusframework.xml.StringResult;
 
-/**
- * @author Christoph Deppisch
- */
 public class MarshallingHeaderDataBuilder extends DefaultHeaderDataBuilder {
 
     private final Marshaller marshaller;
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/builder/MarshallingPayloadBuilder.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/builder/MarshallingPayloadBuilder.java
index acd9b6c0cb..742bb2b9aa 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/builder/MarshallingPayloadBuilder.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/builder/MarshallingPayloadBuilder.java
@@ -24,9 +24,6 @@
 import org.citrusframework.xml.Marshaller;
 import org.citrusframework.xml.StringResult;
 
-/**
- * @author Christoph Deppisch
- */
 public class MarshallingPayloadBuilder extends DefaultPayloadBuilder {
 
     private final Marshaller marshaller;
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/selector/RootQNameMessageSelector.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/selector/RootQNameMessageSelector.java
index a2436ff055..f103ecb557 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/selector/RootQNameMessageSelector.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/selector/RootQNameMessageSelector.java
@@ -31,7 +31,6 @@
 /**
  * Message selector accepts XML messages according to specified root element QName.
  *
- * @author Christoph Deppisch
  */
 public class RootQNameMessageSelector extends AbstractMessageSelector {
 
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/selector/XpathPayloadMessageSelector.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/selector/XpathPayloadMessageSelector.java
index 5ff36ebb8f..c73d033711 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/selector/XpathPayloadMessageSelector.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/message/selector/XpathPayloadMessageSelector.java
@@ -35,7 +35,6 @@
  *
  * Syntax is xpath://root/element
  *
- * @author Christoph Deppisch
  * @since 3.0
  */
 public class XpathPayloadMessageSelector extends AbstractMessageSelector {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/util/XMLUtils.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/util/XMLUtils.java
index d0ea170e44..d1effe81ec 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/util/XMLUtils.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/util/XMLUtils.java
@@ -41,7 +41,6 @@
 /**
  * Class providing several utility methods for XML processing.
  *
- * @author Jan Szczepanski, Christoph Deppisch
  * @since 2006
  *
  */
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/matcher/core/XmlValidationMatcher.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/matcher/core/XmlValidationMatcher.java
index b6caad966c..fccef38c3c 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/matcher/core/XmlValidationMatcher.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/matcher/core/XmlValidationMatcher.java
@@ -35,7 +35,6 @@
  * Validation matcher receives a XML data and validates it against expected XML with full
  * XML validation support (e.g. ignoring elements, namespace support, ...).
  *
- * @author Christoph Deppisch
  */
 public class XmlValidationMatcher implements ValidationMatcher {
 
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xhtml/XhtmlMessageConverter.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xhtml/XhtmlMessageConverter.java
index 81dfec2ae8..7d5df7c8a1 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xhtml/XhtmlMessageConverter.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xhtml/XhtmlMessageConverter.java
@@ -24,7 +24,6 @@
 import org.w3c.tidy.Tidy;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class XhtmlMessageConverter implements InitializingPhase {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xhtml/XhtmlMessageValidator.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xhtml/XhtmlMessageValidator.java
index 8af6c6cbcb..8915769aa1 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xhtml/XhtmlMessageValidator.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xhtml/XhtmlMessageValidator.java
@@ -30,7 +30,6 @@
  * XHTML message validator using W3C jtidy to automatically convert HTML content to XHTML fixing most common
  * well-formed errors in HTML markup.
  *
- * @author Christoph Deppisch
  */
 public class XhtmlMessageValidator extends DomXmlMessageValidator implements InitializingPhase {
 
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xhtml/XhtmlXpathMessageValidator.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xhtml/XhtmlXpathMessageValidator.java
index 60c2fc41cd..3dc6fb0dc9 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xhtml/XhtmlXpathMessageValidator.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xhtml/XhtmlXpathMessageValidator.java
@@ -27,7 +27,6 @@
 import org.citrusframework.validation.xml.XpathMessageValidator;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class XhtmlXpathMessageValidator extends XpathMessageValidator implements InitializingPhase {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/DomXmlMessageValidator.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/DomXmlMessageValidator.java
index 10f31be15e..ef4b93c803 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/DomXmlMessageValidator.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/DomXmlMessageValidator.java
@@ -54,7 +54,6 @@
  * Default message validator implementation. Working on XML messages
  * providing message payload, header and namespace validation.
  *
- * @author Christoph Deppisch
  * @since 2007
  */
 public class DomXmlMessageValidator extends AbstractMessageValidator<XmlMessageValidationContext> {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XmlMarshallingValidationProcessor.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XmlMarshallingValidationProcessor.java
index 33c6fe208c..609ab9a5b9 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XmlMarshallingValidationProcessor.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XmlMarshallingValidationProcessor.java
@@ -39,7 +39,6 @@
  * Validation callback automatically unmarshalling message payload so we work with
  * Java objects for validation.
  *
- * @author Christoph Deppisch
  */
 public abstract class XmlMarshallingValidationProcessor<T> extends AbstractValidationProcessor<T> {
 
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XmlValidationUtils.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XmlValidationUtils.java
index 7d0673bf63..cbc9f73fff 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XmlValidationUtils.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XmlValidationUtils.java
@@ -29,7 +29,6 @@
 import org.w3c.dom.NodeList;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public abstract class XmlValidationUtils {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XpathMessageProcessor.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XpathMessageProcessor.java
index 86d78f6a5a..032ba6e724 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XpathMessageProcessor.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XpathMessageProcessor.java
@@ -41,7 +41,6 @@
  * Processor implementation evaluating XPath expressions on message payload during message construction.
  * Class identifies XML elements inside the message payload via XPath expressions in order to overwrite their value.
  *
- * @author Christoph Deppisch
  */
 public class XpathMessageProcessor extends AbstractMessageProcessor {
 
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XpathMessageValidator.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XpathMessageValidator.java
index 69d1078418..d2b6117fe4 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XpathMessageValidator.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XpathMessageValidator.java
@@ -42,7 +42,6 @@
 
 /**
  * Message validator evaluates set of XPath expressions on message payload and checks that values are as expected.
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class XpathMessageValidator extends AbstractMessageValidator<XpathMessageValidationContext> {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XpathPayloadVariableExtractor.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XpathPayloadVariableExtractor.java
index 07b4dfff07..51aa965916 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XpathPayloadVariableExtractor.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/validation/xml/XpathPayloadVariableExtractor.java
@@ -47,7 +47,6 @@
  * Class reads message elements via XPath expressions and saves the text values as new test variables.
  * Implementation parsed the message payload as DOM document, so XML message payload is needed here.
  *
- * @author Christoph Deppisch
  */
 public class XpathPayloadVariableExtractor implements VariableExtractor {
     /** Logger */
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/AbstractXmlDataDictionary.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/AbstractXmlDataDictionary.java
index a1f63ce925..18bbdd3ea7 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/AbstractXmlDataDictionary.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/AbstractXmlDataDictionary.java
@@ -40,7 +40,6 @@
  * Abstract data dictionary works on XML message payloads only with parsing the document and translating each element
  * and attribute with respective value in dictionary.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public abstract class AbstractXmlDataDictionary extends AbstractDataDictionary<Node> {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/NodeMappingDataDictionary.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/NodeMappingDataDictionary.java
index c62d3e1fda..60a7145de7 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/NodeMappingDataDictionary.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/NodeMappingDataDictionary.java
@@ -30,7 +30,6 @@
  * Very basic data dictionary that holds a list of mappings for message elements. Mapping key is the element path inside
  * the XML structure {@link org.citrusframework.util.XMLUtils getNodesPathName()}. The mapping value is set as new element
  * value where test variables are supported in value expressions.
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class NodeMappingDataDictionary extends AbstractXmlDataDictionary implements InitializingPhase {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/XpathMappingDataDictionary.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/XpathMappingDataDictionary.java
index c2b6941f3c..3cad479ba0 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/XpathMappingDataDictionary.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/variable/dictionary/xml/XpathMappingDataDictionary.java
@@ -38,7 +38,6 @@
  * in dictionary value is overwritten accordingly. Namespace context is either evaluated on the fly or by global namespace
  * context builder.
  *
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class XpathMappingDataDictionary extends AbstractXmlDataDictionary implements InitializingPhase {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/LSResolverImpl.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/LSResolverImpl.java
index 7452b9a065..fde55457fa 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/LSResolverImpl.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/LSResolverImpl.java
@@ -25,7 +25,6 @@
 /**
  * Very basic LSResolver implementation for resolving dtd resources by their systemId.
  *
- * @author Christoph Deppisch
  */
 public class LSResolverImpl implements LSResourceResolver {
     /** DOM implementation */
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XmlConfigurer.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XmlConfigurer.java
index 6790d4bc43..34ddd57ff3 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XmlConfigurer.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XmlConfigurer.java
@@ -37,7 +37,6 @@
  * Class is loaded with Spring application context in Citrus. When loaded automatically initializes XML utilities
  * with this XML processing configuration. Configuration is pushed to XML utility classes after properties are set.
  *
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class XmlConfigurer implements InitializingPhase {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XmlFormattingMessageProcessor.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XmlFormattingMessageProcessor.java
index a9fc39d7f4..75f2994615 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XmlFormattingMessageProcessor.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XmlFormattingMessageProcessor.java
@@ -23,7 +23,6 @@
 import org.citrusframework.util.XMLUtils;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class XmlFormattingMessageProcessor extends AbstractMessageProcessor {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XpathSegmentVariableExtractor.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XpathSegmentVariableExtractor.java
index 0e0ee46a6b..f4c89365d5 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XpathSegmentVariableExtractor.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XpathSegmentVariableExtractor.java
@@ -34,9 +34,6 @@
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 
-/**
- * @author Thorsten Schlathoelter
- */
 public class XpathSegmentVariableExtractor extends SegmentVariableExtractorRegistry.AbstractSegmentVariableExtractor {
 
     /**
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XsdSchemaRepository.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XsdSchemaRepository.java
index e696c6316b..a8847e9995 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XsdSchemaRepository.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/XsdSchemaRepository.java
@@ -45,7 +45,6 @@
 /**
  * Schema repository holding a set of XML schema resources known in the test scope.
  *
- * @author Christoph Deppisch
  */
 @SuppressWarnings("unused")
 public class XsdSchemaRepository implements Named, InitializingPhase {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/AbstractSchemaCollection.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/AbstractSchemaCollection.java
index 915d9f6f38..923c5d4008 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/AbstractSchemaCollection.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/AbstractSchemaCollection.java
@@ -49,7 +49,6 @@
 import org.xml.sax.SAXException;
 
 /**
- * @author Christoph Deppisch
  * @since 2.4
  */
 public abstract class AbstractSchemaCollection extends SimpleXsdSchema implements InitializingPhase {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/AbstractSchemaMappingStrategy.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/AbstractSchemaMappingStrategy.java
index ba0ce2598c..77b6788fe6 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/AbstractSchemaMappingStrategy.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/AbstractSchemaMappingStrategy.java
@@ -24,7 +24,6 @@
  * Abstract schema mapping strategy extracts target namespace and root element name
  * for subclasses.
  *
- * @author Christoph Deppisch
  */
 public abstract class AbstractSchemaMappingStrategy implements XsdSchemaMappingStrategy {
 
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/RootQNameSchemaMappingStrategy.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/RootQNameSchemaMappingStrategy.java
index cd03a97c67..79c5678912 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/RootQNameSchemaMappingStrategy.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/RootQNameSchemaMappingStrategy.java
@@ -28,7 +28,6 @@
  * Mapping strategy uses the root element local name to find matching schema
  * instance.
  *
- * @author Christoph Deppisch
  */
 public class RootQNameSchemaMappingStrategy extends AbstractSchemaMappingStrategy {
 
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/SchemaMappingStrategyChain.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/SchemaMappingStrategyChain.java
index 9e9c1a8418..038a065080 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/SchemaMappingStrategyChain.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/SchemaMappingStrategyChain.java
@@ -25,7 +25,6 @@
  * Special schema mapping strategy delegating to several other strategies in
  * a mapping chain. The first mapping strategy finding a proper schema wins.
  *
- * @author Christoph Deppisch
  */
 public class SchemaMappingStrategyChain implements XsdSchemaMappingStrategy {
 
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategy.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategy.java
index 0c4db80a3a..80db87772f 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategy.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategy.java
@@ -26,7 +26,6 @@
  * Mapping strategy checks on target namespaces in schemas to find matching schema
  * instance.
  *
- * @author Christoph Deppisch
  */
 public class TargetNamespaceSchemaMappingStrategy extends AbstractSchemaMappingStrategy {
 
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/WsdlXsdSchema.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/WsdlXsdSchema.java
index 2beb24a679..5ca4625a6c 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/WsdlXsdSchema.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/WsdlXsdSchema.java
@@ -53,7 +53,6 @@
  * xsd schema instances for schema repository. WSDL may contain several schema types which get
  * exposed under a single target namespace (defined on WSDL level).
  *
- * @author Christoph Deppisch
  * @since 1.3
  */
 public class WsdlXsdSchema extends AbstractSchemaCollection {
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/XsdSchemaCollection.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/XsdSchemaCollection.java
index 18c1b226b4..a698f03863 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/XsdSchemaCollection.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/XsdSchemaCollection.java
@@ -32,7 +32,6 @@
  * Schema combines multiple file resources usually with exactly the same target namespace to
  * one single schema instance.
  *
- * @author Christoph Deppisch
  */
 public class XsdSchemaCollection extends AbstractSchemaCollection {
 
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/XsdSchemaMappingStrategy.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/XsdSchemaMappingStrategy.java
index 99760850d0..a07df060a3 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/XsdSchemaMappingStrategy.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/schema/XsdSchemaMappingStrategy.java
@@ -24,7 +24,6 @@
 /**
  * Interface for schema mapping strategies used in schema repository.
  *
- * @author Christoph Deppisch
  */
 public interface XsdSchemaMappingStrategy {
 
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/xpath/XPathExpressionResult.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/xpath/XPathExpressionResult.java
index 57d0fcc4aa..689d9f8825 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/xpath/XPathExpressionResult.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/xpath/XPathExpressionResult.java
@@ -30,7 +30,6 @@
  * The result type prefix is supposed to be stripped off before expression evaluation 
  * and determines the evaluation result.
  * 
- * @author Christoph Deppisch
  */
 public enum XPathExpressionResult {
     NODE, NODESET, STRING, BOOLEAN, NUMBER, INTEGER;
diff --git a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/xpath/XPathUtils.java b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/xpath/XPathUtils.java
index a92608b3bf..0f7c1e108e 100644
--- a/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/xpath/XPathUtils.java
+++ b/validation/citrus-validation-xml/src/main/java/org/citrusframework/xml/xpath/XPathUtils.java
@@ -44,7 +44,6 @@
  *
  * Class is abstract to prevent instantiation.
  *
- * @author Christoph Deppisch
  */
 public abstract class XPathUtils {
 
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/HeaderValuesTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/HeaderValuesTest.java
index eeda8d9ceb..c2ed62817b 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/HeaderValuesTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/HeaderValuesTest.java
@@ -40,9 +40,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class HeaderValuesTest extends UnitTestSupport {
     private Endpoint endpoint = Mockito.mock(Endpoint.class);
     private Consumer consumer = Mockito.mock(Consumer.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/IgnoreElementsLegacyTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/IgnoreElementsLegacyTest.java
index 2ec46acb7f..83fc588e11 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/IgnoreElementsLegacyTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/IgnoreElementsLegacyTest.java
@@ -40,9 +40,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class IgnoreElementsLegacyTest extends UnitTestSupport {
     private Endpoint endpoint = Mockito.mock(Endpoint.class);
     private Consumer consumer = Mockito.mock(Consumer.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/IgnoreElementsTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/IgnoreElementsTest.java
index 092037a680..fe0e871c2b 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/IgnoreElementsTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/IgnoreElementsTest.java
@@ -41,9 +41,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class IgnoreElementsTest extends UnitTestSupport {
     private Endpoint endpoint = Mockito.mock(Endpoint.class);
     private Consumer consumer = Mockito.mock(Consumer.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/MessageElementsLegacyTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/MessageElementsLegacyTest.java
index b1a869f023..d0c8ca2025 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/MessageElementsLegacyTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/MessageElementsLegacyTest.java
@@ -43,9 +43,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageElementsLegacyTest extends UnitTestSupport {
     @Mock
     private Endpoint endpoint;
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/MessageElementsTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/MessageElementsTest.java
index f151038585..c23ca52d14 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/MessageElementsTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/MessageElementsTest.java
@@ -43,9 +43,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageElementsTest extends UnitTestSupport {
     @Mock
     private Endpoint endpoint;
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/NamespaceTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/NamespaceTest.java
index 927c451d33..b79ca3975e 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/NamespaceTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/NamespaceTest.java
@@ -40,9 +40,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class NamespaceTest extends UnitTestSupport {
     private final Endpoint endpoint = Mockito.mock(Endpoint.class);
     private final Consumer consumer = Mockito.mock(Consumer.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/UnitTestSupport.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/UnitTestSupport.java
index cb8d0f631a..22ea111caf 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/UnitTestSupport.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/UnitTestSupport.java
@@ -33,9 +33,6 @@
 import org.citrusframework.validation.xml.XpathMessageValidator;
 import org.testng.Assert;
 
-/**
- * @author Christoph Deppisch
- */
 public abstract class UnitTestSupport extends AbstractTestNGUnitTest {
 
     @Override
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/ValidationTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/ValidationTest.java
index bbc83c310f..3bf2df5dd5 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/ValidationTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/ValidationTest.java
@@ -34,9 +34,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class ValidationTest extends UnitTestSupport {
     private Endpoint endpoint = Mockito.mock(Endpoint.class);
     private Consumer consumer = Mockito.mock(Consumer.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/VariableSupportTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/VariableSupportTest.java
index c679199701..eadbf8a794 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/VariableSupportTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/VariableSupportTest.java
@@ -41,9 +41,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class VariableSupportTest extends UnitTestSupport {
     private Endpoint endpoint = Mockito.mock(Endpoint.class);
     private Consumer consumer = Mockito.mock(Consumer.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/XPathTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/XPathTest.java
index 138377eaf0..9bb51602ae 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/XPathTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/XPathTest.java
@@ -39,9 +39,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class XPathTest extends UnitTestSupport {
     private Endpoint endpoint = Mockito.mock(Endpoint.class);
     private Consumer consumer = Mockito.mock(Consumer.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java
index f6ccad9fc4..a862c98ceb 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/actions/dsl/ReceiveMessageActionBuilderTest.java
@@ -75,9 +75,6 @@
 import static org.citrusframework.dsl.XpathSupport.xpath;
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageActionBuilderTest extends UnitTestSupport {
 
     @Mock
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java
index b5288f3c3b..8f5668a2de 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/actions/dsl/SendMessageActionBuilderTest.java
@@ -51,9 +51,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendMessageActionBuilderTest extends UnitTestSupport {
 
     @Mock
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/actions/dsl/TestRequest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/actions/dsl/TestRequest.java
index a4182b36c3..9570e68986 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/actions/dsl/TestRequest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/actions/dsl/TestRequest.java
@@ -25,7 +25,6 @@
 /**
  * Sample model object marshalled to message payload.
  *
- * @author Christoph Deppisch
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/SchemaCollectionParserTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/SchemaCollectionParserTest.java
index 0cba1c0857..ac7e84d458 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/SchemaCollectionParserTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/SchemaCollectionParserTest.java
@@ -23,9 +23,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class SchemaCollectionParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/XmlDataDictionaryParserTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/XmlDataDictionaryParserTest.java
index 9cbf2ff1a1..323bfd4bf8 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/XmlDataDictionaryParserTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/XmlDataDictionaryParserTest.java
@@ -26,7 +26,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class XmlDataDictionaryParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/XpathDataDictionaryParserTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/XpathDataDictionaryParserTest.java
index 421f0117ad..95ef548d27 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/XpathDataDictionaryParserTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/XpathDataDictionaryParserTest.java
@@ -26,7 +26,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.0
  */
 public class XpathDataDictionaryParserTest extends AbstractBeanDefinitionParserTest {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/XsdSchemaRepositoryParserTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/XsdSchemaRepositoryParserTest.java
index 0e86c1e7c0..a82168f47d 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/XsdSchemaRepositoryParserTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/config/xml/XsdSchemaRepositoryParserTest.java
@@ -28,9 +28,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class XsdSchemaRepositoryParserTest extends AbstractBeanDefinitionParserTest {
 
     @Test
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/endpoint/adapter/TestBehaviorExecutingEndpointAdapterTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/endpoint/adapter/TestBehaviorExecutingEndpointAdapterTest.java
index 293eefaa73..7279196e1e 100755
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/endpoint/adapter/TestBehaviorExecutingEndpointAdapterTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/endpoint/adapter/TestBehaviorExecutingEndpointAdapterTest.java
@@ -37,7 +37,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.3.1
  */
 @ContextConfiguration(classes = { CitrusSpringConfig.class, TestBehaviorExecutingEndpointAdapterTest.EndpointConfig.class })
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/endpoint/adapter/XmlTestExecutingEndpointAdapterTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/endpoint/adapter/XmlTestExecutingEndpointAdapterTest.java
index d4b9ae5998..b0dccb3d9d 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/endpoint/adapter/XmlTestExecutingEndpointAdapterTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/endpoint/adapter/XmlTestExecutingEndpointAdapterTest.java
@@ -45,7 +45,6 @@
 import static org.mockito.Mockito.when;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 @ContextConfiguration(classes = { CitrusSpringConfig.class, XmlTestExecutingEndpointAdapterTest.EndpointConfig.class })
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/endpoint/adapter/mapping/XPathPayloadMappingKeyExtractorTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/endpoint/adapter/mapping/XPathPayloadMappingKeyExtractorTest.java
index 29e886419b..64e4912412 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/endpoint/adapter/mapping/XPathPayloadMappingKeyExtractorTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/endpoint/adapter/mapping/XPathPayloadMappingKeyExtractorTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class XPathPayloadMappingKeyExtractorTest {
 
     @Test
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/functions/core/CreateCDataSectionFunctionTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/functions/core/CreateCDataSectionFunctionTest.java
index 1b42fafe70..c09a90e9d8 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/functions/core/CreateCDataSectionFunctionTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/functions/core/CreateCDataSectionFunctionTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class CreateCDataSectionFunctionTest extends AbstractTestNGUnitTest {
     CreateCDataSectionFunction function = new CreateCDataSectionFunction();
 
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/functions/core/EscapeXmlFunctionTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/functions/core/EscapeXmlFunctionTest.java
index 8d1949c671..c8a5159ed3 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/functions/core/EscapeXmlFunctionTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/functions/core/EscapeXmlFunctionTest.java
@@ -25,9 +25,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class EscapeXmlFunctionTest extends AbstractTestNGUnitTest {
     EscapeXmlFunction function = new EscapeXmlFunction();
 
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/functions/core/XpathFunctionTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/functions/core/XpathFunctionTest.java
index 28ae59ebd8..360a618df0 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/functions/core/XpathFunctionTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/functions/core/XpathFunctionTest.java
@@ -27,7 +27,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6
  */
 public class XpathFunctionTest extends AbstractTestNGUnitTest {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/DataDictionaryIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/DataDictionaryIT.java
index 0d46f21769..d048e6e64b 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/DataDictionaryIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/DataDictionaryIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class DataDictionaryIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java
index a1de285b45..fe79f01781 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/HamcrestValidationMatcherIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.5
  */
 public class HamcrestValidationMatcherIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/InlineVariablesIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/InlineVariablesIT.java
index eef5a323b2..eeb8f17d94 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/InlineVariablesIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/InlineVariablesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class InlineVariablesIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/MessageValidationIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/MessageValidationIT.java
index 34556ffab3..f566bd7195 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/MessageValidationIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/MessageValidationIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageValidationIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ScriptVariablesIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ScriptVariablesIT.java
index aa5e7b09dd..a59ee87c97 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ScriptVariablesIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ScriptVariablesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Jan Lipphaus
  * @since 2010
  */
 public class ScriptVariablesIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseVariablesIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseVariablesIT.java
index f2a7113975..616ddddbb1 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseVariablesIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseVariablesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class UseVariablesIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseXPathVariablesIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseXPathVariablesIT.java
index 0bc25d81cb..379d6cd163 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseXPathVariablesIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/UseXPathVariablesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class UseXPathVariablesIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateNamespacesIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateNamespacesIT.java
index 944a8eadc2..d73ac4cd21 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateNamespacesIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateNamespacesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2010
  */
 public class ValidateNamespacesIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateNamespacesJavaIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateNamespacesJavaIT.java
index 65fa2ae8e2..ebc5b67cbb 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateNamespacesJavaIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateNamespacesJavaIT.java
@@ -27,9 +27,6 @@
 import static org.citrusframework.container.Assert.Builder.assertException;
 import static org.citrusframework.dsl.XmlSupport.xml;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class ValidateNamespacesJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesIT.java
index 1ba44dde2a..af5f583cfa 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class ValidateValuesIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesWithNamespaceIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesWithNamespaceIT.java
index 644847d299..400de38dbd 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesWithNamespaceIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateValuesWithNamespaceIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class ValidateValuesWithNamespaceIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXMLDataIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXMLDataIT.java
index 78b281a636..8213bb9376 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXMLDataIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXMLDataIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class ValidateXMLDataIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXMLDataJavaIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXMLDataJavaIT.java
index 0e277dc699..fbee4ccbe2 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXMLDataJavaIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXMLDataJavaIT.java
@@ -24,9 +24,6 @@
 import static org.citrusframework.actions.SendMessageAction.Builder.send;
 import static org.citrusframework.dsl.XmlSupport.xml;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class ValidateXMLDataJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXmlCombinedIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXmlCombinedIT.java
index 8c98132781..af65bb583f 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXmlCombinedIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXmlCombinedIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2010
  */
 public class ValidateXmlCombinedIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXpathJavaIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXpathJavaIT.java
index ef0f9b1f75..86d86e2ba2 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXpathJavaIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/ValidateXpathJavaIT.java
@@ -32,9 +32,6 @@
 import static org.citrusframework.dsl.XmlSupport.xml;
 import static org.citrusframework.dsl.XpathSupport.xpath;
 
-/**
- * @author Christoph Deppisch
- */
 @Test
 public class ValidateXpathJavaIT extends TestNGCitrusSpringSupport {
 
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/XMLValidationMatcherIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/XMLValidationMatcherIT.java
index 08d3eff81c..0261c3f958 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/XMLValidationMatcherIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/XMLValidationMatcherIT.java
@@ -22,7 +22,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2008
  */
 public class XMLValidationMatcherIT extends TestNGCitrusSpringSupport {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/functions/XmlFunctionsIT.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/functions/XmlFunctionsIT.java
index 87e049e646..9900bfdb0b 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/functions/XmlFunctionsIT.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/integration/functions/XmlFunctionsIT.java
@@ -21,9 +21,6 @@
 import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class XmlFunctionsIT extends TestNGCitrusSpringSupport {
     @Test
     @CitrusTestSource(type = TestLoader.SPRING)
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/builder/MarshallingHeaderDataBuilderTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/builder/MarshallingHeaderDataBuilderTest.java
index 785d6ff2ad..a4202a131c 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/builder/MarshallingHeaderDataBuilderTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/builder/MarshallingHeaderDataBuilderTest.java
@@ -30,9 +30,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class MarshallingHeaderDataBuilderTest extends UnitTestSupport {
 
     private final Marshaller marshaller = new Jaxb2Marshaller(TestRequest.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/builder/MarshallingPayloadBuilderTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/builder/MarshallingPayloadBuilderTest.java
index 2fc39e5cfa..7ed7d88c7e 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/builder/MarshallingPayloadBuilderTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/builder/MarshallingPayloadBuilderTest.java
@@ -30,9 +30,6 @@
 
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class MarshallingPayloadBuilderTest extends UnitTestSupport {
 
     private final Marshaller marshaller = new Jaxb2Marshaller(TestRequest.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/selector/DelegatingMessageSelectorTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/selector/DelegatingMessageSelectorTest.java
index 99b3b22726..f6a2950a2b 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/selector/DelegatingMessageSelectorTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/selector/DelegatingMessageSelectorTest.java
@@ -27,9 +27,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class DelegatingMessageSelectorTest extends UnitTestSupport {
 
     private ReferenceResolver resolver = Mockito.mock(ReferenceResolver.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/selector/RootQNameMessageSelectorTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/selector/RootQNameMessageSelectorTest.java
index 6a0ec6c05b..94f314edf1 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/selector/RootQNameMessageSelectorTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/selector/RootQNameMessageSelectorTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class RootQNameMessageSelectorTest extends UnitTestSupport {
 
     @Test
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/selector/XpathPayloadMessageSelectorTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/selector/XpathPayloadMessageSelectorTest.java
index 3c1554c128..bff7c28322 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/selector/XpathPayloadMessageSelectorTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/message/selector/XpathPayloadMessageSelectorTest.java
@@ -21,9 +21,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class XpathPayloadMessageSelectorTest extends UnitTestSupport {
 
     @Test
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/util/XMLUtilsTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/util/XMLUtilsTest.java
index 08a94d3dae..9a91890168 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/util/XMLUtilsTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/util/XMLUtilsTest.java
@@ -35,9 +35,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class XMLUtilsTest {
 
     @Test
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/DTDValidationTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/DTDValidationTest.java
index 4c4c1e119a..7fbef53e1e 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/DTDValidationTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/DTDValidationTest.java
@@ -36,9 +36,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class DTDValidationTest extends UnitTestSupport {
     private Endpoint endpoint = Mockito.mock(Endpoint.class);
     private Consumer consumer = Mockito.mock(Consumer.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/MessageValidatorTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
index 1e5c83d841..85d9da3823 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/MessageValidatorTest.java
@@ -26,9 +26,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class MessageValidatorTest {
 
     @Test
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xhtml/XhtmlMessageValidatorTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xhtml/XhtmlMessageValidatorTest.java
index fc8c00f395..0d100715ea 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xhtml/XhtmlMessageValidatorTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xhtml/XhtmlMessageValidatorTest.java
@@ -37,9 +37,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class XhtmlMessageValidatorTest extends UnitTestSupport {
     @Mock
     private Endpoint endpoint;
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xhtml/XhtmlXpathMessageValidatorTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xhtml/XhtmlXpathMessageValidatorTest.java
index bb7065eba9..f7ebaa1380 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xhtml/XhtmlXpathMessageValidatorTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xhtml/XhtmlXpathMessageValidatorTest.java
@@ -39,9 +39,6 @@
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.when;
 
-/**
- * @author Christoph Deppisch
- */
 public class XhtmlXpathMessageValidatorTest extends UnitTestSupport {
     @Mock
     private Endpoint endpoint;
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/DomXmlMessageValidatorTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/DomXmlMessageValidatorTest.java
index f82d0671b7..d230745591 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/DomXmlMessageValidatorTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/DomXmlMessageValidatorTest.java
@@ -55,9 +55,6 @@
 import static org.testng.AssertJUnit.assertNotNull;
 import static org.testng.AssertJUnit.assertTrue;
 
-/**
- * @author Christoph Deppisch
- */
 public class DomXmlMessageValidatorTest extends UnitTestSupport {
 
     private final DomXmlMessageValidator validator = new DomXmlMessageValidator();
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/ReceiveMessageActionTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/ReceiveMessageActionTest.java
index 4727e37db1..20e47c87db 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/ReceiveMessageActionTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/ReceiveMessageActionTest.java
@@ -51,9 +51,6 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.openMocks;
 
-/**
- * @author Christoph Deppisch
- */
 public class ReceiveMessageActionTest extends AbstractTestNGUnitTest {
 
     @Mock
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/SendMessageActionTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/SendMessageActionTest.java
index 86ac52969d..a5da64c31b 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/SendMessageActionTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/SendMessageActionTest.java
@@ -39,9 +39,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class SendMessageActionTest extends AbstractTestNGUnitTest {
 
     private Endpoint endpoint = mock(Endpoint.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/XpathMessageProcessorTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/XpathMessageProcessorTest.java
index 4595c97c0f..2cbb3db0fa 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/XpathMessageProcessorTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/XpathMessageProcessorTest.java
@@ -27,9 +27,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-/**
- * @author Christoph Deppisch
- */
 public class XpathMessageProcessorTest extends AbstractTestNGUnitTest {
 
     private final Message message = new DefaultMessage("<?xml version=\"1.0\" encoding=\"UTF-8\"?><TestMessage><Text>Hello World!</Text></TestMessage>");
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/XpathMessageValidatorTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/XpathMessageValidatorTest.java
index 30b66dbc5d..822a2dda2e 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/XpathMessageValidatorTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/validation/xml/XpathMessageValidatorTest.java
@@ -40,7 +40,6 @@
 import static org.hamcrest.Matchers.not;
 
 /**
- * @author Christoph Deppisch
  * @since 2.3
  */
 public class XpathMessageValidatorTest extends UnitTestSupport {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/variable/dictionary/xml/NodeMappingDataDictionaryTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/variable/dictionary/xml/NodeMappingDataDictionaryTest.java
index c06f3dc6a1..46ed77f0b8 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/variable/dictionary/xml/NodeMappingDataDictionaryTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/variable/dictionary/xml/NodeMappingDataDictionaryTest.java
@@ -28,7 +28,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class NodeMappingDataDictionaryTest extends UnitTestSupport {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/variable/dictionary/xml/XpathMappingDataDictionaryTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/variable/dictionary/xml/XpathMappingDataDictionaryTest.java
index 13447f9b94..d59a074ad1 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/variable/dictionary/xml/XpathMappingDataDictionaryTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/variable/dictionary/xml/XpathMappingDataDictionaryTest.java
@@ -30,7 +30,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 1.4
  */
 public class XpathMappingDataDictionaryTest extends AbstractTestNGUnitTest {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/XmlFormattingMessageProcessorTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/XmlFormattingMessageProcessorTest.java
index 9c80dc8a31..65268cc835 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/XmlFormattingMessageProcessorTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/XmlFormattingMessageProcessorTest.java
@@ -24,7 +24,6 @@
 import org.testng.annotations.Test;
 
 /**
- * @author Christoph Deppisch
  * @since 2.6.2
  */
 public class XmlFormattingMessageProcessorTest extends AbstractTestNGUnitTest {
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/XsdSchemaRepositoryTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/XsdSchemaRepositoryTest.java
index 28f345841f..b144bae2b1 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/XsdSchemaRepositoryTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/XsdSchemaRepositoryTest.java
@@ -23,9 +23,6 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-/**
- * @author Christoph Deppisch
- */
 public class XsdSchemaRepositoryTest {
 
     @Test
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/RootQNameSchemaMappingStrategyTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/RootQNameSchemaMappingStrategyTest.java
index 85f14a6c84..b67a1f44eb 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/RootQNameSchemaMappingStrategyTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/RootQNameSchemaMappingStrategyTest.java
@@ -30,9 +30,6 @@
 import static org.mockito.Mockito.when;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class RootQNameSchemaMappingStrategyTest {
 
     private XsdSchema schemaMock = Mockito.mock(XsdSchema.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/SchemaMappingStrategyChainTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/SchemaMappingStrategyChainTest.java
index 5dbc782687..2d52438630 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/SchemaMappingStrategyChainTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/SchemaMappingStrategyChainTest.java
@@ -26,9 +26,6 @@
 
 import static org.mockito.Mockito.*;
 
-/**
- * @author Christoph Deppisch
- */
 public class SchemaMappingStrategyChainTest {
 
     private XsdSchema schemaMock = Mockito.mock(XsdSchema.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategyTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategyTest.java
index ea839df7c3..240f3ef7c1 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategyTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/TargetNamespaceSchemaMappingStrategyTest.java
@@ -26,9 +26,6 @@
 import static org.mockito.Mockito.*;
 
 
-/**
- * @author Christoph Deppisch
- */
 public class TargetNamespaceSchemaMappingStrategyTest {
     
     private XsdSchema schemaMock = Mockito.mock(XsdSchema.class);
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/WsdlXsdSchemaTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/WsdlXsdSchemaTest.java
index 52fe62badb..eb6249874f 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/WsdlXsdSchemaTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/schema/WsdlXsdSchemaTest.java
@@ -28,9 +28,6 @@
 import org.testng.annotations.Test;
 import org.xml.sax.SAXException;
 
-/**
- * @author Christoph Deppisch
- */
 public class WsdlXsdSchemaTest {
 
     @Test
diff --git a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/xpath/XPathUtilsTest.java b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/xpath/XPathUtilsTest.java
index 2f9899af22..b51597e6cb 100644
--- a/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/xpath/XPathUtilsTest.java
+++ b/validation/citrus-validation-xml/src/test/java/org/citrusframework/xml/xpath/XPathUtilsTest.java
@@ -28,9 +28,6 @@
 import org.testng.annotations.Test;
 import org.w3c.dom.Document;
 
-/**
- * @author Christoph Deppisch
- */
 public class XPathUtilsTest {
 
     @Test