This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch issue/SLING-12939 in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git
commit 272d420f220c5e52660cdf5a4857d5a33c7f1103 Author: Robert Munteanu <[email protected]> AuthorDate: Mon Sep 15 11:26:00 2025 +0200 SLING-12939 - New Sling Bundle Project fails due to changes in internal m2e API Update target platform to 2022-12. This brings in m2e 2.1, where the internal API we use was changed. --- .../ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java | 3 ++- .../ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java | 6 ++++-- .../target-definition/org.apache.sling.ide.target-definition.target | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java b/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java index 03a01430..ce8654e9 100644 --- a/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java +++ b/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java @@ -20,6 +20,7 @@ import static org.apache.sling.ide.eclipse.core.progress.ProgressUtils.advance; import java.util.Collection; import java.util.List; +import java.util.Map; import java.util.Properties; import org.apache.maven.archetype.catalog.Archetype; @@ -98,7 +99,7 @@ public abstract class AbstractNewMavenBasedSlingApplicationWizard extends Abstra String artifactId = archetypeParametersPage.getArtifactId(); String version = archetypeParametersPage.getVersion(); String javaPackage = archetypeParametersPage.getJavaPackage(); - Properties properties = archetypeParametersPage.getProperties(); + Map<String, String> properties = archetypeParametersPage.getProperties(); IProject existingProject = ResourcesPlugin.getWorkspace().getRoot().getProject(artifactId); if (existingProject!=null && existingProject.exists()) { diff --git a/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java b/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java index ab74636b..8ba6822c 100644 --- a/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java +++ b/eclipse/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java @@ -16,8 +16,10 @@ */ package org.apache.sling.ide.eclipse.ui.wizards.np; +import java.util.HashMap; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.StringTokenizer; @@ -357,9 +359,9 @@ public class ArchetypeParametersWizardPage extends WizardPage { return javaPackage.getText(); } - public Properties getProperties() { + public Map<String, String> getProperties() { int cnt = propertiesTable.getItemCount(); - Properties p = new Properties(); + Map<String, String> p = new HashMap<>(); for(int i=0; i<cnt; i++) { TableItem item = propertiesTable.getItem(i); p.put(item.getText(0), item.getText(1)); diff --git a/eclipse/target-definition/org.apache.sling.ide.target-definition.target b/eclipse/target-definition/org.apache.sling.ide.target-definition.target index 472d8e8b..df2f0abc 100644 --- a/eclipse/target-definition/org.apache.sling.ide.target-definition.target +++ b/eclipse/target-definition/org.apache.sling.ide.target-definition.target @@ -18,7 +18,7 @@ <?pde version="3.8"?><target name="Sling IDE Tools" sequenceNumber="53"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> - <repository location="https://download.eclipse.org/releases/2022-09/"/> + <repository location="https://download.eclipse.org/releases/2022-12/"/> <unit id="org.eclipse.m2e.feature.feature.group"/> <unit id="org.eclipse.jst.web_ui.feature.feature.group"/> <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group"/>
