From: Martin Stockhammer <martin.stockhammer@ars.de>
Date: Wed, 15 Nov 2017 21:17:32 +0000 (+0100)
Subject: Trying to fix the archetype error on ci-build
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bc9256ad08b61b100693fe6c266f6fed579987af;p=archiva.git

Trying to fix the archetype error on ci-build
---

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 56016ea18..bb98a2d45 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
@@ -64,7 +64,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-repository-layer</artifactId>
+      <artifactId>archiva-repository-api</artifactId>
       <version>${archiva.version}</version>
     </dependency>
     <dependency>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/ehcache.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/ehcache.xml
index 7c7dd7d9a..71585df68 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/ehcache.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/ehcache.xml
@@ -17,7 +17,7 @@
   ~ under the License.
   -->
 <ehcache>
-  <diskStore path="java.io.tmpdir" />
+  <diskStore path="java.io.tmpdir/archiva-ehcache" />
 
   <!-- make default cache very short lived -->