Repository: archiva Updated Branches: refs/heads/master 8a131a614 -> bc9256ad0
Trying to fix the archetype error on ci-build Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/bc9256ad Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/bc9256ad Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/bc9256ad Branch: refs/heads/master Commit: bc9256ad08b61b100693fe6c266f6fed579987af Parents: 8a131a6 Author: Martin Stockhammer <martin.stockham...@ars.de> Authored: Wed Nov 15 22:17:32 2017 +0100 Committer: Martin Stockhammer <martin.stockham...@ars.de> Committed: Wed Nov 15 22:17:32 2017 +0100 ---------------------------------------------------------------------- .../src/main/resourcesstatic/archetype-resources/pom.xml | 2 +- .../archiva-web/archiva-webapp/src/main/resources/ehcache.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/bc9256ad/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 56016ea..bb98a2d 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> http://git-wip-us.apache.org/repos/asf/archiva/blob/bc9256ad/archiva-modules/archiva-web/archiva-webapp/src/main/resources/ehcache.xml ---------------------------------------------------------------------- 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 7c7dd7d..71585df 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 -->