update to Eclipse 2023-09 and corresponding new Orbit release. Replac…

…e any javax.inject with jakarta.inject imports.

build/de.cau.cs.kieler.klighd.repository/category.xml

@@ -63,11 +63,11 @@
    <bundle id="de.cau.cs.kieler.klighd.lsp" version="2.3.1.qualifier"/>
    <bundle id="de.cau.cs.kieler.klighd.lsp.source" version="2.3.1.qualifier"/>
 
-   <repository-reference location="https://download.eclipse.org/releases/2022-09/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/releases/2023-09/" enabled="true" />
    <repository-reference location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/" enabled="true" />
    <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.8.1/" enabled="true" />
-   <repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/" enabled="true" />
    <repository-reference location="https://xtext.github.io/download/updates/releases/2.1.1/" enabled="true" />
-   <repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/" enabled="true" />
+   <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0" enabled="true" />
    <repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/" enabled="true" />
 </site>

build/de.cau.cs.kieler.klighd.repository/pom.xml

@@ -52,17 +52,17 @@
             <configuration>
               <associateSites>
                 <!-- Eclipse -->
-                <associateSite>https://download.eclipse.org/releases/2022-09/</associateSite>
+                <associateSite>https://download.eclipse.org/releases/2023-09/</associateSite>
                 <!-- UML2 Tools (Meta Model Implemenetation, ...) -->
                 <associateSite>https://download.eclipse.org/modeling/mdt/uml2/updates/5.4/</associateSite>
                 <!-- Eclipse Layout Kernel -->
                 <!-- associateSite>http://build.eclipse.org/modeling/elk/updates/nightly/</associateSite -->
                 <associateSite>https://download.eclipse.org/elk/updates/releases/0.8.1/</associateSite>>
                 <!-- Xtext -->
-                <associateSite>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/</associateSite>>
+                <associateSite>https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/</associateSite>>
                 <associateSite>https://xtext.github.io/download/updates/releases/2.1.1/</associateSite>>
                 <!-- Eclipse Orbit for Google Guave, Apache Batik, ... -->
-                <associateSite>https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/</associateSite>
+                <associateSite>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0</associateSite>
                 <!-- Sprotty ... -->
                 <associateSite>https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/sprotty/0.9.0/</associateSite>
               </associateSites>

build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-elkNightly.target

@@ -8,7 +8,7 @@
       <unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
       <unit id="org.apache.batik.svggen" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/releases/2022-09/"/>
+      <repository location="https://download.eclipse.org/releases/2023-09/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
@@ -25,18 +25,19 @@
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/"/>
+      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
       <repository location="https://xtext.github.io/download/updates/releases/2.1.1/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <unit id="javax.xml.bind" version="0.0.0"/>
+      <unit id="jakarta.servlet-api" version="0.0.0"/>
       <unit id="com.google.inject" version="0.0.0"/>
       <unit id="com.google.guava" version="0.0.0"/>
-      <unit id="org.hamcrest.library" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.sprotty" version="0.0.0"/>

build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo-elkNightly.target

@@ -8,7 +8,7 @@
       <unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
       <unit id="org.apache.batik.svggen" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/releases/2022-09/"/>
+      <repository location="https://download.eclipse.org/releases/2023-09/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
@@ -25,7 +25,7 @@
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/"/>
+      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
@@ -36,11 +36,12 @@
       <repository location="https://kieler.github.io/KLighD/v1.1.1/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <unit id="javax.xml.bind" version="0.0.0"/>
+      <unit id="jakarta.servlet-api" version="0.0.0"/>
       <unit id="com.google.inject" version="0.0.0"/>
       <unit id="com.google.guava" version="0.0.0"/>
-      <unit id="org.hamcrest.library" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.sprotty" version="0.0.0"/>

build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform-piccolo.target

@@ -8,7 +8,7 @@
       <unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
       <unit id="org.apache.batik.svggen" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/releases/2022-09/"/>
+      <repository location="https://download.eclipse.org/releases/2023-09/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
@@ -25,7 +25,7 @@
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/"/>
+      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
@@ -36,11 +36,12 @@
       <repository location="https://kieler.github.io/KLighD/v1.1.1/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <unit id="javax.xml.bind" version="0.0.0"/>
+      <unit id="jakarta.servlet-api" version="0.0.0"/>
       <unit id="com.google.inject" version="0.0.0"/>
       <unit id="com.google.guava" version="0.0.0"/>
-      <unit id="org.hamcrest.library" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.sprotty" version="0.0.0"/>

build/de.cau.cs.kieler.klighd.targetplatform/de.cau.cs.kieler.klighd.targetplatform.target

@@ -8,7 +8,7 @@
       <unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
       <unit id="org.apache.batik.svggen" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/releases/2022-09/"/>
+      <repository location="https://download.eclipse.org/releases/2023-09/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.uml2.uml.feature.group" version="0.0.0"/>
@@ -25,18 +25,19 @@
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.28.0/"/>
+      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="de.itemis.xtext.antlr.sdk.feature.group" version="2.1.1.v201405091103"/>
       <repository location="https://xtext.github.io/download/updates/releases/2.1.1/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-      <unit id="jakarta.servlet" version="0.0.0"/>
+      <unit id="jakarta.servlet-api" version="0.0.0"/>
       <unit id="com.google.inject" version="0.0.0"/>
       <unit id="com.google.guava" version="0.0.0"/>
-      <unit id="org.hamcrest.library" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository/"/>
+      <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
+      <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="org.eclipse.sprotty" version="0.0.0"/>

plugins/de.cau.cs.kieler.kgraph.text.ui/src/de/cau/cs/kieler/kgraph/text/ui/contentassist/KGraphProposalProvider.java

@@ -20,7 +20,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.elk.core.data.LayoutAlgorithmData;
 import org.eclipse.elk.core.data.LayoutMetaDataService;

plugins/de.cau.cs.kieler.kgraph.text/src/de/cau/cs/kieler/kgraph/text/KGraphValueConverters.java

@@ -18,7 +18,7 @@
 
 import java.util.regex.Pattern;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.eclipse.xtext.conversion.IValueConverter;
 import org.eclipse.xtext.conversion.ValueConverter;

plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/EObjectFallbackSynthesis.xtend

@@ -39,7 +39,7 @@ import de.cau.cs.kieler.klighd.ide.syntheses.action.EcoreModelExpandDetailsActio
 import de.cau.cs.kieler.klighd.util.KlighdProperties
 import java.util.List
 import java.util.Map
-import javax.inject.Inject
+import jakarta.inject.Inject
 import org.eclipse.elk.alg.layered.options.EdgeStraighteningStrategy
 import org.eclipse.elk.alg.layered.options.FixedAlignment
 import org.eclipse.elk.alg.layered.options.LayeredOptions

plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/ErrorModelSynthesis.xtend

@@ -27,7 +27,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions
 import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis
 import de.cau.cs.kieler.klighd.ide.model.ErrorModel
 import de.cau.cs.kieler.klighd.ide.syntheses.action.AbstractErrorModelShowExceptionAction
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 /**
  * Diagram synthesis for a {@link MessageModel}.

plugins/de.cau.cs.kieler.klighd.ide/src/de/cau/cs/kieler/klighd/ide/syntheses/MessageModelSynthesis.xtend

@@ -22,7 +22,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensio
 import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions
 import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions
 import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis
-import javax.inject.Inject
+import jakarta.inject.Inject
 
 import static extension de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses.*
 

plugins/de.cau.cs.kieler.klighd.krendering.extensions/META-INF/MANIFEST.MF

@@ -6,7 +6,7 @@ Bundle-Version: 2.3.1.qualifier
 Bundle-Activator: de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensionsPlugin
 Bundle-Vendor: Kiel University
 Require-Bundle: org.eclipse.core.runtime,
- javax.inject;bundle-version="1.0.0",
+ jakarta.inject.jakarta.inject-api;bundle-version="2.0.1",
  com.google.inject;bundle-version="3.0.0",
  org.eclipse.xtext.xbase.lib;bundle-version="2.4.0",
  org.eclipse.elk.core;bundle-version="0.1.0",

plugins/de.cau.cs.kieler.klighd.lsp/src/de/cau/cs/kieler/klighd/lsp/KGraphDiagramServerManager.xtend

@@ -18,8 +18,8 @@ package de.cau.cs.kieler.klighd.lsp
 
 import java.util.ArrayList
 import java.util.List
-import javax.inject.Inject
-import javax.inject.Provider
+import jakarta.inject.Inject
+import jakarta.inject.Provider
 import org.eclipse.sprotty.xtext.IDiagramServerFactory
 import org.eclipse.sprotty.xtext.ls.DiagramServerManager
 

plugins/de.cau.cs.kieler.klighd.ui.wizard/src/de/cau/cs/kieler/klighd/ui/wizard/KlighdProjectContributor.xtend

@@ -88,7 +88,7 @@ class KlighdProjectContributor implements IProjectFactoryContributor {
         '''
             package «projectInfo.transformationPackage»
             
-            import javax.inject.Inject
+            import jakarta.inject.Inject
             
             import de.cau.cs.kieler.klighd.kgraph.KNode
             import de.cau.cs.kieler.klighd.krendering.KRenderingFactory

plugins/de.cau.cs.kieler.klighd/META-INF/MANIFEST.MF

@@ -16,7 +16,7 @@ Require-Bundle: de.cau.cs.kieler.klighd.kgraph,
  org.eclipse.ui.workbench;bundle-version="3.103.0";visibility:=reexport,
  com.google.guava;bundle-version="10.0.0";visibility:=reexport,
  com.google.inject;bundle-version="3.0.0",
- javax.inject;bundle-version="1.0.0";visibility:=reexport
+ jakarta.inject.jakarta.inject-api;bundle-version="2.0.1";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: de.cau.cs.kieler.klighd.KlighdPlugin
 Export-Package: de.cau.cs.kieler.klighd,

pom.xml

@@ -51,24 +51,26 @@
 
   <!-- Define a few properties used throughout all build profiles. -->
   <properties>
-    <core-resources-version>3.18.0</core-resources-version>
-    <core-runtime-version>3.26.0</core-runtime-version>
     <elk-version>0.8.1</elk-version>
-    <emf-common-version>2.26.0</emf-common-version>
-    <emf-ecore-version>2.28.0</emf-ecore-version>
-    <emf-edit-version>2.17.0</emf-edit-version>
-    <gson-version>2.9.0</gson-version>
-    <guava-version>31.1-jre</guava-version>
-    <guice-version>5.1.0</guice-version>
-    <jface-version>3.27.0</jface-version>
-    <lsp4j-version>0.15.0</lsp4j-version>
+    <gson-version>2.10.1</gson-version>
+    <guava-version>32.1.2-jre</guava-version>
+    <guice-version>7.0.0</guice-version>
+    <jface-version>3.31.0</jface-version>
+    <lsp4j-version>0.21.1</lsp4j-version>
     <sprotty-version>0.9.0</sprotty-version>
     <swt-mock-version>0.1.0</swt-mock-version>
-    <swt-version>3.121.0</swt-version>
+    <swt-version>3.124.100</swt-version>
     <tycho-version>2.7.3</tycho-version>
-    <ui-workbench-version>3.126.0</ui-workbench-version>
-    <xtend-version>2.28.0</xtend-version>
-    <xtext-version>2.28.0</xtext-version>
+    <xtend-version>2.32.0</xtend-version>
+    <xtext-version>2.32.0</xtext-version>
+
+    <!-- Some Eclipse Plugin versions, aligned with the target platform's versions-->
+    <core-resources-version>3.19.100</core-resources-version>
+    <core-runtime-version>3.29.0</core-runtime-version>
+    <emf-common-version>2.29.0</emf-common-version>
+    <emf-ecore-version>2.35.0</emf-ecore-version>
+    <emf-edit-version>2.19.0</emf-edit-version>
+    <ui-workbench-version>3.130.0</ui-workbench-version>
 
     <!-- chsch: copied from https://eclipse.googlesource.com/recommenders/org.eclipse.recommenders/+/3dae4575d3370da2da25a1cbce3dfcff198f0611/features/pom.xml -->
     <!-- Non-breakable space, as normal spaces are trimmed. -->
@@ -189,7 +191,7 @@
       <dependency>
         <groupId>org.eclipse.platform</groupId>
         <artifactId>org.eclipse.ui.workbench</artifactId>
-        <version>3.110.0</version>
+        <version>${ui-workbench-version}</version>
         <exclusions>
           <exclusion>
             <groupId>org.eclipse.platform</groupId>
@@ -217,12 +219,12 @@
       <dependency>
         <groupId>org.eclipse.platform</groupId>
         <artifactId>org.eclipse.e4.ui.workbench.renderers.swt</artifactId>
-        <version>0.15.600</version>
+        <version>0.16.100</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.emf</groupId>
         <artifactId>org.eclipse.emf.ecore.change</artifactId>
-        <version>2.14.0</version>
+        <version>2.15.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -331,7 +333,7 @@
       <plugin>
         <groupId>org.eclipse.xtend</groupId>
         <artifactId>xtend-maven-plugin</artifactId>
-        <version>${xtext-version}</version>
+        <version>${xtend-version}</version>
         <executions>
           <execution>
             <goals>

test/de.cau.cs.kieler.klighd.piccolo.test/src/de/cau/cs/kieler/klighd/piccolo/test/highlightedEdgeToForeground/HighlightedEdgeToForegroundTestModelGen.xtend

@@ -23,7 +23,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KEdgeExtensions
 import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions
 import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions
 import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions
-import javax.inject.Inject
+import jakarta.inject.Inject
 import org.eclipse.elk.core.options.EdgeRouting
 import org.eclipse.elk.core.options.PortConstraints
 import org.eclipse.elk.core.options.PortSide

test/de.cau.cs.kieler.klighd.test/META-INF/MANIFEST.MF

@@ -7,7 +7,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.8.0",
  org.eclipse.core.runtime,
  org.eclipse.elk.core.service,
- org.hamcrest.library,
+ org.hamcrest.library;bundle-version="[0.0.0,2.0.0)",
+ org.hamcrest.core;bundle-version="[0.0.0,2.0.0)",
  de.cau.cs.kieler.klighd,
  de.cau.cs.kieler.klighd.incremental;resolution:=optional,
  de.cau.cs.kieler.klighd.piccolo;resolution:=optional,