Skip to content

Commit

Permalink
[sarlc][janus] Fixing the configuration for Maven Assembly 3.1.0.
Browse files Browse the repository at this point in the history
see #719

Signed-off-by: Stéphane Galland <galland@arakhne.org>
  • Loading branch information
gallandarakhneorg committed Aug 21, 2017
1 parent f974053 commit f84496b
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 4 deletions.
1 change: 1 addition & 0 deletions README.adoc
Expand Up @@ -185,6 +185,7 @@ Please read the link:./CONTRIBUTING.adoc[guidelines for contributors].
* image:https://avatars.githubusercontent.com/gallandarakhneorg[width="50px",link=https://github.com/gallandarakhneorg] link:http://www.multiagent.fr/People:Galland_stephane[Stéphane GALLAND], founder, original and active author.
* image:https://avatars.githubusercontent.com/ngaud[width="50px",link=https://github.com/ngaud] link:http://www.multiagent.fr/People:Gaud_nicolas[Nicolas GAUD], founder, original and active author.
* image:https://avatars.githubusercontent.com/jjst[width="50px",link=https://github.com/jjst] Jeremie JOST, documentation contributor.
* image:https://avatars.githubusercontent.com/tpiotrow[width="50px",link=https://github.com/tpiotrow] Thomas PIOTROWSKI, maven configuration.
* image:https://avatars.githubusercontent.com/srodriguez[width="50px",link=https://github.com/srodriguez] link:http://gitia.org/members/sebastian-rodriguez[Sebastian RODRIGUEZ], founder, original and active author.

== 7. License of SARL
Expand Down
15 changes: 15 additions & 0 deletions pom.xml
Expand Up @@ -169,6 +169,14 @@
<role>Documentation Contributor</role>
</roles>
</contributor>
<contributor>
<name>Thomas Piotrowski</name>
<email>thomas.piotrowski@utbm.fr</email>
<url>https://github.com/tpiotrow</url>
<roles>
<role>Maven Configuration</role>
</roles>
</contributor>
</contributors>

<!-- =================== -->
Expand Down Expand Up @@ -461,6 +469,13 @@
<version>3.0.2</version>
</plugin>


<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
Expand Down
8 changes: 5 additions & 3 deletions products/sarlc/pom.xml
Expand Up @@ -37,7 +37,9 @@
</execution>
</executions>
<configuration>
<descriptor>with-dependencies.xml</descriptor>
<descriptors>
<descriptor>with-dependencies.xml</descriptor>
</descriptors>
<archive>
<manifest>
<mainClass>${cliCompilerMainClass}</mainClass>
Expand All @@ -60,7 +62,7 @@
<configuration>
<headerType>console</headerType>
<outfile>${project.build.directory}/${cliCompilerName}.exe</outfile>
<jar>${project.build.directory}/${project.build.finalName}.jar</jar>
<jar>${project.build.directory}/${project.build.finalName}-cli.jar</jar>
<icon>${project.basedir}/icons/sarlc.ico</icon>
<classPath>
<mainClass>${cliCompilerMainClass}</mainClass>
Expand Down Expand Up @@ -107,7 +109,7 @@
<concat dest="${sarlc.linux.output.full}" binary="yes">
<fileset file="${sarlc.linux.output}" />
<fileset
file="${project.build.directory}/${project.build.finalName}.jar" />
file="${project.build.directory}/${project.build.finalName}-cli.jar" />
</concat>
<chmod perm="ugo+x">
<fileset file="${sarlc.linux.output.full}" />
Expand Down
2 changes: 1 addition & 1 deletion sre/io.janusproject/io.janusproject.kernel/pom.xml
Expand Up @@ -102,7 +102,7 @@
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>attached</goal>
<goal>single</goal>
</goals>
</execution>
</executions>
Expand Down

0 comments on commit f84496b

Please sign in to comment.