svn commit: r1199336 - in /archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype: pom.xml src/main/resources/archetype-resources/pom.xml

[ol...@apache.org]

Author: olamy
Date: Tue Nov  8 16:47:11 2011
New Revision: 1199336

URL: http://svn.apache.org/viewvc?rev=1199336&view=rev
Log:
configure archetype test to run with an empty repo to ensure all artifacts are available
use archetype 2.2-SNAPSHOT which has those features.

Modified:
    archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
    archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml?rev=1199336&r1=1199335&r2=1199336&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml Tue Nov  8 16:47:11 2011
@@ -45,14 +45,18 @@
       <extension>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-packaging</artifactId>
-        <version>2.1</version>
+        <version>2.2-SNAPSHOT</version>
       </extension>
     </extensions>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-archetype-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.2-SNAPSHOT</version>
+        <configuration>
+          <settingsFile>${basedir}/src/test/test-settings.xml</settingsFile>
+          <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath>
+        </configuration>
       </plugin>
     </plugins>
   </build>

Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml?rev=1199336&r1=1199335&r2=1199336&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml Tue Nov  8 16:47:11 2011
@@ -150,8 +150,7 @@
             <appserver.base>${project.build.directory}/appserver-base</appserver.base>
             <archiva.user.configFileName>${basedir}/target/archiva.xml</archiva.user.configFileName>
             <test.resources.path>${project.build.testOutputDirectory}</test.resources.path>
-            <!-- restore when we will be able to use a derby in memory database -->
-            <!--redback.jdbc.url>jdbc:derby:memory:users-test;create=true</redback.jdbc.url-->
+            <redback.jdbc.url>jdbc:derby:memory:users-test;create=true</redback.jdbc.url>
             <redback.jdbc.driver.name>org.apache.derby.jdbc.EmbeddedDriver</redback.jdbc.driver.name>
           </systemPropertyVariables>
         </configuration>