archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject archiva git commit: enforce version in archetype
Date Tue, 01 Mar 2016 23:14:32 GMT
Repository: archiva
Updated Branches:
  refs/heads/master f54872d6a -> 95077dba0


enforce version in archetype

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


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/95077dba
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/95077dba
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/95077dba

Branch: refs/heads/master
Commit: 95077dba05e56f29cc1bf4d69e37fa18cc253582
Parents: f54872d
Author: olivier lamy <olamy@apache.org>
Authored: Tue Mar 1 22:08:43 2016 +1100
Committer: olivier lamy <olamy@apache.org>
Committed: Tue Mar 1 22:08:43 2016 +1100

----------------------------------------------------------------------
 .gitignore                                               |  3 ++-
 .../src/main/resourcesstatic/archetype-resources/pom.xml | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/95077dba/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9924684..d5addeb 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

http://git-wip-us.apache.org/repos/asf/archiva/blob/95077dba/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.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 64a39f6..b4ce052 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
@@ -128,6 +128,17 @@
     </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>
       <version>${spring.version}</version>
       <exclusions>


Mime
View raw message