diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml index bd8d5468..33287af3 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml @@ -21,13 +21,13 @@ - ${alfresco_target_groupId} + - ${alfresco_target_version} + WARN diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml index 26b8922f..4f6726cb 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml @@ -27,7 +27,7 @@ ${alfresco.groupId} - alfresco + ${alfresco.repo.artifactId} war @@ -63,7 +63,7 @@ ${alfresco.groupId} - alfresco + ${alfresco.repo.artifactId} war @@ -140,15 +140,16 @@ - + org.slf4j jcl-over-slf4j - 1.5.11 + rm diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml index f8208aeb..498075fe 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml @@ -16,7 +16,7 @@ ${alfresco.groupId} - share + ${alfresco.share.artifactId} war @@ -44,7 +44,7 @@ ${alfresco.groupId} - share + ${alfresco.share.artifactId} war @@ -61,6 +61,7 @@ + rm diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 53b2937e..4cd86986 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -12,15 +12,6 @@ 5.0.a - - alfresco - - - org.alfresco - - - 5.0.a - (not used) diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml index 34b6c54c..13c17dbf 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml @@ -25,22 +25,26 @@ | Defines the groupId for the Alfresco Artifacts to work against. As of 4.2 the only allowed value is: org.alfresco | NOTE: See http://docs.alfresco.com/4.2/concepts/dev-extensions-maven-sdk-tutorials-alfresco-enterprise.html for details --> - ${alfresco_target_groupId} + - ${alfresco_target_version} + WARN alf_data_dev - - ${alfresco_target_amp_client_war} - - ${alfresco_target_amp_client_war_groupId} - - ${alfresco_target_amp_client_war_version} local + + + + + + + - share + ${alfresco.share.artifactId} 8081 @@ -35,7 +35,8 @@ Community versions are typically identified by major.minor.character (4.2.a), while Enterprise versions are identified by major.minor.digit (4.2.0) --> - ${alfresco_target_version} + + WARN diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index c4a90eec..9507f92d 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -38,11 +38,14 @@ --> org.alfresco 5.0.a + + alfresco + share - alfresco + ${alfresco.repo.artifactId} ${alfresco.groupId} ${alfresco.version} /${alfresco.client.war} @@ -96,6 +99,10 @@ --> ${project.build.directory}/ WARN + + + runtime + 1.5.11 UTF-8 @@ -343,6 +350,19 @@ + + + + + org.slf4j + jcl-over-slf4j + ${app.slf4j.version} + ${app.slf4j.scope} + + + + + @@ -669,12 +689,11 @@ org.slf4j jcl-over-slf4j - 1.5.11 org.slf4j slf4j-log4j12 - 1.5.11 + ${app.slf4j.version} org.alfresco.maven @@ -779,5 +798,32 @@ + + + enterprise + + 5.0-BF-SNAPSHOT + alfresco-enterprise + share-enterprise + + provided + + + + alfresco-internal + https://artifacts.alfresco.com/nexus/content/groups/internal + + + alfresco-internal-snapshots + https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots/ + + true + daily + + + + diff --git a/poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm b/poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm index 2a7acdb8..2cd8a9b7 100644 --- a/poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm +++ b/poms/alfresco-sdk-parent/src/site/apt/sdk-profiles.apt.vm @@ -3,36 +3,40 @@ ------ Gabriele Columbro ------ - Nov 2012 + Aug 2014 ------ SDK Available Profiles The Maven Alfresco SDK\x99 defines common features required by different Alfresco projects. While the <<>> way is to use full working examples of usage of these profiles (e.g. the - {{{../../archetypes/alfresco-amp-archetype/index.html}AMP}} and {{{../../archetypes/alfresco-allinone-archetype/index.html}All-in-One}} archetypes), + {{{../../archetypes/alfresco-amp-archetype/index.html}Repo AMP}}, {{{../../archetypes/share-amp-archetype/index.html}Share AMP} and {{{../../archetypes/alfresco-allinone-archetype/index.html}All-in-One}} archetypes), you can also directly use this POM as a parent in your custom project. Here goes the list of common used profiles (with their activation conditions): + *-----------+--------------+-------------+-------------+-------------+ || Archetypes || Profile || Description || Activation || Phase | *-----------+--------------+-------------+-------------+-------------+ | amp, share-amp | amp-to-war | Allows AMP projects to be run embedded on a WAR and in rapid dev mode | Manual: <<<-Pamp-to-war>>> | pre-integration-test | *-----------*--------------*-------------*-------------*-------------+ -| any |purge | Cleans all alf_data and logs from Alfresco runs | Manual: <<<-Ppurge>>> | clean | -*-----------*--------------*-------------*-------------*-------------+ | all-in-one | run | Runs embedded Alfresco + Share + Solr in rapid dev mode | Manual: <<<-Prun>>> | pre-integration-test | *-----------*--------------*-------------*-------------*-------------+ -| all-in-one | rm | Adds Records Management runtime and compile time dependencies | Manual: <<<-Prm>>> | package | +| any | purge | Cleans all alf_data and logs from Alfresco runs | Manual: <<<-Ppurge>>> | clean | +*-----------*--------------*-------------*-------------*-------------+ +| any | enterprise |Configures your build to use Alfresco Enterprise. Obtain your credentials with {{{https://support.alfresco.com}Alfresco Support}}| Manual: <<<-Penterprise>>> | N/A | *-----------+--------------+-------------+-------------+-------------+ | any | setup | Sets up the sdk, e.g. grabs springloaded. | Manual: <<<-Psetup>>> (automated in the run.sh) | initialize | *-----------+--------------+-------------+-------------+-------------+ -| amp, share-amp | atv | (Experimental) Invokes the {{{https://github.com/AlfrescoLabs/technical-validation/}Alfresco Technical Validation tool}} | Manual: <<<-Patv>>> | validate | +| all-in-one | rm | Adds Records Management runtime and compile time dependencies | Manual: <<<-Prm>>> | package | *-----------+--------------+-------------+-------------+-------------+ | all-in-one | regression | (Experimental) Invokes the Alfresco {{{https://github.com/AlfrescoLabs/technical-validation/}Share PO}} Webdrone / Selenium based regression tests| Manual: <<<-Pregression>>> | integration-test | *-----------+--------------+-------------+-------------+-------------+ - +| amp, share-amp | atv | (Experimental) Invokes the {{{https://github.com/AlfrescoLabs/technical-validation/}Alfresco Technical Validation tool}} | Manual: <<<-Patv>>> | validate | +*-----------+--------------+-------------+-------------+-------------+ + + The full list of available profiles (with their activation conditions) can be instead found in the <<>> section of the {{{https://artifacts.alfresco.com/nexus/index.html#nexus-search;gav~org.alfresco.maven~alfresco-sdk-parent~${project.version}~pom~}Maven Alfresco SDK POM}}. @@ -43,4 +47,4 @@ Full SDK properties reference Check the {{{https://artifacts.alfresco.com/nexus/index.html#nexus-search;gav~org.alfresco.maven~alfresco-sdk-parent~${project.version}~pom~}current POM version}} for this. While in certain cases it might be useful to override defaults, make sure you know what you're doing, - as you might be <> SDK conventions and therefore <> \ No newline at end of file + as you might be <> SDK conventions and therefore <> diff --git a/src/site/apt/prerequisites.apt.vm b/src/site/apt/prerequisites.apt.vm index f10b46b4..0ce7f1d3 100644 --- a/src/site/apt/prerequisites.apt.vm +++ b/src/site/apt/prerequisites.apt.vm @@ -27,6 +27,8 @@ Maven Alfresco SDK\x99 Pre-Requisites Alfresco platform is retrieved automatically from {{{https://artifacts.alfresco.com} the Alfresco Artifacts Repository}} based on the <<>> and <<>> POM properties + * If you're an Alfresco customer, you can setup a ~/.m2/settings.xml as documented on {{{http://docs.alfresco.com/4.2/tasks/dev-extensions-maven-sdk-tutorials-configure-maven-enterprise.html} Alfresco Docs page}} and specify <<<-Penterprise>>> on your Maven build command to use the latest Alfresco Enterprise version + Enable hot class reload with spring-loaded