FISH-7083 Upgrade Eclipse IDE 2022-12

Author: jGauravGupta

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

@@ -15,7 +15,9 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 import org.apache.maven.archetype.catalog.Archetype;
@@ -75,7 +77,7 @@ 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$
-	public static final String ARCHETYPE_VERSION_5X = "1.3.0"; //$NON-NLS-1$
+	public static final String ARCHETYPE_VERSION_5X = "1.4.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$
@@ -158,7 +160,8 @@ public boolean performFinish() {
 		final String artifactId = projectSettingsPage.getArtifactId();
 		final String version = projectSettingsPage.getVersion();
 		final String javaPackage = projectSettingsPage.getJavaPackage();
-		final Properties properties = microSettingsPage.getProperties();
+		final Map<String, String> properties = microSettingsPage.getProperties();
+                
 		final IPath location = projectLocationPage.isInWorkspace() ? null : projectLocationPage.getLocationPath();
 		final String projectName = getProjectName(importConfiguration, groupId, artifactId, version);
 		final IWorkspace workspace = ResourcesPlugin.getWorkspace();
@@ -181,7 +184,7 @@ protected List<IProject> doCreateMavenProjects(IProgressMonitor monitor) throws
 				ArchetypePlugin archetypeManager = org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator
 						.getDefault().getArchetypePlugin();
 				ArchetypeGenerator generator = archetypeManager.getGenerator();
-
+//createArchetypeProjects(IPath location, IArchetype archetype, String groupId, String artifactId, String version, String javaPackage, Map<String, String> properties, IProgressMonitor monitor) throws CoreException {
 				Collection<MavenProjectInfo> projects = generator.createArchetypeProjects(
 						location, new MavenArchetype(archetype), groupId, artifactId, version, javaPackage, properties,
 						monitor);

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

@@ -19,7 +19,9 @@
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.Map;
 import java.util.Properties;
+import java.util.stream.Collectors;
 
 import org.apache.maven.archetype.catalog.Archetype;
 import org.eclipse.m2e.core.project.ProjectImportConfiguration;
@@ -127,13 +129,19 @@ private String validateInput() {
 	}
 
 	public Archetype getArchetype() {
-		String versionValue = microVersionCombo.getText().trim();
-		archetype.setVersion(versionValue.startsWith("5") ? ARCHETYPE_VERSION_5X : ARCHETYPE_VERSION_6X);
+                String[] versionToken = microVersionCombo.getText().trim().split("\\.");
+		archetype.setVersion(versionToken.length > 1 && Integer.parseInt(versionToken[0]) < 6 ? ARCHETYPE_VERSION_5X : ARCHETYPE_VERSION_6X);
 		return archetype;
 	}
 
-	public Properties getProperties() {
-		Properties properties = archetype.getProperties();
+	public Map<String, String> getProperties() {
+                Map<String, String> properties = archetype.getProperties()
+                .entrySet().stream().collect(
+                        Collectors.toMap(
+                                e -> e.getKey().toString(),
+                                e -> e.getValue().toString()
+                        )
+                );
 		String contextRoot = contextPathCombo.getText().trim();
 		try {
 			contextRoot = contextRoot.startsWith("/") ? '/' + URLEncoder.encode(contextRoot.substring(1), UTF_8.name())

pom.xml

@@ -15,8 +15,8 @@
     <properties>
         <tycho.version>3.0.1</tycho.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <eclipse.target>20229</eclipse.target>
-        <eclipse-repo.url>https://download.eclipse.org/releases/2022-09</eclipse-repo.url>
+        <eclipse.target>202212</eclipse.target>
+        <eclipse-repo.url>https://download.eclipse.org/releases/2022-12</eclipse-repo.url>
     </properties>
 
     <modules>

releng/fish.payara.eclipse.20229/.project …leng/fish.payara.eclipse.202212/.projectreleng/fish.payara.eclipse.20229/.project renamed to releng/fish.payara.eclipse.202212/.project releng/fish.payara.eclipse.20229/.project renamed to releng/fish.payara.eclipse.202212/.project

@@ -10,6 +10,6 @@
     <version>2.1.0</version>
   </parent>
 
-  <artifactId>fish.payara.eclipse.20229</artifactId>
+  <artifactId>fish.payara.eclipse.202212</artifactId>
   <packaging>eclipse-target-definition</packaging>
 </project>

…e.20229/fish.payara.eclipse.20229.target …202212/fish.payara.eclipse.202212.targetreleng/fish.payara.eclipse.20229/fish.payara.eclipse.20229.target renamed to releng/fish.payara.eclipse.202212/fish.payara.eclipse.202212.target releng/fish.payara.eclipse.20229/fish.payara.eclipse.20229.target renamed to releng/fish.payara.eclipse.202212/fish.payara.eclipse.202212.target

@@ -13,7 +13,7 @@
     </parent>
 
     <modules>
-        <module>fish.payara.eclipse.20229</module>
+        <module>fish.payara.eclipse.202212</module>
         <module>fish.payara.eclipse.update</module>
     </modules>
 </project>