Merge pull request #32 from jGauravGupta/FISH-7932

FISH-9458 IntelliJ IDEA 2024.2.x upgrade
payara · Aug 15, 2024 · ffa5d4a · ffa5d4a
2 parents 929f98b + eed13b4
commit ffa5d4a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ apply plugin: 'idea'
 apply plugin: 'java'
 
 group 'fish.payara.micro.intellij'
-version '1.9.0-SNAPSHOT'
+version '1.9.0'
 
 sourceCompatibility = "17"
 targetCompatibility = "17"
@@ -29,15 +29,14 @@ dependencies {
 }
 
 intellij {
-    version = '241.14494.240'
+    version = '242.20224.387'
     type = 'IC'
     pluginName = 'Payara IntelliJ Community Tools'
     plugins = ['java', 'maven', 'maven-model', 'gradle', 'terminal']
 }
 
 patchPluginXml {
-    sinceBuild = "241.14494"
-    untilBuild = "241.*"
+    sinceBuild = "242.20224"
 }
 
 publishPlugin {

diff --git a/src/main/java/fish/payara/cloud/maven/CloudMavenProject.java b/src/main/java/fish/payara/cloud/maven/CloudMavenProject.java
@@ -45,7 +45,7 @@ public class CloudMavenProject extends PayaraCloudProject {
 
     public static final String CLOUD_GROUP_ID = "fish.payara.maven.plugins";
     public static final String CLOUD_ARTIFACT_ID = "payara-cloud-maven-plugin";
-    public static final String CLOUD_VERSION = "1.0-Alpha3";
+    public static final String CLOUD_VERSION = "1.0-Alpha4";
     public static final String CLOUD_PLUGIN = "payara-cloud";
     public static final String START_GOAL = "start";
     public static final String LOGIN_GOAL = "login";

diff --git a/src/main/java/fish/payara/cloud/maven/CloudPanel.java b/src/main/java/fish/payara/cloud/maven/CloudPanel.java
@@ -326,7 +326,6 @@ private void updateMavenProperties() {
             mavenProperties.remove(CloudMavenProject.SUBSCRIPTION_ATTR);
         }
 
-        System.out.println("applicationName " + applicationName);
         if (applicationName != null && !applicationName.trim().isEmpty()) {
             mavenProperties.put(CloudMavenProject.APPLICATION_NAME_ATTR, applicationName);
         } else {

diff --git a/src/main/java/fish/payara/micro/project/PayaraMicroProjectWizardStep.java b/src/main/java/fish/payara/micro/project/PayaraMicroProjectWizardStep.java
@@ -42,17 +42,21 @@ public class PayaraMicroProjectWizardStep extends ModuleWizardStep {
     private JTextField contextRootTextField;
     private JComboBox<String> microVersionComboBox;
 
-    public static final String[] ARCHETYPE_MICRO_VERSIONS = new String[]{
-            "6.2023.2", "6.2023.1", "6.2022.2", "6.2022.1",
-            "5.2022.5", "5.2022.4", "5.2022.3",
-            "5.2022.2", "5.2022.1", "5.2021.10",
-            "5.2021.9", "5.2021.8", "5.2021.7",
-            "5.2021.6", "5.2021.5", "5.2021.4",
-            "5.2021.3", "5.2021.2", "5.2021.1",
-            "5.2020.7", "5.2020.6", "5.2020.5",
-            "5.2020.4", "5.2020.3", "5.2020.2",
-            "5.201", "5.194", "5.193.1", "5.192",
-            "5.191", "5.184", "5.183", "5.182", "5.181"};
+    public static final String[] ARCHETYPE_MICRO_VERSIONS = new String[] {
+        "6.2024.7", "6.2024.6", "6.2024.5", "6.2024.4",
+        "6.2024.3", "6.2024.2", "6.2024.1", "6.2023.12",
+        "6.2023.11", "6.2023.10", "6.2023.9", "6.2023.8",
+        "6.2023.7", "6.2023.6", "6.2023.5", "6.2023.4",
+        "6.2023.3", "6.2023.2", "6.2023.1", "6.2022.2",
+        "6.2022.1", "5.2023.1", "5.2022.5", "5.2022.4",
+        "5.2022.3", "5.2022.2", "5.2022.1", "5.2021.10",
+        "5.2021.9", "5.2021.8", "5.2021.7", "5.2021.6",
+        "5.2021.5", "5.2021.4", "5.2021.3", "5.2021.2",
+        "5.2021.1", "5.2020.7", "5.2020.6", "5.2020.5",
+        "5.2020.4", "5.2020.3", "5.2020.2", "5.201",
+        "5.194", "5.193.1", "5.192", "5.191", "5.184",
+        "5.183", "5.182", "5.181"
+    };
 
     private static final Pattern GROUP_ID_PATTERN = Pattern.compile("^[a-z0-9_]+(\\.[a-z0-9_]+)*$");
     private static final Pattern ARTIFACT_ID_PATTERN = Pattern.compile("^[a-z0-9_]+([\\-\\.][a-z0-9_]+)*$");

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -1,11 +1,11 @@
 <idea-plugin>
     <id>fish.payara.micro.intellij</id>
-    <name>Payara IntelliJ Community Tools</name>
+    <name>Payara Community Tools</name>
     <description><![CDATA[
-        Payara IntelliJ Community plugin allows developer to create, run, and
+        Payara Community plugin allows developer to create, run, and
         debug the Payara Micro applications from the Intellij IDEA.
 
-        The following features are available in the Payara IntelliJ Community tools:
+        The following features are available in the Payara Community tools:
         <ul>
             <li>Creation of Payara Micro Maven Project</li>
             <li>Manage(Start, Stop, and Debug) Payara Micro application using project configuration</li>