From 453aa91cfe89c1b3168149322baa32521217b98a Mon Sep 17 00:00:00 2001 From: Reza Rahman Date: Sun, 9 Jun 2024 18:22:49 -0400 Subject: [PATCH 1/2] Update Project.java --- ui/src/main/java/org/eclipse/starter/ui/Project.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ui/src/main/java/org/eclipse/starter/ui/Project.java b/ui/src/main/java/org/eclipse/starter/ui/Project.java index 5d4487e..046ce0b 100644 --- a/ui/src/main/java/org/eclipse/starter/ui/Project.java +++ b/ui/src/main/java/org/eclipse/starter/ui/Project.java @@ -34,9 +34,7 @@ public class Project implements Serializable { private static final Map RUNTIMES = Map.ofEntries(entry("glassfish", "GlassFish"), entry("open-liberty", "Open Liberty"), entry("payara", "Payara"), entry("tomee", "TomEE"), entry("wildfly", "WildFly")); - - private static final String DEFAULT_GROUPID = "org.eclipse";; - + private static final String DEFAULT_GROUPID = "org.eclipse"; private static final String DEFAULT_ARTIFACTID = "jakartaee-hello-world"; private static Map cache = new ConcurrentHashMap<>(); From 3ab47ce5c067e7b9bf416f9b0797859318748120 Mon Sep 17 00:00:00 2001 From: Reza Rahman Date: Sun, 9 Jun 2024 18:32:46 -0400 Subject: [PATCH 2/2] Update Project.java --- ui/src/main/java/org/eclipse/starter/ui/Project.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/main/java/org/eclipse/starter/ui/Project.java b/ui/src/main/java/org/eclipse/starter/ui/Project.java index 046ce0b..1fb5d00 100644 --- a/ui/src/main/java/org/eclipse/starter/ui/Project.java +++ b/ui/src/main/java/org/eclipse/starter/ui/Project.java @@ -400,7 +400,7 @@ public void generate() { LOGGER.info("Downloading zip file."); downloadZip(new File(workingDirectory, artifactId + ".zip")); - // caching makes only sense if defaults weren't changed since otherwise it's unlikely to hit cache + // Caching makes only sense if defaults weren't changed since otherwise it's unlikely to hit cache. if (groupId.equals(DEFAULT_GROUPID) && artifactId.equals(DEFAULT_ARTIFACTID)) { LOGGER.info("Caching output."); cache.put(getCacheKey(), workingDirectory.getAbsolutePath()); @@ -420,7 +420,7 @@ public void generate() { } private String getCacheKey() { - return jakartaVersion + ":" + profile + ":" + javaVersion + ":" + docker + ":" + runtime; + return jakartaVersion + ":" + profile + ":" + javaVersion + ":" + docker + ":" + runtime + ":" + groupId + ":" + artifactId; } private void downloadZip(File zip) {