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

Merge branch 'feature/RM_Audit_Log_Error' into feature/RM_2_5_with_Alfresco_5_1_1

Browse Source
This commit is contained in:
Tuna Aksoy
2016-07-01 23:08:58 +01:00
parent 59020be66e b73fa7d7aa
commit f40b70c438
2 changed files with 48 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
rm-automation/pom.xml
View File

@@ -64,8 +64,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- License header generation -->
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
@@ -75,11 +73,9 @@
<descriptionTemplate>${project.parent.basedir}/license/description.ftl</descriptionTemplate> <descriptionTemplate>${project.parent.basedir}/license/description.ftl</descriptionTemplate>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId> <artifactId>lifecycle-mapping</artifactId>
@@ -89,19 +85,11 @@
<pluginExecutions> <pluginExecutions>
<pluginExecution> <pluginExecution>
<pluginExecutionFilter> <pluginExecutionFilter>
<groupId> <groupId>org.codehaus.mojo</groupId>
org.codehaus.mojo <artifactId>license-maven-plugin</artifactId>
</groupId> <versionRange>[1.8,)</versionRange>
<artifactId>
license-maven-plugin
</artifactId>
<versionRange>
[1.8,)
</versionRange>
<goals> <goals>
<goal> <goal>update-file-header</goal>
update-file-header
</goal>
</goals> </goals>
</pluginExecutionFilter> </pluginExecutionFilter>
<action> <action>
@@ -241,24 +229,12 @@
</goals> </goals>
<configuration> <configuration>
<artifactItems> <artifactItems>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-community-share</artifactId>
<version>${project.version}</version>
<type>amp</type>
</artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-enterprise-share</artifactId> <artifactId>alfresco-rm-enterprise-share</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<type>amp</type> <type>amp</type>
</artifactItem> </artifactItem>
<artifactItem>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-community-repo</artifactId>
<version>${project.version}</version>
<type>amp</type>
</artifactItem>
<artifactItem> <artifactItem>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-enterprise-repo</artifactId> <artifactId>alfresco-rm-enterprise-repo</artifactId>
@@ -277,18 +253,6 @@
<artifactId>alfresco-maven-plugin</artifactId> <artifactId>alfresco-maven-plugin</artifactId>
<extensions>true</extensions> <extensions>true</extensions>
<executions> <executions>
<execution>
<id>install-community-repo-amp</id>
<goals>
<goal>install</goal>
</goals>
<phase>process-test-resources</phase>
<configuration>
<backup>true</backup>
<ampLocation>${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp</ampLocation>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
</configuration>
</execution>
<execution> <execution>
<id>install-enterprise-repo-amp</id> <id>install-enterprise-repo-amp</id>
<goals> <goals>
@@ -301,18 +265,6 @@
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation> <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>install-community-share-amp</id>
<goals>
<goal>install</goal>
</goals>
<phase>process-test-resources</phase>
<configuration>
<backup>true</backup>
<ampLocation>${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp</ampLocation>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation>
</configuration>
</execution>
<execution> <execution>
<id>install-enterprise-share-amp</id> <id>install-enterprise-share-amp</id>
<goals> <goals>

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

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-rm-community-repo</artifactId> <artifactId>alfresco-rm-community-repo</artifactId>
<name>Alfresco Records Management Community Repo</name> <name>Alfresco Records Management Community Repo</name>
<description>Alfresco Record Management Core Repository Extension</description> <description>Alfresco Record Management Community Repository Extension</description>
<packaging>amp</packaging> <packaging>amp</packaging>
<parent> <parent>
@@ -85,10 +85,10 @@
</goals> </goals>
<configuration> <configuration>
<target> <target>
<copy todir="${project.build.directory}/${project.build.finalName}/config/alfresco"> <move todir="${project.build.directory}/${project.build.finalName}/config/alfresco">
<fileset dir="${project.build.outputDirectory}/alfresco" /> <fileset dir="${project.build.outputDirectory}/alfresco" />
</copy> </move>
<move file="${project.build.directory}/${project.build.finalName}/config/alfresco/module/org_alfresco_module_rm/module.properties" todir="${project.build.directory}/${project.build.finalName}" /> <copy file="${project.build.directory}/${project.build.finalName}/config/alfresco/module/org_alfresco_module_rm/module.properties" todir="${project.build.directory}/${project.build.finalName}" />
</target> </target>
</configuration> </configuration>
</execution> </execution>
@@ -207,8 +207,6 @@
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>
<!-- License header generation -->
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
@@ -224,7 +222,6 @@
</roots> </roots>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
<pluginManagement> <pluginManagement>
<plugins> <plugins>