From 272a9a96a2cbb389c2523b694a5f99e8ecf3e5e3 Mon Sep 17 00:00:00 2001
From: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Date: Thu, 20 Feb 2020 14:52:01 +0100
Subject: Plugins reorder

Shade plugin should run before docker image is built

Issue-ID: AAF-996
Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>
Change-Id: I212e029a8f8e1ca15fadc97232dce0205153c980
---
 certServiceClient/pom.xml | 40 ++++++++++++++++++++--------------------
 pom.xml                   |  1 +
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/certServiceClient/pom.xml b/certServiceClient/pom.xml
index f32501bf..bd51d73e 100644
--- a/certServiceClient/pom.xml
+++ b/certServiceClient/pom.xml
@@ -45,6 +45,26 @@
             </properties>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-shade-plugin</artifactId>
+                        <version>${maven-shade-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>shade</goal>
+                                </goals>
+                                <configuration>
+                                    <transformers>
+                                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                            <mainClass>org.onap.aaf.certservice.client.CertServiceClientApp</mainClass>
+                                        </transformer>
+                                    </transformers>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
@@ -87,26 +107,6 @@
                             </images>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-shade-plugin</artifactId>
-                        <version>3.2.2</version>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>shade</goal>
-                                </goals>
-                                <configuration>
-                                    <transformers>
-                                        <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                            <mainClass>org.onap.aaf.certservice.client.CertServiceClientApp</mainClass>
-                                        </transformer>
-                                    </transformers>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
diff --git a/pom.xml b/pom.xml
index 8393442a..ba2fce88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,7 @@
         <docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
         <junit.version>5.5.2</junit.version>
         <mockito-junit-jupiter.version>2.17.0</mockito-junit-jupiter.version>
+        <maven-shade-plugin.version>3.2.2</maven-shade-plugin.version>
 
         <!-- Docker -->
         <skipDockerPush>true</skipDockerPush>
-- 
cgit 1.2.3-korg