Commit d05b4909 authored by Romain Bioteau's avatar Romain Bioteau Committed by GitHub
Browse files

fix(build) update maven assembly plugin (#219)

Update maven-assembly-plugin and set filePermission in assembly

fixes [BS-15929](https://bonitasoft.atlassian.net/browse/BS-15929)
parent 6a0ed819
......@@ -11,17 +11,19 @@
<file>
<source>${project.build.directory}/products/${productId}/linux/gtk/x86/${product.short.name}</source>
<destName>${product.short.name}-linux</destName>
<outputDirectory>/</outputDirectory>
<outputDirectory />
<fileMode>0755</fileMode>
</file>
<file>
<source>${project.build.directory}/products/${productId}/linux/gtk/x86/${product.short.name}.ini</source>
<destName>${product.short.name}-linux.ini</destName>
<outputDirectory>/</outputDirectory>
<outputDirectory />
</file>
<file>
<source>${project.build.directory}/products/${productId}/linux/gtk/x86_64/${product.short.name}</source>
<destName>${product.short.name}64-linux</destName>
<outputDirectory>/</outputDirectory>
<outputDirectory />
<fileMode>0755</fileMode>
</file>
<file>
<source>${project.build.directory}/products/${productId}/linux/gtk/x86_64/${product.short.name}.ini</source>
......@@ -31,31 +33,33 @@
<file>
<source>${project.build.directory}/products/${productId}/win32/win32/x86_64/${product.short.name}.exe</source>
<destName>${product.short.name}64.exe</destName>
<outputDirectory>/</outputDirectory>
<outputDirectory />
<fileMode>0755</fileMode>
</file>
<file>
<source>${project.build.directory}/products/${productId}/win32/win32/x86_64/${product.short.name}.ini</source>
<destName>${product.short.name}64.ini</destName>
<outputDirectory>/</outputDirectory>
<outputDirectory />
</file>
<file>
<source>${project.build.directory}/products/${productId}/macosx/cocoa/x86_64/${product.short.name}.app/Contents/MacOS/${product.short.name}.ini</source>
<outputDirectory>/${product.short.name}.app/Contents/MacOS/</outputDirectory>
<outputDirectory>./${product.short.name}.app/Contents/MacOS/</outputDirectory>
</file>
<file>
<source>${project.build.directory}/products/${productId}/macosx/cocoa/x86_64/${product.short.name}.app/Contents/MacOS/${product.short.name}</source>
<outputDirectory>/${product.short.name}.app/Contents/MacOS/</outputDirectory>
<outputDirectory>./${product.short.name}.app/Contents/MacOS/</outputDirectory>
<fileMode>0755</fileMode>
</file>
<file>
<source>${project.build.directory}/products/${productId}/macosx/cocoa/x86_64/${product.short.name}.app/Contents/Resources/bonitasoft-icon-128-128-transparent.icns</source>
<outputDirectory>/${product.short.name}.app/Contents/Resources/</outputDirectory>
<outputDirectory>./${product.short.name}.app/Contents/Resources/</outputDirectory>
</file>
<file>
<source>${project.build.directory}/products/${productId}/macosx/cocoa/x86_64/${product.short.name}.app/Contents/Info.plist</source>
<outputDirectory>/${product.short.name}.app/Contents/</outputDirectory>
<outputDirectory>./${product.short.name}.app/Contents/</outputDirectory>
</file>
</files>
<fileSets>
<fileSet>
<directory>${project.build.directory}/products/${productId}/linux/gtk/x86</directory>
......@@ -66,7 +70,7 @@
<exclude>${product.short.name}</exclude>
<exclude>${product.short.name}.ini</exclude>
</excludes>
<outputDirectory>/</outputDirectory>
<outputDirectory />
</fileSet>
<fileSet>
<directory>${project.build.directory}/products/${productId}/linux/gtk/x86_64</directory>
......@@ -77,14 +81,14 @@
<exclude>${product.short.name}</exclude>
<exclude>${product.short.name}.ini</exclude>
</excludes>
<outputDirectory>/</outputDirectory>
<outputDirectory />
</fileSet>
<fileSet>
<directory>${project.build.directory}/products/${productId}/win32/win32/x86</directory>
<includes>
<include>**</include>
</includes>
<outputDirectory>/</outputDirectory>
<outputDirectory />
</fileSet>
<fileSet>
<directory>${project.build.directory}/products/${productId}/win32/win32/x86_64</directory>
......@@ -95,7 +99,7 @@
<exclude>${product.short.name}.exe</exclude>
<exclude>${product.short.name}.ini</exclude>
</excludes>
<outputDirectory>/</outputDirectory>
<outputDirectory />
</fileSet>
<fileSet>
<directory>${project.build.directory}/products/${productId}/macosx/cocoa/x86_64</directory>
......@@ -105,7 +109,7 @@
<excludes>
<exclude>${product.short.name}.app</exclude>
</excludes>
<outputDirectory>/</outputDirectory>
<outputDirectory />
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
......@@ -13,7 +13,7 @@
<includes>
<include>**</include>
</includes>
<outputDirectory>/</outputDirectory>
<outputDirectory />
</fileSet>
</fileSets>
</assembly>
\ No newline at end of file
......@@ -199,8 +199,10 @@
<id>make-directory-assembly</id>
<phase>prepare-package</phase>
<configuration>
<descriptors>
<descriptor>${basedir}/assembly-descriptor.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
<descriptor>${basedir}/assembly-descriptor.xml</descriptor>
<finalName>${product.short.name}-${project.version}</finalName>
</configuration>
<goals>
......@@ -212,8 +214,10 @@
<phase>package</phase>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptor>${basedir}/assembly-zip-descriptor.xml</descriptor>
<finalName>${product.short.name}-${project.version}</finalName>
<descriptors>
<descriptor>${basedir}/assembly-zip-descriptor.xml</descriptor>
</descriptors>
<finalName>${product.short.name}-${project.version}</finalName>
</configuration>
<goals>
<goal>single</goal>
......
......@@ -102,12 +102,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.8</version>
<version>2.10</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment