You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2025/05/02 18:36:20 UTC
(sling-ide-tooling) 01/02: Update target to 2024-12
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/new-target
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git
commit 756c41a0242081f8a93b0671a9b9b5c5d77b6671
Author: Konrad Windszus <ko...@netcentric.biz>
AuthorDate: Thu May 1 20:39:04 2025 +0200
Update target to 2024-12
---
...bstractNewMavenBasedSlingApplicationWizard.java | 3 +-
.../wizards/np/ArchetypeParametersWizardPage.java | 7 ++-
.../sling/ide/test/impl/helpers/IStatusIsOk.java | 4 +-
eclipse/target-definition/Sling IDE Tooling.launch | 4 +-
.../org.apache.sling.ide.target-definition.target | 65 +++++++++++-----------
5 files changed, 42 insertions(+), 41 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..1dc35721 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,9 +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.Properties;
+import java.util.Map;
import java.util.StringTokenizer;
import org.apache.maven.archetype.catalog.Archetype;
@@ -357,9 +358,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/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/IStatusIsOk.java b/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/IStatusIsOk.java
index 5547f3a7..1afb8685 100644
--- a/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/IStatusIsOk.java
+++ b/eclipse/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/IStatusIsOk.java
@@ -18,13 +18,11 @@ package org.apache.sling.ide.test.impl.helpers;
import org.eclipse.core.runtime.IStatus;
import org.hamcrest.Description;
-import org.hamcrest.Factory;
import org.hamcrest.Matcher;
-import org.junit.internal.matchers.TypeSafeMatcher;
+import org.hamcrest.TypeSafeMatcher;
public class IStatusIsOk extends TypeSafeMatcher<IStatus> {
- @Factory
public static <T> Matcher<IStatus> isOk() {
return new IStatusIsOk();
}
diff --git a/eclipse/target-definition/Sling IDE Tooling.launch b/eclipse/target-definition/Sling IDE Tooling.launch
index 78b41075..ddca9a10 100644
--- a/eclipse/target-definition/Sling IDE Tooling.launch
+++ b/eclipse/target-definition/Sling IDE Tooling.launch
@@ -24,7 +24,7 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7" path="1" type="4"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
- <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -nosplash"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx768m"/>
@@ -562,5 +562,5 @@
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfig" value="true"/>
<booleanAttribute key="useDefaultConfigArea" value="true"/>
- <booleanAttribute key="useProduct" value="true"/>
+ <booleanAttribute key="useProduct" value="false"/>
</launchConfiguration>
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 a8e16c1a..33c88a03 100644
--- a/eclipse/target-definition/org.apache.sling.ide.target-definition.target
+++ b/eclipse/target-definition/org.apache.sling.ide.target-definition.target
@@ -18,22 +18,23 @@
<?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/"/>
- <unit id="org.eclipse.m2e.feature.feature.group" version="2.0.4.20220904-1703"/>
- <unit id="org.eclipse.jst.web_ui.feature.feature.group" version="3.27.0.v202206160204"/>
- <unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.27.0.v202206160204"/>
+ <repository location="https://download.eclipse.org/releases/2024-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" />
</location>
+<!-- transitive deps -->
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
- <repository location="https://download.eclipse.org/eclipse/updates/4.25/"/><!--Keep in sync with repo-ref in org.eclipse.m2e.repository/category.xml-->
+ <repository location="https://download.eclipse.org/eclipse/updates/4.34/"/>
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.ui.tests.harness" version="0.0.0"/>
<unit id="org.mockito.mockito-core" version="0.0.0"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.1.0.202306071420"/>
- <repository location="https://download.eclipse.org/technology/swtbot/releases/4.1.0/"/>
+ <unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/technology/swtbot/releases/4.2.1/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository"/>
@@ -41,28 +42,28 @@
<unit id="org.apache.httpcomponents.httpclient" version="4.5.13.v20210128-2225"/>
</location>
<!-- shared OSGi bundles -->
- <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
- <dependencies>
- <dependency>
- <groupId>org.apache.sling.ide</groupId>
- <artifactId>org.apache.sling.ide.api</artifactId>
- <version>1.2.3-SNAPSHOT</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.sling.ide</groupId>
- <artifactId>org.apache.sling.ide.artifacts</artifactId>
- <version>1.2.3-SNAPSHOT</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.sling.ide</groupId>
- <artifactId>org.apache.sling.ide.impl-vlt</artifactId>
- <version>1.2.3-SNAPSHOT</version>
- <type>jar</type>
- </dependency>
- </dependencies>
- </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling.ide</groupId>
+ <artifactId>org.apache.sling.ide.api</artifactId>
+ <version>1.2.3-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling.ide</groupId>
+ <artifactId>org.apache.sling.ide.artifacts</artifactId>
+ <version>1.2.3-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling.ide</groupId>
+ <artifactId>org.apache.sling.ide.impl-vlt</artifactId>
+ <version>1.2.3-SNAPSHOT</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location> -->
</locations>
- <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
-</target>
+ <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
+</target>
\ No newline at end of file