Added aikau.version prop and dependency so it can be brought in separately (6bc23959) · Commits · Inteligr8 / alfresco-sdk-deletion_scheduled-31

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml

+10 −3

Original line number	Diff line number	Diff line
		@@ -41,6 +41,10 @@
		<!-- Alfresco Surf version, if you change Share version you might need to change Surf version -->
		<alfresco.surf.version>6.5</alfresco.surf.version>

		<!-- Aikau framework version, it is released separately, so it can be useful to be able
		to bring in newer versions with bug fixes etc -->
		<aikau.version>1.0.82</aikau.version>

		<!-- Alfresco Repo Database configuration.
		By default it uses a flat file H2 database to be able to run embedded.
		The H2 database implementation is brought in via the tomcat7-maven-plugin as a dependency.
		@@ -194,12 +198,15 @@

		<!--
		JARs and AMPs that should be overlayed/applied to the Share WAR (i.e. share.war)
		No need to include our self...
		-->
		<shareModules>
		<moduleDependency>
		<groupId>${project.groupId}</groupId>
		<artifactId>${artifactId}-share-jar</artifactId>
		<version>${project.version}</version>
		<!-- Bring in a newer version, can coexist with older versions in the WAR disttribution,
		newest version is picked -->
		<groupId>${alfresco.groupId}</groupId>
		<artifactId>aikau</artifactId>
		<version>${aikau.version}</version>
		</moduleDependency>
		</shareModules>
		</configuration>

+1 −0

Original line number	Diff line number	Diff line
		@@ -112,6 +112,7 @@
		<!--
		JARs and AMPs that should be overlayed/applied to the Platform/Repository WAR
		(i.e. alfresco.war)
		No need to include our self...
		-->
		<platformModules>
		<!-- This AMP is needed if we are going to access the platform webapp from a Share webapp -->

+22 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,10 @@
		<!-- Alfresco Surf version, if you change Share version you might need to change Surf version -->
		<alfresco.surf.version>6.5</alfresco.surf.version>

		<!-- Aikau framework version, it is released separately, so it can be useful to be able
		to bring in newer versions with bug fixes etc -->
		<aikau.version>1.0.82</aikau.version>

		<!-- Since alfresco.war (i.e. the Platform/Repository) is already running on port 8080, we run Share.WAR on port 8081.
		If Alfresco Platform is not running, then generate a platform-jar-module and start it up. -->
		<maven.tomcat.port>8081</maven.tomcat.port>
		@@ -73,6 +77,24 @@

		<!-- Enable the Share webapp, which is what we customize with Share JAR modules -->
		<enableShare>true</enableShare>

		<!--
		JARs and AMPs that should be overlayed/applied to the Share WAR (i.e. share.war)
		-->
		<shareModules>
		<moduleDependency>
		<groupId>${project.groupId}</groupId>
		<artifactId>${artifactId}-share-jar</artifactId>
		<version>${project.version}</version>
		</moduleDependency>
		<moduleDependency>
		<!-- Bring in a newer version, can coexist with older versions in the WAR disttribution,
		newest version is picked -->
		<groupId>${alfresco.groupId}</groupId>
		<artifactId>aikau</artifactId>
		<version>${aikau.version}</version>
		</moduleDependency>
		</shareModules>
		</configuration>
		</plugin>

+5 −0

Original line number	Diff line number	Diff line
		@@ -439,6 +439,11 @@ public class RunMojo extends AbstractMojo {
		* @throws MojoExecutionException
		*/
		protected void copyAlfrescoLicense() throws MojoExecutionException {
		if (alfrescoEdition.equals(ALFRESCO_COMMUNITY_EDITION)) {
		getLog().info("NOT copying Alfresco Enterprise license, running Community edition");
		return;
		}

		final String warOutputDir = getWarOutputDir(PLATFORM_WAR_PREFIX_NAME);
		final String licDestDir = warOutputDir + "/WEB-INF/classes/alfresco/extension/license";