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 20d6c3b0..c583fe9a 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
- 4.2.e
+ 4.3.0-SNAPSHOT
(not used)
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml
index af5333e0..66249186 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml
@@ -32,34 +32,33 @@
alfresco-solr
${alfresco.groupId}
+ config
${alfresco.version}
- zip
+ jar
-
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
- 1.7
-
- overlay-solr-war
+ copy-alfresco-solr
+ unpack
generate-resources
-
- run
-
-
-
-
-
+ ${alfresco.solr.war.overlay}
+
+
+ alfresco-solr
+ ${alfresco.groupId}
+ ${alfresco.version}
+ war
+
+
+
+
org.apache.maven.plugins
maven-resources-plugin
@@ -110,6 +109,7 @@
+
org.apache.maven.plugins
maven-antrun-plugin
@@ -130,6 +130,7 @@
+
org.apache.maven.plugins
maven-resources-plugin
@@ -163,8 +164,9 @@
${alfresco.groupId}
alfresco-solr
+ config
${alfresco.version}
- zip
+ jar
diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/it-4.2.e/archetype.properties b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/archetype.properties
similarity index 75%
rename from archetypes/alfresco-allinone-archetype/src/test/resources/projects/it-4.2.e/archetype.properties
rename to archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/archetype.properties
index 1fa289f5..a70796b1 100644
--- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/it-4.2.e/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=4.2.e
+alfresco_target_version=4.3.0-SNAPSHOT
diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/it-4.2.e/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/goal.txt
similarity index 100%
rename from archetypes/alfresco-allinone-archetype/src/test/resources/projects/it-4.2.e/goal.txt
rename to archetypes/alfresco-allinone-archetype/src/test/resources/projects/it/goal.txt
diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/archetype.properties b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/archetype.properties
similarity index 75%
rename from archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/archetype.properties
rename to archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/archetype.properties
index 1fa289f5..a70796b1 100644
--- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/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=4.2.e
+alfresco_target_version=4.3.0-SNAPSHOT
diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/goal.txt
similarity index 100%
rename from archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-4.2.e/goal.txt
rename to archetypes/alfresco-allinone-archetype/src/test/resources/projects/run/goal.txt
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 1c83bdda..f2dd30d6 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
- 4.2.e
+ 4.3.0-SNAPSHOT
alfresco
@@ -19,7 +19,7 @@
org.alfresco
- 4.2.e
+ 4.3.0-SNAPSHOT
(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 8892a4eb..463eef0f 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=4.2.e
+alfresco_target_version=4.3.0-SNAPSHOT
$=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=4.2.e
+alfresco_target_amp_client_war_version=4.3.0-SNAPSHOT
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 8892a4eb..463eef0f 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=4.2.e
+alfresco_target_version=4.3.0-SNAPSHOT
$=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=4.2.e
+alfresco_target_amp_client_war_version=4.3.0-SNAPSHOT
artifactId=basic
diff --git a/plugins/alfresco-maven-plugin/pom.xml b/plugins/alfresco-maven-plugin/pom.xml
index de392350..02094ce1 100644
--- a/plugins/alfresco-maven-plugin/pom.xml
+++ b/plugins/alfresco-maven-plugin/pom.xml
@@ -79,7 +79,7 @@
org.alfresco
alfresco-mmt
- 4.2.e
+ 4.3.0-SNAPSHOT
diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index 62549d61..d9202108 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -37,7 +37,7 @@
| For available versions please search on https://artifacts.alfresco.com/nexus/index.html
-->
org.alfresco
- 4.2.e
+ 4.3.0-SNAPSHOT
- ${app.amp.test.output.folder}
+
@@ -480,20 +480,6 @@
3.0.6.RELEASE
provided
-
- ${alfresco.groupId}
- alfresco-repository
- ${alfresco.version}
- config
- provided
-
-
- ${alfresco.groupId}
- alfresco-data-model
- ${alfresco.version}
- config
- provided
-
@@ -681,6 +667,11 @@
jcl-over-slf4j
1.5.11
+
+ org.slf4j
+ slf4j-log4j12
+ 1.5.11
+