FISH-7083 Eclipse IDE support Maven Archetype 1.x/2.x release binary for respective Payara Micro 5.x/6.x

Author: jGauravGupta

bundles/fish.payara.eclipse.tools.micro/src/fish/payara/eclipse/tools/micro/ui/MicroProjectTab.java

@@ -9,6 +9,7 @@
  */
 package fish.payara.eclipse.tools.micro.ui;
 
+import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_MICRO_VERSIONS;
 import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_BUILD_ARTIFACT;
 import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_CONTEXT_PATH;
 import static fish.payara.eclipse.tools.micro.MicroConstants.ATTR_DEBUG_PORT;
@@ -66,8 +67,8 @@
 
 public class MicroProjectTab extends AbstractJavaMainTab {
 
-	private Text contextPathText, microVersionText, debugPortText;
-	private Combo buildArtifactCombo, reloadArtifactCombo;
+	private Text contextPathText, debugPortText;
+	private Combo microVersionText, buildArtifactCombo, reloadArtifactCombo;
 
 	@Override
 	public void createControl(Composite parent) {
@@ -81,7 +82,7 @@ public void createControl(Composite parent) {
 
 		group = SWTFactory.createGroup(mainComposite, Messages.microVersionComponentLabel, 1, 1,
 				GridData.FILL_HORIZONTAL);
-		microVersionText = SWTFactory.createSingleText(group, 1);
+                microVersionText = SWTFactory.createCombo(group, SWT.READ_ONLY, 1, ARCHETYPE_MICRO_VERSIONS);
 		microVersionText.addModifyListener(getDefaultListener());
 
 		group = SWTFactory.createGroup(mainComposite, Messages.buildArtifactComponentLabel, 1, 1,

bundles/fish.payara.eclipse.tools.micro/src/fish/payara/eclipse/tools/micro/ui/wizards/MicroProjectWizard.java

@@ -75,11 +75,22 @@ public MicroProjectWizard() {
 
 	private static final String ARCHETYPE_GROUP_ID = "fish.payara.maven.archetypes"; //$NON-NLS-1$
 	private static final String ARCHETYPE_ARTIFACT_ID = "payara-micro-maven-archetype"; //$NON-NLS-1$
-	private static final String ARCHETYPE_VERSION = "1.3.0"; //$NON-NLS-1$
+	public static final String ARCHETYPE_VERSION_5X = "1.3.0"; //$NON-NLS-1$
+	public static final String ARCHETYPE_VERSION_6X = "2.0"; //$NON-NLS-1$
 	private static final String ARCHETYPE_JDK_VERSION = "jdkVersion"; //$NON-NLS-1$
 	private static final String ARCHETYPE_JDK_VERSION_DEFAULT_VALUE = "1.8"; //$NON-NLS-1$
 	public static final String ARCHETYPE_MICRO_VERSION = "payaraMicroVersion"; //$NON-NLS-1$
-	private static final String ARCHETYPE_MICRO_VERSION_DEFAULT_VALUE = "6.2022.2"; //$NON-NLS-1$
+	private static final String ARCHETYPE_MICRO_VERSION_DEFAULT_VALUE = "6.2023.2"; //$NON-NLS-1$
+        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"}; //$NON-NLS-1$
 	public static final String ARCHETYPE_AUTOBIND_HTTP = "autoBindHttp"; //$NON-NLS-1$
 	private static final String ARCHETYPE_CONCURRENT_API = "addConcurrentApi"; //$NON-NLS-1$
 	private static final String ARCHETYPE_RESOURCE_API = "addResourceApi"; //$NON-NLS-1$
@@ -123,7 +134,7 @@ private Archetype getArchetype() {
 		Archetype archetype = new Archetype();
 		archetype.setGroupId(ARCHETYPE_GROUP_ID);
 		archetype.setArtifactId(ARCHETYPE_ARTIFACT_ID);
-		archetype.setVersion(ARCHETYPE_VERSION);
+		archetype.setVersion(ARCHETYPE_VERSION_6X);
 		Properties properties = new Properties();
 		properties.put(ARCHETYPE_JDK_VERSION, ARCHETYPE_JDK_VERSION_DEFAULT_VALUE);
 		properties.put(ARCHETYPE_MICRO_VERSION, ARCHETYPE_MICRO_VERSION_DEFAULT_VALUE);

bundles/fish.payara.eclipse.tools.micro/src/fish/payara/eclipse/tools/micro/ui/wizards/MicroSettingsWizardPage.java

@@ -12,6 +12,9 @@
 import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_AUTOBIND_HTTP;
 import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_CONTEXT_ROOT;
 import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_MICRO_VERSION;
+import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_MICRO_VERSIONS;
+import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_VERSION_5X;
+import static fish.payara.eclipse.tools.micro.ui.wizards.MicroProjectWizard.ARCHETYPE_VERSION_6X;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.UnsupportedEncodingException;
@@ -69,9 +72,9 @@ private void createUI(Composite parent) {
 
 		microVersionCombo = new Combo(parent, SWT.BORDER);
 		microVersionCombo.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 2, 1));
-		addFieldWithHistory(ARCHETYPE_MICRO_VERSION, microVersionCombo);
 		microVersionCombo.setData("name", ARCHETYPE_MICRO_VERSION); //$NON-NLS-1$
 		microVersionCombo.addModifyListener(e -> validate());
+		microVersionCombo.setItems(ARCHETYPE_MICRO_VERSIONS);
 
 		Label autobindLabel = new Label(parent, SWT.NONE);
 		autobindLabel.setText(Messages.autobindComponentLabel);
@@ -124,6 +127,8 @@ private String validateInput() {
 	}
 
 	public Archetype getArchetype() {
+		String versionValue = microVersionCombo.getText().trim();
+		archetype.setVersion(versionValue.startsWith("5") ? ARCHETYPE_VERSION_5X : ARCHETYPE_VERSION_6X);
 		return archetype;
 	}