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 ee737ba8..0d153c76 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 + 5.0.b (not used) 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 4f6726cb..92560ace 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 @@ -140,14 +140,6 @@ - - - - org.slf4j - jcl-over-slf4j - - diff --git a/archetypes/alfresco-allinone-archetype/src/site/apt/index.apt.vm b/archetypes/alfresco-allinone-archetype/src/site/apt/index.apt.vm index a37ca8de..3e51c5ec 100644 --- a/archetypes/alfresco-allinone-archetype/src/site/apt/index.apt.vm +++ b/archetypes/alfresco-allinone-archetype/src/site/apt/index.apt.vm @@ -46,7 +46,7 @@ mvn archetype:generate -Dfilter=org.alfresco.maven.archetype: -DarchetypeCatalog [[2]] Specify the <<>> and <<>> for the project you want to create - [[3]] () Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.a) + [[3]] () Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.b) You can find new Alfresco All-in-One project ready to go in the <<>> folder. 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 e016cc85..7c097b9b 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 +alfresco_target_version=5.0.b 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 e016cc85..7c097b9b 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 +alfresco_target_version=5.0.b 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 4cd86986..77d81a5d 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 + 5.0.b (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 0dd58788..0f297778 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 +alfresco_target_version=5.0.b $=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 +alfresco_target_amp_client_war_version=5.0.b 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 0dd58788..0f297778 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 +alfresco_target_version=5.0.b $=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 +alfresco_target_amp_client_war_version=5.0.b 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 ba741b47..12361271 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 + 5.0.b (not used) diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample index 9262eff1..219739b2 100644 --- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample @@ -1,4 +1,4 @@ - + diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm index 7c277481..6f8cb886 100644 --- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/site/apt/index.apt.vm @@ -42,7 +42,7 @@ mvn archetype:generate -DarchetypeCatalog=https://artifacts.alfresco.com/nexus/c [[2]] Specify the <<>> and <<>> for the project you want to create - [[3]] () Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.a) + [[3]] () Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.b) You can find new Share AMP project ready to go in the <<>> folder. diff --git a/archetypes/share-amp-archetype/src/site/apt/index.apt.vm b/archetypes/share-amp-archetype/src/site/apt/index.apt.vm index debe6bf0..32d4cc79 100644 --- a/archetypes/share-amp-archetype/src/site/apt/index.apt.vm +++ b/archetypes/share-amp-archetype/src/site/apt/index.apt.vm @@ -46,7 +46,7 @@ mvn archetype:generate -Dfilter=org.alfresco.maven.archetype: -DarchetypeCatalog [[2]] Specify the <<>> and <<>> for the project you want to create - [[3]] () Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.a) + [[3]] () Select Alfresco Version / Edition (current default is: Alfresco Community 5.0.b) You can find new Share AMP project ready to go in the <<>> folder. 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 2c0374e9..40a6db26 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 +alfresco_target_version=5.0.b $=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 +alfresco_target_amp_client_war_version=5.0.b 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 2c0374e9..40a6db26 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 +alfresco_target_version=5.0.b $=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 +alfresco_target_amp_client_war_version=5.0.b artifactId=basic diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml index 4d0052a7..64005d46 100644 --- a/plugins/alfresco-maven-plugin/pom.xml +++ b/plugins/alfresco-maven-plugin/pom.xml @@ -79,7 +79,7 @@ org.alfresco alfresco-mmt - 5.0.a + 5.0.b org.alfrescolabs.alfresco-technical-validation