enforce version in archetype

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

diff --git a/.gitignore b/.gitignore
index 992468484600022ad29878c6583c164b3850905f..d5addebb30b8b33bf2480a4e259222a2d72d3f05 100644 (file)
--- 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 64a39f63cc044d5a8eccb63a0baec923ad136d0c..b4ce052e8d19e00fe10212945c3d929822194bd5 100644 (file)
--- 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>