From: Brett Porter <brett@apache.org>
Date: Wed, 30 Jul 2014 07:27:20 +0000 (+1000)
Subject: ensure works from clean repository
X-Git-Tag: archiva-2.1.1~22
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b0550f3fcf2d3979ae472a5927aeb1fcfbf138f1;p=archiva.git

ensure works from clean repository
---

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index fdcb1f874..2c5f95301 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -61,5 +61,11 @@
     <requiredProperty key="mockitoVersion">
       <defaultValue>${mockito.version}</defaultValue>
     </requiredProperty>
+    <requiredProperty key="httpclientVersion">
+      <defaultValue>${httpclient.version}</defaultValue>
+    </requiredProperty>
+    <requiredProperty key="httpcoreVersion">
+      <defaultValue>${httpclient.core.version}</defaultValue>
+    </requiredProperty>
   </requiredProperties>
 </archetype-descriptor>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
index a12b75d2d..c257ba208 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
@@ -38,6 +38,8 @@
     <guava.version>${guavaVersion}</guava.version>
     <springockito.version>${springockitoVersion}</springockito.version>
     <mockito.version>${mockitoVersion}</mockito.version>
+    <httpclient.version>${httpclientVersion}</httpclient.version>
+    <httpclient.core.version>${httpcoreVersion}</httpclient.core.version>
   </properties>
   <dependencies>
     <dependency>
@@ -164,6 +166,16 @@
         <artifactId>mockito-all</artifactId>
         <version>${mockito.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>${httpclient.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>${httpclient.core.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
index 68595074a..2cbbbbed5 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties
@@ -28,4 +28,6 @@ springVersion=${spring.version}
 guavaVersion=${guava.version}
 redbackRegistryVersion=${redback.registry.version}
 springockitoVersion=${springockito.version}
-mockitoVersion=${mockito.version}
\ No newline at end of file
+mockitoVersion=${mockito.version}
+httpclientVersion=${httpclient.version}
+httpcoreVersion=${httpclient.core.version}
\ No newline at end of file