diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2018-05-02 23:10:06 +0200 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2018-05-02 23:10:06 +0200 |
| commit | 214bdc43609d31780f2946526c2fc8fd2d146e48 (patch) | |
| tree | a365caf543bdd27937ebc85a697f2063a3deb1eb /archiva-modules | |
| parent | 3732f2e072260dae71325067a5402fb1306d7b0b (diff) | |
| download | archiva-214bdc43609d31780f2946526c2fc8fd2d146e48.tar.gz archiva-214bdc43609d31780f2946526c2fc8fd2d146e48.zip | |
Fixing build and test configuration
Diffstat (limited to 'archiva-modules')
3 files changed, 3 insertions, 3 deletions
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml index b151a4efb..2acfa799b 100644 --- a/archiva-modules/plugins/maven2-repository/pom.xml +++ b/archiva-modules/plugins/maven2-repository/pom.xml @@ -293,7 +293,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <systemPropertyVariables> - <appserver.base>${project.build.directory}/test-repository</appserver.base> + <appserver.base>${project.build.directory}/appserver-base</appserver.base> </systemPropertyVariables> </configuration> </plugin> diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java index 95084a533..ac24a3462 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java @@ -121,7 +121,7 @@ public class TestConfiguration StringUtils.isNotEmpty(configuration.getArchivaRuntimeConfiguration().getDataDirectory())) { return Paths.get(configuration.getArchivaRuntimeConfiguration().getDataDirectory()); } else { - return getAppServerBaseDir().resolve(""); + return getAppServerBaseDir().resolve("data"); } } } diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java index 2a4bbe7f5..338c2272a 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java @@ -578,7 +578,7 @@ public class Maven2RepositoryMetadataResolverTest public void testGetRootNamespaces() throws Exception { - assertEquals( Arrays.asList( "com", "org", "remotes"), storage.listRootNamespaces( TEST_REPO_ID, ALL ) ); + assertEquals( Arrays.asList( "com", "org"), storage.listRootNamespaces( TEST_REPO_ID, ALL ) ); } @Test |