Bump to 4.3.0-SNAPSHOT

- Fix Solr re-packaging for all-in-one
 - Remove config artifacts
 - Initial Share AMP archetype 


git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@737 04253f4f-3451-0410-a141-5562f1e59037

archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -10,7 +10,7 @@
       <defaultValue>org.alfresco</defaultValue>
     </requiredProperty>
     <requiredProperty key="alfresco_target_version">
-      <defaultValue>4.2.e</defaultValue>
+      <defaultValue>4.3.0-SNAPSHOT</defaultValue>
     </requiredProperty>
     <requiredProperty key="package">
       <defaultValue>(not used)</defaultValue>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/solr/pom.xml

@@ -32,34 +32,33 @@
                                 <artifactItem>
                                     <artifactId>alfresco-solr</artifactId>
                                     <groupId>${alfresco.groupId}</groupId>
+                                    <classifier>config</classifier>
                                     <version>${alfresco.version}</version>
-                                    <type>zip</type>
+                                    <type>jar</type>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
                     <execution>
-                        <id>overlay-solr-war</id>
+                        <id>copy-alfresco-solr</id>
+                        <goals><goal>unpack</goal></goals>
                         <phase>generate-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
                         <configuration>
-                            <tasks>
+                            <outputDirectory>${alfresco.solr.war.overlay}</outputDirectory>
-                                <echo message="Unpacking Apache Solr for web.xml overlay" />
+                            <artifactItems>
-                                <unzip src="${alfresco.solr.dir}/apache-solr-1.4.1.war" dest="${alfresco.solr.war.overlay}" />
+                                <artifactItem>
-                            </tasks>
+                                    <artifactId>alfresco-solr</artifactId>
+                                    <groupId>${alfresco.groupId}</groupId>
+                                    <version>${alfresco.version}</version>
+                                    <type>war</type>
+                                </artifactItem>
+                            </artifactItems>
                         </configuration>
                     </execution>
+
                 </executions>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -110,6 +109,7 @@
                     </replacements>
                 </configuration>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -130,6 +130,7 @@
                     </execution>
                 </executions>
             </plugin>
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
@@ -163,8 +164,9 @@
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>alfresco-solr</artifactId>
+            <classifier>config</classifier>
             <version>${alfresco.version}</version>
-            <type>zip</type>
+            <type>jar</type>
         </dependency>
     </dependencies>
 

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

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

archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -10,7 +10,7 @@
       <defaultValue>org.alfresco</defaultValue>
     </requiredProperty>
     <requiredProperty key="alfresco_target_version">
-      <defaultValue>4.2.e</defaultValue>
+      <defaultValue>4.3.0-SNAPSHOT</defaultValue>
     </requiredProperty>
     <requiredProperty key="alfresco_target_amp_client_war">
       <defaultValue>alfresco</defaultValue>
@@ -19,7 +19,7 @@
       <defaultValue>org.alfresco</defaultValue>
     </requiredProperty>
     <requiredProperty key="alfresco_target_amp_client_war_version">
-      <defaultValue>4.2.e</defaultValue>
+      <defaultValue>4.3.0-SNAPSHOT</defaultValue>
     </requiredProperty>
     <requiredProperty key="package">
       <defaultValue>(not used)</defaultValue>

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

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

plugins/alfresco-maven-plugin/pom.xml

@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-mmt</artifactId>
-      <version>4.2.e</version>
+      <version>4.3.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

poms/alfresco-sdk-parent/pom.xml

@@ -37,7 +37,7 @@
         | For available versions please search on https://artifacts.alfresco.com/nexus/index.html
         -->
     <alfresco.groupId>org.alfresco</alfresco.groupId>
-    <alfresco.version>4.2.e</alfresco.version>
+    <alfresco.version>4.3.0-SNAPSHOT</alfresco.version>
 
     <!--  Values can be "alfresco" or "share". Default value is 'alfresco' assuming you are developing a repository AMP, change to share for share AMPs 
         | This impact (in AMP projects) the choice of the WAR project for embedded run
@@ -443,7 +443,7 @@
                   <argLine>${app.testing.jvm.args}</argLine>
                   <additionalClasspathElements>
                       <!-- Adds the previously built ${app.amp.test.output.folder} to test classpath to enable module installation at test time -->
-                      <additionalClasspathElement>${app.amp.test.output.folder}</additionalClasspathElement>
+                      <!-- <additionalClasspathElement>${app.amp.test.output.folder}</additionalClasspathElement> -->
                   </additionalClasspathElements>
               </configuration>
             </plugin>
@@ -480,20 +480,6 @@
               <version>3.0.6.RELEASE</version>
               <scope>provided</scope>
           </dependency>
-          <dependency>
-              <groupId>${alfresco.groupId}</groupId>
-              <artifactId>alfresco-repository</artifactId>
-              <version>${alfresco.version}</version>
-              <classifier>config</classifier>
-              <scope>provided</scope>
-          </dependency>
-          <dependency>
-              <groupId>${alfresco.groupId}</groupId>
-              <artifactId>alfresco-data-model</artifactId>
-              <version>${alfresco.version}</version>
-              <classifier>config</classifier>
-              <scope>provided</scope>
-          </dependency>
       </dependencies>
     </profile>
     
@@ -681,6 +667,11 @@
             <artifactId>jcl-over-slf4j</artifactId>
             <version>1.5.11</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.5.11</version>
+        </dependency>
       </dependencies>
     </profile>