continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r699165 - in /continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum: buildcontroller/DefaultBuildController.java execution/maven/m2/MavenTwoBuildExecutor.java
Date Fri, 26 Sep 2008 03:36:34 GMT
Author: ctan
Date: Thu Sep 25 20:36:34 2008
New Revision: 699165

URL: http://svn.apache.org/viewvc?rev=699165&view=rev
Log:
[CONTINUUM-1815] fixed scheduled builds of recently released projects

Modified:
    continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
    continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java

Modified: continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=699165&r1=699164&r2=699165&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
(original)
+++ continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
Thu Sep 25 20:36:34 2008
@@ -24,6 +24,7 @@
 import org.apache.continuum.dao.ProjectDao;
 import org.apache.maven.continuum.core.action.AbstractContinuumAction;
 import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
+import org.apache.maven.continuum.execution.ContinuumBuildExecutorConstants;
 import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
 import org.apache.maven.continuum.model.project.BuildDefinition;
 import org.apache.maven.continuum.model.project.BuildResult;
@@ -539,7 +540,8 @@
         }
 
         // Check changes
-        if ( !shouldBuild && !allChangesUnknown && !context.getScmResult().getChanges().isEmpty()
)
+        if ( !shouldBuild && ( ( !allChangesUnknown && !context.getScmResult().getChanges().isEmpty()
)
+             || project.getExecutorId().equals( ContinuumBuildExecutorConstants.MAVEN_TWO_BUILD_EXECUTOR
) ) )
         {
             try
             {

Modified: continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java?rev=699165&r1=699164&r2=699165&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
(original)
+++ continuum/branches/continuum-1.2.x/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
Thu Sep 25 20:36:34 2008
@@ -407,8 +407,25 @@
             return true;
         }
 
-        //check if changes are only in sub-modules or not
         MavenProject project = getMavenProject( continuumProject, workingDirectory, buildDefinition
);
+
+        //CONTINUUM-1815: additional check for projects recently released
+        if ( !continuumProject.getVersion().equals( project.getVersion() ) )
+        {
+            getLogger().info( "Found changes in project's version ( maybe project was recently
released ), building" );
+            return true;
+        }
+        
+        if ( changes.isEmpty() )
+        {
+            if ( getLogger().isDebugEnabled() )
+            {
+                getLogger().info( "Found no changes, not building" );
+            }
+            return false;
+        }
+        
+        //check if changes are only in sub-modules or not
         List<String> modules = project.getModules();
 
         List<ChangeFile> files = new ArrayList<ChangeFile>();



Mime
View raw message