From: olivier lamy <olamy@apache.org>
Date: Tue, 1 Mar 2016 11:08:43 +0000 (+1100)
Subject: enforce version in archetype
X-Git-Tag: archiva-2.2.1~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=95077dba05e56f29cc1bf4d69e37fa18cc253582;p=archiva.git

enforce version in archetype

Signed-off-by: olivier lamy <olamy@apache.org>
---

diff --git a/.gitignore b/.gitignore
index 992468484..d5addebb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ build
 .idea
 *.ipr
 *.iws
+out/
 
 #jenv
 .java-version
@@ -21,4 +22,4 @@ build
 
 #netbeans file
 nbactions.xml
-nb-configuration.xml
\ No newline at end of file
+nb-configuration.xml
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 64a39f63c..b4ce052e8 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
@@ -126,6 +126,17 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context-support</artifactId>
+      <version>${spring.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>