use mock in consumer archetype
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/1127e2af Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/1127e2af Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/1127e2af Branch: refs/heads/master Commit: 1127e2afcef2b2a927d484c7f7277de7032d85ce Parents: e62d96a Author: Olivier Lamy <[email protected]> Authored: Thu Oct 1 14:53:41 2015 +1000 Committer: Olivier Lamy <[email protected]> Committed: Thu Oct 1 14:53:41 2015 +1000 ---------------------------------------------------------------------- .../archetype-resources/src/test/resources/spring-context.xml | 3 +-- .../src/main/resourcesstatic/archetype-resources/pom.xml | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/1127e2af/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml index f17d5b4..8a12f3a 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml @@ -28,7 +28,6 @@ <mockito:mock id="mockManagedRepositoryAdmin" class="org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin" /> <mockito:mock id="mockRemoteRepositoryAdmin" class="org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin" /> - <mockito:mock id="mockRepositorySessionFactory" class="org.apache.archiva.metadata.repository.RepositorySessionFactory" /> - <alias alias="repositorySessionFactory#jcr" name="mockRepositorySessionFactory" /> + <alias alias="repositorySessionFactory#jcr" name="repositorySessionFactory#mock" /> </beans> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/archiva/blob/1127e2af/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 6c2c9b3..6acfc76 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 @@ -73,6 +73,12 @@ <version>${archiva.version}</version> </dependency> <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-mock</artifactId> + <version>${archiva.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva.redback.components.registry</groupId> <artifactId>spring-registry-api</artifactId> <version>${redback.registry.version}</version>
