diff --git a/examples/hawkbit-example-ddi-client/pom.xml b/examples/hawkbit-example-ddi-client/pom.xml
index 661d59f8f..88e262d79 100644
--- a/examples/hawkbit-example-ddi-client/pom.xml
+++ b/examples/hawkbit-example-ddi-client/pom.xml
@@ -79,7 +79,6 @@
       <dependency>
          <groupId>commons-lang</groupId>
          <artifactId>commons-lang</artifactId>
-         <version>2.3</version>
       </dependency>
 
       <!-- Test -->
diff --git a/examples/hawkbit-example-ddi-client/src/main/java/org/eclipse/hawkbit/ddi/client/resource/RootControllerResourceClientConstants.java b/examples/hawkbit-example-ddi-client/src/main/java/org/eclipse/hawkbit/ddi/client/resource/RootControllerResourceClientConstants.java
index d902c2da0..0611c4a09 100644
--- a/examples/hawkbit-example-ddi-client/src/main/java/org/eclipse/hawkbit/ddi/client/resource/RootControllerResourceClientConstants.java
+++ b/examples/hawkbit-example-ddi-client/src/main/java/org/eclipse/hawkbit/ddi/client/resource/RootControllerResourceClientConstants.java
@@ -12,7 +12,7 @@ public class RootControllerResourceClientConstants {
     public static final String PATH = "{tenant}/controller/v1";
 
     /**
-     * Default constructor.
+     * Private constructor to prevent instantiation.
      */
     private RootControllerResourceClientConstants() {
 
diff --git a/examples/hawkbit-example-ddi-client/src/test/java/org/eclipse/hawkbit/example/ddi/client/AppTest.java b/examples/hawkbit-example-ddi-client/src/test/java/org/eclipse/hawkbit/example/ddi/client/AppTest.java
index 13eaa66d3..92bd7c75b 100644
--- a/examples/hawkbit-example-ddi-client/src/test/java/org/eclipse/hawkbit/example/ddi/client/AppTest.java
+++ b/examples/hawkbit-example-ddi-client/src/test/java/org/eclipse/hawkbit/example/ddi/client/AppTest.java
@@ -11,7 +11,7 @@ public class AppTest {
 
     @Test
     public void AppTest() {
-        final DdiExampleClient ddiClient = new DdiExampleClient("http://localhost:8080/", "Einstein17", "DEFAULT",
+        final DdiExampleClient ddiClient = new DdiExampleClient("http://localhost:8080/", "Einstein21", "DEFAULT",
                 new SaveArtifactsToLocalTempDirectories());
         final Thread thread = new Thread(ddiClient);
         thread.run();
diff --git a/pom.xml b/pom.xml
index a95832c79..69a49a042 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,7 @@
       <jlorem.version>1.1</jlorem.version>
       <json-simple.version>1.1.1</json-simple.version>
       <commons-lang3.version>3.4</commons-lang3.version>
+      <commons.lang>2.3</commons.lang>
       <json.version>20141113</json.version>
       <rsql-parser.version>2.0.0</rsql-parser.version>
       <!-- Misc libraries versions - END -->
@@ -552,13 +553,16 @@
                </exclusion>
             </exclusions>
          </dependency>
-         
           <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
          </dependency>
-         
+         <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>${commons.lang}</version>
+         </dependency>
          <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>