Commit 3d5b83ea authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents e8c9ec65 4f98ddab

beedk-acs-module-tile/README.md

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ The following properties are intended to be exposed by inheriting Public API Mav 
| ---------------------------------- |:--------:| ------------------ | ----------- |

| `project.build.packageDirectory`   |          | `target/package`   | A variable specifying the folder name of consolidated resources for packaging. |

| `alfresco.module.pathname`         |          | `${project.groupId}.${project.artifactId}` | A variable specifying the folder name of module resources.  Use this property to help reference module resources.  It should rarely ever be overridden. |

| `alfresco.module.classifier`       |          | *None*             | A Maven classifier for the artifact. |

| `alfresco.module.noAmp`            |          | *Automatic*        | Set to `false` to force AMP generation; `true` to force JAR.  A value of `true` could produce a non-functional module. |



## Results

beedk-acs-module-tile/tile.xml

+2 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ 
						</goals>

						<configuration>

							<classifier>${alfresco.module.classifier}</classifier>

							<skip>${beedk.jar.notest.empty}</skip>

							<skip>${alfresco.module.noAmp}</skip>

						</configuration>

					</execution>

				</executions>
@@ -340,6 +340,7 @@ 
				<project.build.packageDirectory>${project.build.directory}/package</project.build.packageDirectory>

				<alfresco.module.pathname>${project.groupId}.${project.artifactId}</alfresco.module.pathname>

				<alfresco.module.classifier></alfresco.module.classifier>

				<alfresco.module.noAmp>${beedk.jar.notest.empty}</alfresco.module.noAmp>



				<!-- output -->

				<alfresco.module.path>alfresco/module/${alfresco.module.pathname}</alfresco.module.path>