diff --git a/cloudslang-all/pom.xml b/cloudslang-all/pom.xml
index bb74b060c7..887bec1778 100644
--- a/cloudslang-all/pom.xml
+++ b/cloudslang-all/pom.xml
@@ -129,7 +129,15 @@ http://www.apache.org/licenses/LICENSE-2.0
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
 
         </plugins>
     </build>
diff --git a/cloudslang-api-commons/pom.xml b/cloudslang-api-commons/pom.xml
index f1c9b25a68..505fe16828 100644
--- a/cloudslang-api-commons/pom.xml
+++ b/cloudslang-api-commons/pom.xml
@@ -121,7 +121,15 @@
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/cloudslang-cli/pom.xml b/cloudslang-cli/pom.xml
index 6e6522eea1..a8d8335853 100644
--- a/cloudslang-cli/pom.xml
+++ b/cloudslang-cli/pom.xml
@@ -358,7 +358,15 @@
                 <artifactId>dependency-check-maven</artifactId>
                 <version>3.0.0</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/cloudslang-commons/pom.xml b/cloudslang-commons/pom.xml
index 4453cceabd..d50018e9b5 100644
--- a/cloudslang-commons/pom.xml
+++ b/cloudslang-commons/pom.xml
@@ -88,7 +88,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -97,6 +96,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/cloudslang-compiler/pom.xml b/cloudslang-compiler/pom.xml
index c207d6cea4..0ca8862c3e 100644
--- a/cloudslang-compiler/pom.xml
+++ b/cloudslang-compiler/pom.xml
@@ -195,7 +195,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/cloudslang-content-maven-compiler/pom.xml b/cloudslang-content-maven-compiler/pom.xml
index 65ec1ff659..fe4394a8f2 100644
--- a/cloudslang-content-maven-compiler/pom.xml
+++ b/cloudslang-content-maven-compiler/pom.xml
@@ -138,7 +138,15 @@
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/cloudslang-content-verifier/pom.xml b/cloudslang-content-verifier/pom.xml
index eafe196f66..40740c8881 100644
--- a/cloudslang-content-verifier/pom.xml
+++ b/cloudslang-content-verifier/pom.xml
@@ -296,6 +296,15 @@
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/cloudslang-enforcer/pom.xml b/cloudslang-enforcer/pom.xml
index 6f58c9d9a7..af3265dde9 100644
--- a/cloudslang-enforcer/pom.xml
+++ b/cloudslang-enforcer/pom.xml
@@ -60,7 +60,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/cloudslang-entities/pom.xml b/cloudslang-entities/pom.xml
index c8f038370f..f99561d57f 100644
--- a/cloudslang-entities/pom.xml
+++ b/cloudslang-entities/pom.xml
@@ -181,7 +181,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/cloudslang-runtime/pom.xml b/cloudslang-runtime/pom.xml
index 44465feee0..9795f68b9c 100644
--- a/cloudslang-runtime/pom.xml
+++ b/cloudslang-runtime/pom.xml
@@ -199,7 +199,15 @@
                 <groupId>org.owasp</groupId>
                 <artifactId>dependency-check-maven</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/cloudslang-spi/pom.xml b/cloudslang-spi/pom.xml
index a893d6d237..3ce32926b2 100644
--- a/cloudslang-spi/pom.xml
+++ b/cloudslang-spi/pom.xml
@@ -88,7 +88,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/cloudslang-tests/pom.xml b/cloudslang-tests/pom.xml
index 127bf2b11e..b2ee766612 100644
--- a/cloudslang-tests/pom.xml
+++ b/cloudslang-tests/pom.xml
@@ -128,7 +128,15 @@
                     <configLocation>${project.parent.basedir}/google-checkstyle-rules.xml</configLocation>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/pom.xml b/pom.xml
index 2945c29f5d..75082f7283 100644
--- a/pom.xml
+++ b/pom.xml
@@ -535,6 +535,7 @@
                     <executions>
                         <execution>
                             <id>attach-javadocs</id>
+                            <phase>package</phase>
                             <goals>
                                 <goal>jar</goal>
                             </goals>
@@ -552,6 +553,7 @@
                     <executions>
                         <execution>
                             <id>attach-sources</id>
+                            <phase>package</phase>
                             <goals>
                                 <goal>jar-no-fork</goal>
                             </goals>