You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by kr...@apache.org on 2018/10/02 15:10:10 UTC

knox git commit: KNOX-1463 - Fix gateway-shell-release plugin order

Repository: knox
Updated Branches:
  refs/heads/master bf956d73c -> e19f5f389


KNOX-1463 - Fix gateway-shell-release plugin order

Signed-off-by: Kevin Risden <kr...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/e19f5f38
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/e19f5f38
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/e19f5f38

Branch: refs/heads/master
Commit: e19f5f389bf7e257be32ebeae2775fdda4954b34
Parents: bf956d7
Author: Kevin Risden <kr...@apache.org>
Authored: Tue Oct 2 10:39:12 2018 -0400
Committer: Kevin Risden <kr...@apache.org>
Committed: Tue Oct 2 11:09:57 2018 -0400

----------------------------------------------------------------------
 pom.xml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/e19f5f38/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1d1355a..243cd10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,7 +194,6 @@
                     <plugin>
                         <inherited>false</inherited>
                         <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.4</version>
                         <executions>
                             <execution>
                                 <id>source</id>
@@ -472,13 +471,23 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <!-- Needed to ensure maven-assembly-plugin and maven-shade-plugin
+                 run before antrun plugin in gateway-shell-release -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <version>${maven-dependency-plugin.version}</version>
                 <executions>
                     <execution>
-                        <id>analyze</id>
+                        <id>analyze-dependencies</id>
                         <goals>
                             <goal>analyze-only</goal>
                         </goals>