fix test

Signed-off-by: olivier lamy <ol...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/88fccc84
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/88fccc84
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/88fccc84

Branch: refs/heads/master
Commit: 88fccc84f063dbff56a13d68a170e9fbe124829f
Parents: 789f879
Author: olivier lamy <ol...@apache.org>
Authored: Mon Aug 14 21:38:49 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Mon Aug 14 21:38:49 2017 +1000

----------------------------------------------------------------------
 archiva-modules/archiva-web/archiva-web-common/pom.xml         | 1 +
 .../org/apache/archiva/TestRepositorySessionFactoryBean.java   | 6 ++++++
 .../src/test/resources/spring-context-with-jcr.xml             | 5 ++---
 3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/88fccc84/archiva-modules/archiva-web/archiva-web-common/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml 
b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 1c58772..92c056d 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -494,6 +494,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <reuseForks>false</reuseForks>
           <argLine>-Xms1024m -Xmx2048m -server -XX:MaxPermSize=256m 
@{jacocoproperty}</argLine>
           <systemPropertyVariables>
             
<appserver.base>${project.build.directory}/appserver-base</appserver.base>

http://git-wip-us.apache.org/repos/asf/archiva/blob/88fccc84/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/TestRepositorySessionFactoryBean.java
----------------------------------------------------------------------
diff --git 
a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/TestRepositorySessionFactoryBean.java
 
b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/TestRepositorySessionFactoryBean.java
index 880ac94..82bd360 100644
--- 
a/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/TestRepositorySessionFactoryBean.java
+++ 
b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/TestRepositorySessionFactoryBean.java
@@ -58,4 +58,10 @@ public class TestRepositorySessionFactoryBean
         logger.info( "create RepositorySessionFactory instance of {}", 
repositorySessionFactory.getClass().getName() );
         return repositorySessionFactory;
     }
+
+    @Override
+    public String getId()
+    {
+        return this.beanId;
+    }
 }

http://git-wip-us.apache.org/repos/asf/archiva/blob/88fccc84/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
----------------------------------------------------------------------
diff --git 
a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
 
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
index 6b72d33..f29dbcb 100644
--- 
a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
+++ 
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
@@ -21,11 +21,10 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans";
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-       xmlns:context="http://www.springframework.org/schema/context"; 
xmlns:tx="http://www.springframework.org/schema/tx";
+       xmlns:tx="http://www.springframework.org/schema/tx";
        xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-           http://www.springframework.org/schema/context 
-           
http://www.springframework.org/schema/context/spring-context-3.0.xsd 
http://www.springframework.org/schema/tx 
http://www.springframework.org/schema/tx/spring-tx.xsd";
+           http://www.springframework.org/schema/tx 
http://www.springframework.org/schema/tx/spring-tx.xsd";
        default-lazy-init="true">
 
   <!--

Reply via email to