diff options
| author | olivier lamy <olamy@apache.org> | 2016-03-01 22:08:43 +1100 |
|---|---|---|
| committer | olivier lamy <olamy@apache.org> | 2016-03-01 22:08:43 +1100 |
| commit | 95077dba05e56f29cc1bf4d69e37fa18cc253582 (patch) | |
| tree | 593912ad82cb3ce384da5bfa66eea7138573483e | |
| parent | f54872d6a7ba015d7f04f53ad192d6ffc7082399 (diff) | |
| download | archiva-95077dba05e56f29cc1bf4d69e37fa18cc253582.tar.gz archiva-95077dba05e56f29cc1bf4d69e37fa18cc253582.zip | |
enforce version in archetype
Signed-off-by: olivier lamy <olamy@apache.org>
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml | 11 |
2 files changed, 13 insertions, 1 deletions
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 @@ -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> |