Merge "make sure maven plugins only run when we want"

11 files changed, 43 insertions, 25 deletions

diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/pom.xml b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/pom.xml
index 560cd87bee..a64dbc6eed 100644
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/pom.xml
+++ b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/pom.xml
@@ -106,4 +106,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml
index 8735f98804..5b3038fac7 100644
--- a/adapters/mso-catalog-db-adapter/pom.xml
+++ b/adapters/mso-catalog-db-adapter/pom.xml
@@ -39,6 +39,9 @@
         <executions>
           <execution>
             <id>extract-docker-file</id>
+            <configuration>
+              <skip>false</skip>
+            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/adapters/mso-openstack-adapters/pom.xml b/adapters/mso-openstack-adapters/pom.xml
index 53af40ca4b..933077b59a 100644
--- a/adapters/mso-openstack-adapters/pom.xml
+++ b/adapters/mso-openstack-adapters/pom.xml
@@ -18,10 +18,6 @@
 
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-      </plugin>
-      <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
         <configuration>
@@ -135,6 +131,9 @@
         <executions>
           <execution>
             <id>extract-docker-file</id>
+            <configuration>
+              <skip>false</skip>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -153,9 +152,7 @@
         <executions>
           <execution>
             <id>original</id>
-            <configuration>
-              <skip>false</skip>
-            </configuration>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>
diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml
index f9026d82c8..3463642382 100644
--- a/adapters/mso-requests-db-adapter/pom.xml
+++ b/adapters/mso-requests-db-adapter/pom.xml
@@ -169,9 +169,7 @@
         <executions>
           <execution>
             <id>original</id>
-            <configuration>
-              <skip>false</skip>
-            </configuration>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>
@@ -181,6 +179,9 @@
         <executions>
           <execution>
             <id>extract-docker-file</id>
+            <configuration>
+              <skip>false</skip>
+            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml
index f54c2ec568..3b76c23ae6 100644
--- a/adapters/mso-sdnc-adapter/pom.xml
+++ b/adapters/mso-sdnc-adapter/pom.xml
@@ -70,9 +70,7 @@
         <executions>
           <execution>
             <id>original</id>
-            <configuration>
-              <skip>false</skip>
-            </configuration>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>
@@ -86,6 +84,9 @@
         <executions>
           <execution>
             <id>extract-docker-file</id>
+            <configuration>
+              <skip>false</skip>
+            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/adapters/so-appc-orchestrator/pom.xml b/adapters/so-appc-orchestrator/pom.xml
index f8d8fabcf7..f7fc0bca4e 100644
--- a/adapters/so-appc-orchestrator/pom.xml
+++ b/adapters/so-appc-orchestrator/pom.xml
@@ -40,6 +40,9 @@
         <executions>
           <execution>
             <id>extract-docker-file</id>
+            <configuration>
+              <skip>false</skip>
+            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml
index e7e95481aa..e4c50d36f9 100644
--- a/asdc-controller/pom.xml
+++ b/asdc-controller/pom.xml
@@ -148,6 +148,9 @@
         <executions>
           <execution>
             <id>extract-docker-file</id>
+            <configuration>
+              <skip>false</skip>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -166,9 +169,7 @@
         <executions>
           <execution>
             <id>original</id>
-            <configuration>
-              <skip>false</skip>
-            </configuration>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>
diff --git a/bpmn/mso-infrastructure-bpmn/pom.xml b/bpmn/mso-infrastructure-bpmn/pom.xml
index a3d0dd50b3..7d88271343 100644
--- a/bpmn/mso-infrastructure-bpmn/pom.xml
+++ b/bpmn/mso-infrastructure-bpmn/pom.xml
@@ -131,9 +131,7 @@
           </execution>
           <execution>
             <id>original</id>
-            <configuration>
-              <skip>false</skip>
-            </configuration>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>
@@ -158,6 +156,9 @@
         <executions>
           <execution>
             <id>extract-docker-file</id>
+            <configuration>
+              <skip>false</skip>
+            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/mso-api-handlers/mso-api-handler-infra/pom.xml b/mso-api-handlers/mso-api-handler-infra/pom.xml
index 7d6bbc4fc4..7e891f1e33 100644
--- a/mso-api-handlers/mso-api-handler-infra/pom.xml
+++ b/mso-api-handlers/mso-api-handler-infra/pom.xml
@@ -311,6 +311,9 @@
         <executions>
           <execution>
             <id>extract-docker-file</id>
+            <configuration>
+              <skip>false</skip>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -320,9 +323,7 @@
         <executions>
           <execution>
             <id>original</id>
-            <configuration>
-              <skip>false</skip>
-            </configuration>
+            <phase>package</phase>
           </execution>
         </executions>
       </plugin>
diff --git a/pom.xml b/pom.xml
index 5e4cadc241..f19e3f2f1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -644,6 +644,7 @@
                 <goal>unpack</goal>
               </goals>
               <configuration>
+                <skip>true</skip>
                 <artifactItems>
                   <artifactItem>
                     <groupId>org.onap.so</groupId>
@@ -665,12 +666,11 @@
           <executions>
             <execution>
               <id>original</id>
-              <phase>package</phase>
+              <phase>none</phase>
               <goals>
                 <goal>jar</goal>
               </goals>
               <configuration>
-                <skip>true</skip>
                 <classifier>${originalClassifier}</classifier>
                 <includes>
                   <include>**</include>
diff --git a/so-simulator/pom.xml b/so-simulator/pom.xml
index a92664afb8..006a6fae1a 100644
--- a/so-simulator/pom.xml
+++ b/so-simulator/pom.xml
@@ -105,6 +105,16 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>original</id>
+            <phase>package</phase>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>