From 9fc22c08fa186c9d14e0d92909865e9f6637d2c9 Mon Sep 17 00:00:00 2001
From: Dan Albu <dan.albu@microfocus.com>
Date: Fri, 24 Sep 2021 15:49:56 +0300
Subject: [PATCH] Fix source/javadoc generation after version upgrades

---
 cloudslang-all/pom.xml                    |  8 ++++++++
 cloudslang-api-commons/pom.xml            |  8 ++++++++
 cloudslang-cli/pom.xml                    |  8 ++++++++
 cloudslang-commons/pom.xml                | 10 +++++++++-
 cloudslang-compiler/pom.xml               |  8 ++++++++
 cloudslang-content-maven-compiler/pom.xml |  8 ++++++++
 cloudslang-content-verifier/pom.xml       |  9 +++++++++
 cloudslang-enforcer/pom.xml               |  8 ++++++++
 cloudslang-entities/pom.xml               |  8 ++++++++
 cloudslang-runtime/pom.xml                |  8 ++++++++
 cloudslang-spi/pom.xml                    |  8 ++++++++
 cloudslang-tests/pom.xml                  |  8 ++++++++
 pom.xml                                   |  2 ++
 13 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/cloudslang-all/pom.xml b/cloudslang-all/pom.xml
index 31816ff777..2ae04e1c69 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 b0e97553f2..b60db76735 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 ad04fe4dac..1966f2fb54 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 ac982547c8..939dacb0ac 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 d87e74ed9f..30ebf80f75 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 d7032289a2..5be0fca88f 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 f48dd9b0fe..69fa036904 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 323c66f16d..acf180934a 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 a8d077e5ce..c20db9631e 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 daba8cce18..f70c297a01 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 e6aa40d1f0..0526738796 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 10b887156b..588a87be4f 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 34ead1a1de..41f769556d 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>