From 0bd5d8778573c292a7ceba473fc5479dd9902184 Mon Sep 17 00:00:00 2001 From: Jess Sightler Date: Wed, 20 Apr 2016 16:25:07 -0400 Subject: [PATCH] WINDUP-965: Windup will suggest loading CR versions of rules even if the installed version is a .Final version --- .../org/jboss/windup/exec/updater/RulesetsUpdater.java | 10 +++++++--- .../java/org/jboss/windup/ui/RulesetUpdateChecker.java | 5 ----- 2 files changed, 7 insertions(+), 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 index 21d079eaaf..b6aac4b531 100644 --- 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 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 index a8fcff73f7..1dc9dc9599 100644 --- 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())))