Put s.b. repackage before assembly plugin

Issue-ID: AAI-2792
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: I3b4a1f66f9a080410021e4af847fea4332a55e73

diff --git a/aai-traversal/pom.xml b/aai-traversal/pom.xml
index 157f969..575720c 100644 (file)
--- a/aai-traversal/pom.xml
+++ b/aai-traversal/pom.xml
@@ -868,23 +868,7 @@
                                <groupId>com.mycila</groupId>
                                <artifactId>license-maven-plugin</artifactId>
                        </plugin>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <configuration>
-                                       <descriptors>
-                                               <descriptor>src/main/assembly/descriptor.xml</descriptor>
-                                       </descriptors>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>make-assembly</id> <!-- this is used for inheritance merges -->
-                                               <phase>package</phase> <!-- bind to the packaging phase -->
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
+
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-plugin</artifactId>
@@ -962,7 +946,23 @@
                                </executions>
                        </plugin>
                        <plugin>
-                               <groupId>org.springframework.boot</groupId>
+                               <groupId>org.antlr</groupId>
+                               <artifactId>antlr4-maven-plugin</artifactId>
+                               <version>4.7.2</version>
+                               <executions>
+                                       <execution>
+                                               <goals>
+                                                       <goal>antlr4</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <sourceDirectory>src/main/resources/antlr4</sourceDirectory>
+                                                       <!-- <outputDirectory>src/main/java/antlr4</outputDirectory> -->
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                         <groupId>org.springframework.boot</groupId>
                                <artifactId>spring-boot-maven-plugin</artifactId>
                                <configuration>
                                        <mainClass>${start-class}</mainClass>
@@ -976,19 +976,22 @@
                                        </execution>
                                </executions>
                        </plugin>
+
+
                        <plugin>
-                               <groupId>org.antlr</groupId>
-                               <artifactId>antlr4-maven-plugin</artifactId>
-                               <version>4.7</version>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       <descriptors>
+                                               <descriptor>src/main/assembly/descriptor.xml</descriptor>
+                                       </descriptors>
+                               </configuration>
                                <executions>
                                        <execution>
+                                               <id>make-assembly</id> <!-- this is used for inheritance merges -->
+                                               <phase>package</phase> <!-- bind to the packaging phase -->
                                                <goals>
-                                                       <goal>antlr4</goal>
+                                                       <goal>single</goal>
                                                </goals>
-                                               <configuration>
-                                                       <sourceDirectory>src/main/resources/antlr4</sourceDirectory>
-                                                       <!-- <outputDirectory>src/main/java/antlr4</outputDirectory> -->
-                                               </configuration>
                                        </execution>
                                </executions>
                        </plugin>