You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ma...@apache.org on 2017/04/27 22:13:57 UTC
[22/26] incubator-metron git commit: METRON-857 Metron should one
unified docker build image (ottobackwards via merrimanr) closes
apache/incubator-metron#552
METRON-857 Metron should one unified docker build image (ottobackwards via merrimanr) closes apache/incubator-metron#552
Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/ffe2d934
Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/ffe2d934
Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/ffe2d934
Branch: refs/heads/Metron_0.4.0
Commit: ffe2d934089ba6c63513759a9a740c1e34660132
Parents: 58fa1f6
Author: ottobackwards <ot...@gmail.com>
Authored: Wed Apr 26 09:24:07 2017 -0500
Committer: merrimanr <me...@gmail.com>
Committed: Wed Apr 26 09:24:07 2017 -0500
----------------------------------------------------------------------
.../packaging/docker/rpm-docker/pom.xml | 57 ++++++++++++++------
1 file changed, 42 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/ffe2d934/metron-deployment/packaging/docker/rpm-docker/pom.xml
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/docker/rpm-docker/pom.xml b/metron-deployment/packaging/docker/rpm-docker/pom.xml
index dd1a995..ec22223 100644
--- a/metron-deployment/packaging/docker/rpm-docker/pom.xml
+++ b/metron-deployment/packaging/docker/rpm-docker/pom.xml
@@ -164,21 +164,6 @@
</resources>
</configuration>
</execution>
- <execution>
- <id>copy-rpms-target</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.basedir}/target/RPMS</outputDirectory>
- <resources>
- <resource>
- <directory>RPMS</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
@@ -215,6 +200,27 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>copy-rpms-target</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.basedir}/target/RPMS</outputDirectory>
+ <resources>
+ <resource>
+ <directory>RPMS</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -272,6 +278,27 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>copy-rpms-target</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.basedir}/target/RPMS</outputDirectory>
+ <resources>
+ <resource>
+ <directory>RPMS</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>