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 56016ea186199d711fa75c191862dc33be0bec79..bb98a2d45535bfb2b33e5d4b9f57dc986d7dbd1b 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
@@ -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 7c7dd7d9a32c8cf51e87f82130e5cda551bcfc0e..71585df6809a277720fde1b4d07b336e7c770bf6 100644 (file)
--- 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 -->