[jboss-cvs] jbossbuild/src/main/org/jboss/ant/tasks/build ...

[Ruel Loehr]

  User: rloehr  
  Date: 06/07/25 12:36:45

  Modified:    src/main/org/jboss/ant/tasks/build  Tag: BRANCH_JBBUILD_DEV
                        SynchronizeComponentsTask.java
  Log:
  add logic so that compatibilities are assumed to be compatible
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.9.2.1   +13 -9     jbossbuild/src/main/org/jboss/ant/tasks/build/SynchronizeComponentsTask.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SynchronizeComponentsTask.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossbuild/src/main/org/jboss/ant/tasks/build/SynchronizeComponentsTask.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -b -r1.9 -r1.9.2.1
  --- SynchronizeComponentsTask.java	10 Aug 2005 20:05:28 -0000	1.9
  +++ SynchronizeComponentsTask.java	25 Jul 2006 16:36:45 -0000	1.9.2.1
  @@ -34,7 +34,7 @@
    * Task to synchronize third party dependencies.
    * 
    * @author <a href="ruel.loehr at jboss.com">Ruel Loehr </a>
  - * @version $Revision: 1.9 $
  + * @version $Revision: 1.9.2.1 $
    */
   public class SynchronizeComponentsTask extends BuildTask
   {
  @@ -171,6 +171,9 @@
               SortedSet oldVersions = currentComponentRef.getCompatibleVersions();
               if ( oldVersions != null && oldVersions.contains(newVersionInfo) == false )
               {
  +               //if the component is a snapshot, we assume that it is compatible
  +               if (!newVersionInfo.getVersion().toString().equalsIgnoreCase("snapshot"))
  +               {                         
                  String newCompID = newComponent.getId();
                  String importCompID = currentComponentRef.getImportingComponent().getId();
                  throw new BuildException("A versioning problem exists:\n"
  @@ -180,6 +183,7 @@
                     + "\n by: "+importCompID);
               }
            }         
  +         }         
    
            //determine if this component is already present in the build,
            //if it is not, then add it to build's component list