mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-31 17:39:05 +00:00
Merge commit '4d7581' into RM-3426_MergeToMaster
This commit is contained in:
@@ -134,6 +134,9 @@
|
|||||||
<includes>
|
<includes>
|
||||||
<include>**/AllTestSuite.class</include>
|
<include>**/AllTestSuite.class</include>
|
||||||
</includes>
|
</includes>
|
||||||
|
<additionalClasspathElements>
|
||||||
|
<additionalClasspathElement>${project.build.directory}/${project.build.finalName}/config</additionalClasspathElement>
|
||||||
|
</additionalClasspathElements>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
@@ -173,20 +176,10 @@
|
|||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<attachClasses>true</attachClasses>
|
<attachClasses>true</attachClasses>
|
||||||
|
<attachConfig>true</attachConfig>
|
||||||
<includeDependencies>true</includeDependencies>
|
<includeDependencies>true</includeDependencies>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
<execution>
|
|
||||||
<id>install-rm-amp</id>
|
|
||||||
<goals>
|
|
||||||
<goal>install</goal>
|
|
||||||
</goals>
|
|
||||||
<phase>package</phase>
|
|
||||||
<configuration>
|
|
||||||
<backup>true</backup>
|
|
||||||
<ampLocation>${project.build.directory}/${alfresco.rm.artifactId}-${alfresco.rm.version}.amp</ampLocation>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
<execution>
|
||||||
<id>amps-to-war-overlay</id>
|
<id>amps-to-war-overlay</id>
|
||||||
<phase>package</phase>
|
<phase>package</phase>
|
||||||
@@ -255,9 +248,7 @@
|
|||||||
<pluginExecution>
|
<pluginExecution>
|
||||||
<pluginExecutionFilter>
|
<pluginExecutionFilter>
|
||||||
<groupId>org.codehaus.mojo</groupId>
|
<groupId>org.codehaus.mojo</groupId>
|
||||||
<artifactId>
|
<artifactId>license-maven-plugin</artifactId>
|
||||||
license-maven-plugin
|
|
||||||
</artifactId>
|
|
||||||
<versionRange>[1.8,)</versionRange>
|
<versionRange>[1.8,)</versionRange>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>update-file-header</goal>
|
<goal>update-file-header</goal>
|
||||||
|
Reference in New Issue
Block a user