diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 12d68606..90430ae6 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -10,7 +10,7 @@ org.alfresco - 5.0.a-SNAPSHOT + 5.0.a (not used) diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/archetype.properties b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/archetype.properties index cc1de0d9..e016cc85 100644 --- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/archetype.properties +++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/archetype.properties @@ -3,4 +3,4 @@ version=0.1-SNAPSHOT groupId=archetype.it artifactId=allInOneTest alfresco_target_groupId=org.alfresco -alfresco_target_version=5.0.a-SNAPSHOT +alfresco_target_version=5.0.a diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/archetype.properties b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/archetype.properties index cc1de0d9..e016cc85 100644 --- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/archetype.properties +++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/archetype.properties @@ -3,4 +3,4 @@ version=0.1-SNAPSHOT groupId=archetype.it artifactId=allInOneTest alfresco_target_groupId=org.alfresco -alfresco_target_version=5.0.a-SNAPSHOT +alfresco_target_version=5.0.a 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 ace18eeb..423337d5 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 @@ -10,7 +10,7 @@ org.alfresco - 5.0.a-SNAPSHOT + 5.0.a alfresco @@ -19,7 +19,7 @@ org.alfresco - 5.0.a-SNAPSHOT + 5.0.a (not used) diff --git a/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties b/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties index 1cbf48a5..0dd58788 100644 --- a/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties +++ b/archetypes/alfresco-amp-archetype/src/test/resources/projects/basic/archetype.properties @@ -2,10 +2,10 @@ package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it -alfresco_target_version=5.0.a-SNAPSHOT +alfresco_target_version=5.0.a $=cat archetype.properties alfresco_target_groupId=org.alfresco alfresco_target_amp_client_war=alfresco alfresco_target_amp_client_war_groupId=org.alfresco -alfresco_target_amp_client_war_version=5.0.a-SNAPSHOT +alfresco_target_amp_client_war_version=5.0.a artifactId=basic diff --git a/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/archetype.properties b/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/archetype.properties index 1cbf48a5..0dd58788 100644 --- a/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/archetype.properties +++ b/archetypes/alfresco-amp-archetype/src/test/resources/projects/run-basic/archetype.properties @@ -2,10 +2,10 @@ package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it -alfresco_target_version=5.0.a-SNAPSHOT +alfresco_target_version=5.0.a $=cat archetype.properties alfresco_target_groupId=org.alfresco alfresco_target_amp_client_war=alfresco alfresco_target_amp_client_war_groupId=org.alfresco -alfresco_target_amp_client_war_version=5.0.a-SNAPSHOT +alfresco_target_amp_client_war_version=5.0.a artifactId=basic diff --git a/archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 2cd18867..ebd55faf 100644 --- a/archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -10,7 +10,7 @@ org.alfresco - 5.0.a-SNAPSHOT + 5.0.a share @@ -19,7 +19,7 @@ org.alfresco - 5.0.a-SNAPSHOT + 5.0.a (not used) @@ -61,7 +61,7 @@ src/main/amp/web - + src/test/java diff --git a/archetypes/share-amp-archetype/src/test/resources/projects/basic/archetype.properties b/archetypes/share-amp-archetype/src/test/resources/projects/basic/archetype.properties index 00abd955..2c0374e9 100644 --- a/archetypes/share-amp-archetype/src/test/resources/projects/basic/archetype.properties +++ b/archetypes/share-amp-archetype/src/test/resources/projects/basic/archetype.properties @@ -2,10 +2,10 @@ package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it -alfresco_target_version=5.0.a-SNAPSHOT +alfresco_target_version=5.0.a $=cat archetype.properties alfresco_target_groupId=org.alfresco alfresco_target_amp_client_war=share alfresco_target_amp_client_war_groupId=org.alfresco -alfresco_target_amp_client_war_version=5.0.a-SNAPSHOT +alfresco_target_amp_client_war_version=5.0.a artifactId=basic diff --git a/archetypes/share-amp-archetype/src/test/resources/projects/run-basic/archetype.properties b/archetypes/share-amp-archetype/src/test/resources/projects/run-basic/archetype.properties index 00abd955..2c0374e9 100644 --- a/archetypes/share-amp-archetype/src/test/resources/projects/run-basic/archetype.properties +++ b/archetypes/share-amp-archetype/src/test/resources/projects/run-basic/archetype.properties @@ -2,10 +2,10 @@ package=it.pkg version=0.1-SNAPSHOT groupId=archetype.it -alfresco_target_version=5.0.a-SNAPSHOT +alfresco_target_version=5.0.a $=cat archetype.properties alfresco_target_groupId=org.alfresco alfresco_target_amp_client_war=share alfresco_target_amp_client_war_groupId=org.alfresco -alfresco_target_amp_client_war_version=5.0.a-SNAPSHOT +alfresco_target_amp_client_war_version=5.0.a artifactId=basic diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index 2bc3c84d..0176e481 100644 --- a/plugins/alfresco-maven-plugin/pom.xml +++ b/plugins/alfresco-maven-plugin/pom.xml @@ -4,7 +4,7 @@ alfresco-maven-plugin maven-plugin Alfresco Maven Plugin - + org.alfresco.maven alfresco-lifecycle-aggregator @@ -79,7 +79,7 @@ org.alfresco alfresco-mmt - 5.0.a-SNAPSHOT + 5.0.a diff --git a/pom.xml b/pom.xml index 7242081c..9bb7f518 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ - modules/alfresco-rad + modules/alfresco-rad plugins/alfresco-maven-plugin diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml index f66a023f..68ec1959 100644 --- a/poms/alfresco-sdk-parent/pom.xml +++ b/poms/alfresco-sdk-parent/pom.xml @@ -4,12 +4,12 @@ alfresco-sdk-parent Maven Alfresco SDK Parent POM - The Maven Alfresco SDK Parent POM exposes the developer features of the Maven Alfresco SDK. + The Maven Alfresco SDK Parent POM exposes the developer features of the Maven Alfresco SDK. Declare this POM as parent for your project and select the Alfresco version/edition by defining - the alfresco.groupId and alfresco.version in your POM. + the alfresco.groupId and alfresco.version in your POM. pom - + org.alfresco.maven @@ -17,7 +17,7 @@ 2.0.0-SNAPSHOT ../../pom.xml - + 2.0.0-SNAPSHOT @@ -29,17 +29,17 @@ org.alfresco - 5.0.a-SNAPSHOT + 5.0.a - alfresco @@ -60,7 +60,7 @@ jdbc:h2:./${alfresco.data.location}/h2_data/${alfresco.db.name};${alfresco.db.params} org.h2.jdbcx.JdbcDataSource - + local src/main/amp @@ -80,20 +80,20 @@ src/test/properties/${env} ** ** - - true -Xms256m -Xmx1524m -XX:MaxPermSize=256m -Duser.language=en - + ${project.build.directory}/ WARN - + UTF-8 @@ -148,7 +148,7 @@ - + ${project.artifactId} @@ -273,7 +273,7 @@ h2-support ${h2-support.version} - org.codehaus.plexus @@ -284,7 +284,7 @@ - + org.alfresco.maven.plugin @@ -352,7 +352,7 @@ - + enable-test-properties-filtering @@ -392,8 +392,8 @@ - - + + enable-amp @@ -411,7 +411,7 @@ - + enable-alfresco-testing @@ -483,9 +483,9 @@ ${maven.alfresco.version} test - org.springframework @@ -495,9 +495,9 @@ - - rad @@ -553,9 +553,9 @@ ${maven.alfresco.version} - + - + amp-to-war @@ -686,8 +686,8 @@ 1.5.11 - - + + purge