Merge pull request #882 from jsight/WINDUP-965

WINDUP-965: Windup will suggest loading CR versions of rules even if …
windup · Apr 21, 2016 · 0da4067 · 0da4067
2 parents 3f7f545 + 0bd5d87
commit 0da4067
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/exec/api/src/main/java/org/jboss/windup/exec/updater/RulesetsUpdater.java b/exec/api/src/main/java/org/jboss/windup/exec/updater/RulesetsUpdater.java
@@ -7,6 +7,7 @@
 import java.util.logging.Logger;
 import javax.inject.Inject;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
 import org.jboss.forge.addon.dependencies.Coordinate;
 import org.jboss.forge.addon.dependencies.Dependency;
 import org.jboss.forge.addon.dependencies.DependencyException;
@@ -123,11 +124,14 @@ public Coordinate getLatestReleaseOf(final CoordinateBuilder coord)
     {
         List<Coordinate> availableVersions = depsResolver.resolveVersions(DependencyQueryBuilder.create(coord));
 
-        // Find the latest non-SNAPSHOT version.
+        // Find the latest non-SNAPSHOT and non-CR version.
         for(int i = availableVersions.size()-1; i >= 0; i--)
         {
-            if(!availableVersions.get(i).isSnapshot())
-                return availableVersions.get(i);
+            Coordinate availableCoord = availableVersions.get(i);
+            String versionStr = availableCoord.getVersion();
+
+            if(versionStr != null && !availableCoord.isSnapshot() && !versionStr.matches(".*CR[0-9]$"))
+                return availableCoord;
         }
         return null;
     }

diff --git a/ui/addon/src/main/java/org/jboss/windup/ui/RulesetUpdateChecker.java b/ui/addon/src/main/java/org/jboss/windup/ui/RulesetUpdateChecker.java
@@ -21,15 +21,10 @@ public class RulesetUpdateChecker
     @Inject
     Furnace furnace;
 
-    //@Inject // FORGE-2408
-    //RulesetsUpdater updater;
-
     public void perform(@Observes PostStartup event)
     {
         if (!event.getAddon().getId().getName().contains("org.jboss.windup.ui:windup-ui"))
             return;
-
-
         RulesetsUpdater updater = furnace.getAddonRegistry().getServices(RulesetsUpdater.class).get();
 
         if (!event.getAddon().getRepository().isDeployed(AddonId.from("org.jboss.windup.exec:windup-exec", event.getAddon().getId().getVersion())))