Merge commit '4d7581' into RM-3426_MergeToMaster

This commit is contained in:
Mihai Cozma
2016-06-24 16:54:11 +03:00
2 changed files with 623 additions and 632 deletions

View File

@@ -134,6 +134,9 @@
<includes>
<include>**/AllTestSuite.class</include>
</includes>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}/${project.build.finalName}/config</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</execution>
</executions>
@@ -173,20 +176,10 @@
</goals>
<configuration>
<attachClasses>true</attachClasses>
<attachConfig>true</attachConfig>
<includeDependencies>true</includeDependencies>
</configuration>
</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>
<id>amps-to-war-overlay</id>
<phase>package</phase>
@@ -255,9 +248,7 @@
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
<artifactId>
license-maven-plugin
</artifactId>
<artifactId>license-maven-plugin</artifactId>
<versionRange>[1.8,)</versionRange>
<goals>
<goal>update-file-header</goal>