diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-09-18 22:00:57 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-09-18 22:00:57 +0000 |
| commit | 2103f2d60f5b0e763a526de867afd37404a50b56 (patch) | |
| tree | e345fa2ec1be80dcb847651f1ac3b4c3b2711daf /archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml | |
| parent | cfb78daaaada7ffde4d03f0c4943e51f5c1f8fdb (diff) | |
| download | archiva-2103f2d60f5b0e763a526de867afd37404a50b56.tar.gz archiva-2103f2d60f5b0e763a526de867afd37404a50b56.zip | |
finish unit test for getMergeConflictedArtifacts rest method
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1387384 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 55ad0eaab..3973d3a73 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -396,6 +396,11 @@ <version>${tomcat7Version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-metadata-consumer</artifactId> + <scope>test</scope> + </dependency> </dependencies> @@ -408,10 +413,9 @@ <configuration> <excludes> <exclude>src/test/repo-with-osgi/**</exclude> + <exclude>src/test/repo-with-osgi-stage/**</exclude> <exclude>src/test/repo-with-classifier-only/**</exclude> <exclude>src/test/repo-with-snapshots/**</exclude> - <exclude>src/test/resources/target-repo/**</exclude> - <exclude>src/test/resources/test-repository-stage/**</exclude> </excludes> </configuration> </plugin> @@ -443,30 +447,13 @@ <redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url> <redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name> <basedir>${basedir}</basedir> + <builddir>${project.build.directory}</builddir> <org.apache.jackrabbit.maxCacheMemory>1</org.apache.jackrabbit.maxCacheMemory> <org.apache.jackrabbit.maxMemoryPerCache>1</org.apache.jackrabbit.maxMemoryPerCache> <!--org.apache.jackrabbit.minMemoryPerCache>1</org.apache.jackrabbit.minMemoryPerCache--> </systemPropertyVariables> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>test-repository</id> - <phase>generate-test-resources</phase> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <includeArtifactIds>test-repository</includeArtifactIds> - <outputDirectory>target/test-repository</outputDirectory> - <excludes>META-INF/**</excludes> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> |