gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r1658643 - /gump/live/python/gump/core/build/mvn.py
Date Tue, 10 Feb 2015 08:58:57 GMT
Author: bodewig
Date: Tue Feb 10 08:58:56 2015
New Revision: 1658643

URL: http://svn.apache.org/r1658643
Log:
make mvn builder use the local_mvn_repo function extracted for gradle

Modified:
    gump/live/python/gump/core/build/mvn.py

Modified: gump/live/python/gump/core/build/mvn.py
URL: http://svn.apache.org/viewvc/gump/live/python/gump/core/build/mvn.py?rev=1658643&r1=1658642&r2=1658643&view=diff
==============================================================================
--- gump/live/python/gump/core/build/mvn.py (original)
+++ gump/live/python/gump/core/build/mvn.py Tue Feb 10 08:58:56 2015
@@ -23,7 +23,7 @@ from gump.actor.mvnrepoproxy.proxycontro
 from gump.core.model.builder import MVN_VERSION2, MVN_VERSION3
 from gump.core.model.workspace import CommandWorkItem, \
     REASON_BUILD_FAILED, REASON_BUILD_TIMEDOUT, REASON_PREBUILD_FAILED, \
-    STATE_FAILED, STATE_SUCCESS,  WORK_TYPE_BUILD
+    STATE_FAILED, STATE_SUCCESS, WORK_TYPE_BUILD
 from gump.core.run.gumprun import RunSpecific
 from gump.util.file import FILE_TYPE_CONFIG
 from gump.util.process.command import Cmd, CMD_STATE_SUCCESS, \
@@ -238,7 +238,7 @@ class MavenBuilder(RunSpecific):
                                    + ']')
 
         if needsSeparateLocalRepository(project):
-            localRepositoryDir = self.locateLocalRepo(project)
+            localRepositoryDir = local_mvn_repo(project, project.mvn)
         else:
             localRepositoryDir = os.path.abspath(\
                 os.path.join(self.run.getWorkspace()
@@ -290,14 +290,3 @@ class MavenBuilder(RunSpecific):
 
         return settingsFile
 
-    def locateLocalRepo(self, project):
-        #
-        # Where to put the local repository
-        #
-        name = project.mvn.getLocalRepositoryName()
-        if not name:
-            name = project.getName() + ".mvnlocalrepo"
-        return os.path.abspath(os.path.join(self.run.getWorkspace()\
-                                                .getLocalRepositoryDirectory(),
-                                            name
-                                            ))



Mime
View raw message