diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index 23afc9ea..3f80f7da 100644 --- a/archetypes/alfresco-allinone-archetype/pom.xml +++ b/archetypes/alfresco-allinone-archetype/pom.xml @@ -5,8 +5,8 @@ org.alfresco.maven.archetype alfresco-allinone-archetype maven-archetype - alfresco-allinone-archetype - Sample multi-module project for All-in-One development on the Alfresco plaftorm. Includes modules for: Repository, AMP, Share, Solr and embedded Jetty run + All-in-One Archetype from Maven Alfresco SDK + Sample multi-module project for All-in-One development on the Alfresco plaftorm. Includes modules for: Repository, AMP, Share, Solr, Web Quick Start and embedded Jetty run org.alfresco.maven diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml index b6b27c89..f010a43e 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml @@ -56,6 +56,10 @@ ${project.basedir}/../share/target/share.war /share + + ${project.basedir}/../wcmqs/target/wcmqs.war + /wcmqs + diff --git a/archetypes/alfresco-amp-archetype/.classpath b/archetypes/alfresco-amp-archetype/.classpath new file mode 100644 index 00000000..b4ac4c6f --- /dev/null +++ b/archetypes/alfresco-amp-archetype/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/archetypes/alfresco-amp-archetype/.project b/archetypes/alfresco-amp-archetype/.project new file mode 100644 index 00000000..f36bd210 --- /dev/null +++ b/archetypes/alfresco-amp-archetype/.project @@ -0,0 +1,23 @@ + + + alfresco-amp-archetype + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.maven.ide.eclipse.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.maven.ide.eclipse.maven2Nature + + diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpMojo.java index 57f3d030..7ecba9de 100644 --- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpMojo.java +++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AmpMojo.java @@ -36,6 +36,7 @@ import org.codehaus.plexus.archiver.jar.JarArchiver; * @phase package * @requiresProject * @threadSafe + * @since 1.0 * @requiresDependencyResolution runtime * @description Packages an Alfresco AMP file in ${project.build.directory} using the content found in ${project.build.directory}/${project.build.finalName} */ diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java index dde14a3d..613c5885 100644 --- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java +++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/InstallMojo.java @@ -16,6 +16,7 @@ import org.apache.maven.plugin.MojoFailureException; * * @version $Id:$ * @requiresDependencyResolution + * @since 1.0 * @goal install * @description Installs one or more AMPs onto an Alfresco / Share WAR (or * exploded WAR folder) diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/VersionMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/VersionMojo.java index b2002c20..eec0b9d4 100644 --- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/VersionMojo.java +++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/VersionMojo.java @@ -20,6 +20,7 @@ import org.apache.maven.project.MavenProject; * @goal set-version * @phase initialize * @requiresProject + * @since 1.0 * @threadSafe * @description Parses Maven version and removes literals as not allowed in AMP versions, making a noSnapshotVersion property available for POM filtering */ diff --git a/pom.xml b/pom.xml index 45a0f154..6cb58274 100644 --- a/pom.xml +++ b/pom.xml @@ -9,6 +9,8 @@ This aggregator Project builds all modules required for the Maven Alfresco SDK pom + ${maven.site.url} + 3.0.3 @@ -28,7 +30,7 @@ http://mindthegab.com Alfresco Software http://www.alfresco.com - GMT+1 + +1 Founder Architect @@ -42,7 +44,7 @@ http://session.it Alfresco Software http://www.alfresco.com - GMT+1 + +1 Architect Developer @@ -56,7 +58,7 @@ carlo@backbase.com Backbase http://www.backbase.com - GMT+1 + +1 http://skuro.tk @@ -84,10 +86,15 @@ https://artifacts.alfresco.com/nexus/content/repositories/snapshots + + alfresco-docs + dav:${maven.site.url} + 2.2 + https://artifacts.alfresco.com/nexus/content/repositories/alfresco-docs/maven-alfresco-sdk/latest diff --git a/src/changes/changes.xml b/src/changes/changes.xml index eb8588e9..d4a27bfa 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -1,9 +1,21 @@ - Maven Alfresco Lifecycle + Maven Alfresco SDK (former Maven Alfresco Lifecycle) Gabriele Columbro + + Complete re-write of alfresco-maven-plugin to embed Alfresco MMT, therefore maximize alignment / supportability of the build process + Introduced a common SDK parent POM (alfresco-sdk-parent), single entry point to access SDK features + Introduced a Alfresco platform distribution POM (alfresco-sdk-parent) describing Alfresco artifacts per every release + Alfresco Artifacts Repository (https://artifacts.alfresco.com) now hosts Community and Enterprise artifacts with POMs + Updated archetypes to provide samples to use the new SDK. An AMP and an All-in-One archetypes are available + New support for customization / run of Repository, Share, Solr and Web Quick Start + Support for rapid development with AMP unit testing and full embedded run and integration-test (NOTE: Jetty + H2 is NOT supported) + Introduced a common SDK parent POM (alfresco-sdk-parent) to provide common SDK features + Documentation clean up + Deprecated maven-amp-plugin and all old 3.9.1 maven-alfresco-* archetypes based on maven-amp-plugin + Fixed all existing defects to date in Google Code. See http://code.google.com/p/maven-alfresco-archetypes/issues/list?q=label:Milestone-Release391 for details Updated and released maven-alfresco-lifecycle and maven-alfresco-archetypes to version 3.9.1 diff --git a/src/site/site.xml b/src/site/site.xml index bcf16d8e..e5b45463 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,19 +1,13 @@ - - org.apache.maven.skins - maven-fluido-skin - 1.2.1 - + + org.apache.maven.skins + maven-fluido-skin + 1.2.1 + true true - - Maven Alfresco Lifecycle - Maven Alfresco Lifecycle - /img/Alfresco-logo-transparent.gif - /index.html - mindthegabz true @@ -23,43 +17,41 @@ - - - - - - - Maven Alfresco Lifecycle - v. ${project.version} - http://www.alfresco.com - img/Alfresco-logo-transparent.gif - + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + +