inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4d7581' into RM-3426_MergeToMaster

Browse Source
This commit is contained in:
Mihai Cozma
2016-06-24 16:54:11 +03:00
parent 41fe57f81a 5b8a4b02ca
commit 03119d88f3
2 changed files with 623 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rm-automation/pom.xml
View File

@@ -27,15 +27,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>add-test-source</id> <id>add-test-source</id>
<goals> <goals>
<goal>add-test-source</goal> <goal>add-test-source</goal>
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source>src/unit-test/java</source> <source>src/unit-test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>

53
rm-community/rm-community-repo/pom.xml
View File

@@ -110,7 +110,7 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
@@ -130,10 +130,13 @@
<goal>verify</goal> <goal>verify</goal>
</goals> </goals>
<configuration> <configuration>
<skipTests>${skip.integrationtests}</skipTests> <skipTests>${skip.integrationtests}</skipTests>
<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>
@@ -253,19 +246,17 @@
</action> </action>
</pluginExecution> </pluginExecution>
<pluginExecution> <pluginExecution>
<pluginExecutionFilter> <pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId> <artifactId>license-maven-plugin</artifactId>
license-maven-plugin <versionRange>[1.8,)</versionRange>
</artifactId> <goals>
<versionRange>[1.8,)</versionRange> <goal>update-file-header</goal>
<goals> </goals>
<goal>update-file-header</goal> </pluginExecutionFilter>
</goals> <action>
</pluginExecutionFilter> <ignore />
<action> </action>
<ignore />
</action>
</pluginExecution> </pluginExecution>
</pluginExecutions> </pluginExecutions>
</lifecycleMappingMetadata> </lifecycleMappingMetadata>
@@ -307,8 +298,8 @@
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
<version>2.5</version> <version>2.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${alfresco.groupId}</groupId> <groupId>${alfresco.groupId}</groupId>
<artifactId>alfresco-repository</artifactId> <artifactId>alfresco-repository</artifactId>
<version>${alfresco.version}</version> <version>${alfresco.version}</version>