You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2018/02/16 21:33:43 UTC
[2/4] marmotta git commit: update assembly-plugin
update assembly-plugin
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/7c1badca
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/7c1badca
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/7c1badca
Branch: refs/heads/develop
Commit: 7c1badca1a5ca4e481637073dd8cf50862e80428
Parents: 2079e4e
Author: Jakob Frank <ja...@apache.org>
Authored: Fri Feb 16 19:20:57 2018 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Fri Feb 16 19:20:57 2018 +0100
----------------------------------------------------------------------
launchers/marmotta-installer/assembly.xml | 4 ----
launchers/marmotta-webapp/assembly.xml | 4 ----
parent/pom.xml | 2 +-
3 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/7c1badca/launchers/marmotta-installer/assembly.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/assembly.xml b/launchers/marmotta-installer/assembly.xml
index d097f07..c5eb5cf 100644
--- a/launchers/marmotta-installer/assembly.xml
+++ b/launchers/marmotta-installer/assembly.xml
@@ -33,23 +33,19 @@
<files>
<file>
<source>${project.basedir}/src/main/resources/installer/LICENSE.txt</source>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
</file>
<file>
<source>${project.basedir}/src/main/resources/installer/README.txt</source>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
<filtered>true</filtered>
</file>
<file>
<source>${project.basedir}/src/main/resources/installer/NOTICE.txt</source>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
</file>
<file>
<source>${project.build.directory}/marmotta-installer-${project.version}.jar</source>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
</file>
</files>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/7c1badca/launchers/marmotta-webapp/assembly.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/assembly.xml b/launchers/marmotta-webapp/assembly.xml
index cd76e27..19e5dc7 100644
--- a/launchers/marmotta-webapp/assembly.xml
+++ b/launchers/marmotta-webapp/assembly.xml
@@ -33,24 +33,20 @@
<file>
<source>${project.basedir}/src/main/webapp/META-INF/LICENSE</source>
<destName>LICENSE.txt</destName>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
</file>
<file>
<source>${project.basedir}/src/main/doc/README.txt</source>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
<filtered>true</filtered>
</file>
<file>
<source>${project.basedir}/src/main/webapp/META-INF/NOTICE</source>
<destName>NOTICE.txt</destName>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
</file>
<file>
<source>${project.build.directory}/marmotta.war</source>
- <outputDirectory>/</outputDirectory>
<fileMode>0644</fileMode>
</file>
</files>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/7c1badca/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 715bce0..051c251 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -561,7 +561,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.4</version>
+ <version>2.5.4</version>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>