You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by mi...@apache.org on 2016/09/08 20:31:23 UTC
incubator-rya git commit: RYA-173 Fixed signing of rya.merger
distribution zip. Added Apache licenses to rya.merger and
rya.indexing.example distribution zips.
Repository: incubator-rya
Updated Branches:
refs/heads/master 55716326a -> 9bdecc9ed
RYA-173 Fixed signing of rya.merger distribution zip. Added Apache licenses to rya.merger and rya.indexing.example distribution zips.
Closes #88 from ejwhite922/RYA-173_MergerSignedBundle
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/9bdecc9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/9bdecc9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/9bdecc9e
Branch: refs/heads/master
Commit: 9bdecc9ed84be9898946ec6844cdc92e5c264a8f
Parents: 5571632
Author: eric.white <er...@ads.sparta.com>
Authored: Thu Sep 8 15:22:21 2016 -0400
Committer: Aaron Mihalik <mi...@alum.mit.edu>
Committed: Thu Sep 8 16:22:08 2016 -0400
----------------------------------------------------------------------
extras/indexingExample/src/main/assembly/assembly.xml | 11 +++++++++++
extras/rya.merger/assembly.xml | 9 +++++++++
extras/rya.merger/pom.xml | 12 ++++++------
3 files changed, 26 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9bdecc9e/extras/indexingExample/src/main/assembly/assembly.xml
----------------------------------------------------------------------
diff --git a/extras/indexingExample/src/main/assembly/assembly.xml b/extras/indexingExample/src/main/assembly/assembly.xml
index 98dec7f..140945d 100644
--- a/extras/indexingExample/src/main/assembly/assembly.xml
+++ b/extras/indexingExample/src/main/assembly/assembly.xml
@@ -67,4 +67,15 @@ under the License.
<outputDirectory>dist</outputDirectory>
</file>
</files>
+ <!-- Add Apache licenses to the distribution zip -->
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}/../../</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9bdecc9e/extras/rya.merger/assembly.xml
----------------------------------------------------------------------
diff --git a/extras/rya.merger/assembly.xml b/extras/rya.merger/assembly.xml
index c32f11a..7934c1f 100644
--- a/extras/rya.merger/assembly.xml
+++ b/extras/rya.merger/assembly.xml
@@ -33,5 +33,14 @@ under the License.
<directory>${project.build.directory}/distribution</directory>
<outputDirectory></outputDirectory>
</fileSet>
+ <!-- Add Apache licenses to the distribution zip -->
+ <fileSet>
+ <directory>${project.basedir}/../../</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/9bdecc9e/extras/rya.merger/pom.xml
----------------------------------------------------------------------
diff --git a/extras/rya.merger/pom.xml b/extras/rya.merger/pom.xml
index 4d83fb7..425601b 100644
--- a/extras/rya.merger/pom.xml
+++ b/extras/rya.merger/pom.xml
@@ -303,7 +303,7 @@ under the License.
<executions>
<execution>
<id>copy-resource-bin</id>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
@@ -318,7 +318,7 @@ under the License.
</execution>
<execution>
<id>copy-resource-config</id>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
@@ -333,7 +333,7 @@ under the License.
</execution>
<execution>
<id>copy-resource-lib</id>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
@@ -351,7 +351,7 @@ under the License.
</execution>
<execution>
<id>copy-resource-jar</id>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
@@ -374,7 +374,7 @@ under the License.
</execution>
<execution>
<id>copy-resource-readme</id>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
@@ -405,7 +405,7 @@ under the License.
<executions>
<execution>
<id>build-zip</id>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>single</goal>
</goals>