Fix assembly for multi-module
This commit is contained in:
parent
9220f4d829
commit
d72828b3f4
|
@ -9,5 +9,9 @@ config/production.yml
|
||||||
config/federated.yml
|
config/federated.yml
|
||||||
config/staging.yml
|
config/staging.yml
|
||||||
config/testing.yml
|
config/testing.yml
|
||||||
|
service/config/production.yml
|
||||||
|
service/config/federated.yml
|
||||||
|
service/config/staging.yml
|
||||||
|
service/config/testing.yml
|
||||||
.opsmanage
|
.opsmanage
|
||||||
put.sh
|
put.sh
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<directory>${project.build.directory}</directory>
|
<directory>${project.build.directory}</directory>
|
||||||
<outputDirectory>/</outputDirectory>
|
<outputDirectory>/</outputDirectory>
|
||||||
<includes>
|
<includes>
|
||||||
<include>${project.name}-${project.version}.jar</include>
|
<include>${parent.artifactId}-${TextSecureServer.version}.jar</include>
|
||||||
</includes>
|
</includes>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
</fileSets>
|
</fileSets>
|
|
@ -183,6 +183,7 @@
|
||||||
|
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
<finalName>${parent.artifactId}-${TextSecureServer.version}</finalName>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
@ -218,6 +219,26 @@
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-assembly-plugin</artifactId>
|
||||||
|
<version>2.4</version>
|
||||||
|
<configuration>
|
||||||
|
<descriptors>
|
||||||
|
<descriptor>assembly.xml</descriptor>
|
||||||
|
</descriptors>
|
||||||
|
</configuration>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>make-assembly</id> <!-- this is used for inheritance merges -->
|
||||||
|
<phase>package</phase> <!-- bind to the packaging phase -->
|
||||||
|
<goals>
|
||||||
|
<goal>single</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue