Merge branch 'master' into tik/proxy-view

kieler · Aug 31, 2023 · 28284d1 · 28284d1
2 parents 6941984 + fe21202
commit 28284d1
Show file tree

Hide file tree

Showing 326 changed files with 2,410 additions and 1,037 deletions.
diff --git a/.github/workflows/buildAndTest.yml b/.github/workflows/buildAndTest.yml
@@ -25,7 +25,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v2
       with:
-        java-version: 11
+        java-version: 17
         distribution: adopt
     - name: Cache Maven packages
       uses: actions/cache@v2

diff --git a/build/de.cau.cs.kieler.klighd.repository/category.xml b/build/de.cau.cs.kieler.klighd.repository/category.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
 
-   <description name="KIELER Lightweight Diagrams" url="http://services.typefox.io/open-source/jenkins/job/KLighD/job/master/lastSuccessfulBuild/artifact/updatesite/">
+   <description name="KIELER Lightweight Diagrams" url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/nightly/klighd/">
       Update site for KIELER Lightweight Diagrams nightly builds.
    </description>
 
@@ -11,57 +11,57 @@
       </description>
    </category-def>
 
-   <feature url="features/de.cau.cs.kieler.klighd.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.feature" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.feature_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.feature" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.feature.source" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.feature.source_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.feature.source" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <feature url="features/de.cau.cs.kieler.klighd.batik.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.batik.feature" version="2.2.1.qualifier">
+   <!-- <feature url="features/de.cau.cs.kieler.klighd.batik.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.batik.feature" version="2.2.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
    <feature url="features/de.cau.cs.kieler.klighd.batik.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.batik.feature.source" version="2.2.1.qualifier">
       <category name="kieler-klighd"/>
-   </feature>
+   </feature> -->
 
-   <feature url="features/de.cau.cs.kieler.klighd.freehep.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.freehep.feature" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.freehep.feature_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.freehep.feature" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.freehep.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.freehep.feature.source" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.freehep.feature.source_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.freehep.feature.source" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <feature url="features/de.cau.cs.kieler.klighd.draw2d.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.draw2d.feature" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.draw2d.feature_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.draw2d.feature" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.draw2d.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.draw2d.feature.source" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.draw2d.feature.source_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.draw2d.feature.source" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.ide.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.ide.feature" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.ide.feature_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.ide.feature" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.ide.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.ide.feature.source" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.ide.feature.source_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.ide.feature.source" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <feature url="features/de.cau.cs.kieler.klighd.view.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.view.feature" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.view.feature_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.view.feature" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.view.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.view.feature.source" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.view.feature.source_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.view.feature.source" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <feature url="features/de.cau.cs.kieler.klighd.sdk.feature_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.sdk.feature" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.sdk.feature_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.sdk.feature" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
-   <feature url="features/de.cau.cs.kieler.klighd.sdk.feature.source_2.2.1.qualifier.jar" id="de.cau.cs.kieler.klighd.sdk.feature.source" version="2.2.1.qualifier">
+   <feature url="features/de.cau.cs.kieler.klighd.sdk.feature.source_2.3.1.qualifier.jar" id="de.cau.cs.kieler.klighd.sdk.feature.source" version="2.3.1.qualifier">
       <category name="kieler-klighd"/>
    </feature>
 
-   <bundle id="de.cau.cs.kieler.klighd.standalone" version="2.2.1.qualifier"/>
-   <bundle id="de.cau.cs.kieler.klighd.lsp" version="2.2.1.qualifier"/>
-   <bundle id="de.cau.cs.kieler.klighd.lsp.source" version="2.2.1.qualifier"/>
+   <bundle id="de.cau.cs.kieler.klighd.standalone" version="2.3.1.qualifier"/>
+   <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/modeling/mdt/uml2/updates/5.4/" enabled="true" />

diff --git a/build/de.cau.cs.kieler.klighd.repository/pom.xml b/build/de.cau.cs.kieler.klighd.repository/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>de.cau.cs.kieler.klighd</groupId>
     <artifactId>parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -76,6 +76,13 @@
           </execution>
         </executions>
       </plugin>
+      <!-- do not publish this artifact to Maven repositories -->
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/build/de.cau.cs.kieler.klighd.targetplatform/pom.xml b/build/de.cau.cs.kieler.klighd.targetplatform/pom.xml
@@ -10,8 +10,20 @@
   <parent>
     <groupId>de.cau.cs.kieler.klighd</groupId>
     <artifactId>parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
+  <build>
+    <plugins>
+      <!-- do not publish this artifact to Maven repositories -->
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
diff --git a/features/de.cau.cs.kieler.klighd.batik.feature/pom.xml b/features/de.cau.cs.kieler.klighd.batik.feature/pom.xml
@@ -11,4 +11,16 @@
   <artifactId>de.cau.cs.kieler.klighd.batik.feature</artifactId>
   <version>2.2.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+
+  <build>
+    <plugins>
+      <!-- do not publish this artifact to Maven repositories -->
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/features/de.cau.cs.kieler.klighd.draw2d.feature/feature.xml b/features/de.cau.cs.kieler.klighd.draw2d.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.cau.cs.kieler.klighd.draw2d.feature"
       label="KIELER Lightweight Diagrams - Piccolo Binding Extension Supporting Draw2d Figures"
-      version="2.2.1.qualifier"
+      version="2.3.1.qualifier"
       provider-name="Kiel University">
 
    <description url="http://www.informatik.uni-kiel.de/rtsys/kieler">

diff --git a/features/de.cau.cs.kieler.klighd.draw2d.feature/pom.xml b/features/de.cau.cs.kieler.klighd.draw2d.feature/pom.xml
@@ -5,10 +5,22 @@
   <parent>
     <groupId>de.cau.cs.kieler.klighd</groupId>
     <artifactId>features</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
   <groupId>de.cau.cs.kieler.klighd</groupId>
   <artifactId>de.cau.cs.kieler.klighd.draw2d.feature</artifactId>
-  <version>2.2.1-SNAPSHOT</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+
+  <build>
+    <plugins>
+      <!-- do not publish this artifact to Maven repositories -->
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/features/de.cau.cs.kieler.klighd.feature/feature.xml b/features/de.cau.cs.kieler.klighd.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.cau.cs.kieler.klighd.feature"
       label="KIELER Lightweight Diagrams Runtime"
-      version="2.2.1.qualifier"
+      version="2.3.1.qualifier"
       provider-name="Kiel University"
       plugin="de.cau.cs.kieler.klighd">
 

diff --git a/features/de.cau.cs.kieler.klighd.feature/pom.xml b/features/de.cau.cs.kieler.klighd.feature/pom.xml
@@ -5,10 +5,22 @@
   <parent>
     <groupId>de.cau.cs.kieler.klighd</groupId>
     <artifactId>features</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
   <groupId>de.cau.cs.kieler.klighd</groupId>
   <artifactId>de.cau.cs.kieler.klighd.feature</artifactId>
-  <version>2.2.1-SNAPSHOT</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+
+  <build>
+    <plugins>
+      <!-- do not publish this artifact to Maven repositories -->
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/features/de.cau.cs.kieler.klighd.freehep.feature/feature.xml b/features/de.cau.cs.kieler.klighd.freehep.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.cau.cs.kieler.klighd.freehep.feature"
       label="KIELER Lightweight Diagrams Vector Graphics Export Powered by FreeHEP 2.1.1"
-      version="2.2.1.qualifier"
+      version="2.3.1.qualifier"
       provider-name="Kiel University">
 
    <description url="http://www.informatik.uni-kiel.de/rtsys/kieler">

diff --git a/features/de.cau.cs.kieler.klighd.freehep.feature/pom.xml b/features/de.cau.cs.kieler.klighd.freehep.feature/pom.xml
@@ -5,10 +5,22 @@
   <parent>
     <groupId>de.cau.cs.kieler.klighd</groupId>
     <artifactId>features</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
   <groupId>de.cau.cs.kieler.klighd</groupId>
   <artifactId>de.cau.cs.kieler.klighd.freehep.feature</artifactId>
-  <version>2.2.1-SNAPSHOT</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+
+  <build>
+    <plugins>
+      <!-- do not publish this artifact to Maven repositories -->
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/features/de.cau.cs.kieler.klighd.ide.feature/feature.xml b/features/de.cau.cs.kieler.klighd.ide.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.cau.cs.kieler.klighd.ide.feature"
       label="KIELER Lightweight Diagrams IDE"
-      version="2.2.1.qualifier"
+      version="2.3.1.qualifier"
       provider-name="Kiel University"
       plugin="de.cau.cs.kieler.klighd.ide">
 

diff --git a/features/de.cau.cs.kieler.klighd.ide.feature/pom.xml b/features/de.cau.cs.kieler.klighd.ide.feature/pom.xml
@@ -5,10 +5,22 @@
   <parent>
     <groupId>de.cau.cs.kieler.klighd</groupId>
     <artifactId>features</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
   <groupId>de.cau.cs.kieler.klighd</groupId>
   <artifactId>de.cau.cs.kieler.klighd.ide.feature</artifactId>
-  <version>2.2.1-SNAPSHOT</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+
+  <build>
+    <plugins>
+      <!-- do not publish this artifact to Maven repositories -->
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/features/de.cau.cs.kieler.klighd.sdk.feature/feature.xml b/features/de.cau.cs.kieler.klighd.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.cau.cs.kieler.klighd.sdk.feature"
       label="KIELER Lightweight Diagrams - Developer Resources &amp; Examples"
-      version="2.2.1.qualifier"
+      version="2.3.1.qualifier"
       provider-name="Kiel University"
       plugin="de.cau.cs.kieler.klighd.ui.wizard">
 

diff --git a/features/de.cau.cs.kieler.klighd.sdk.feature/pom.xml b/features/de.cau.cs.kieler.klighd.sdk.feature/pom.xml
@@ -5,10 +5,22 @@
   <parent>
     <groupId>de.cau.cs.kieler.klighd</groupId>
     <artifactId>features</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
   <groupId>de.cau.cs.kieler.klighd</groupId>
   <artifactId>de.cau.cs.kieler.klighd.sdk.feature</artifactId>
-  <version>2.2.1-SNAPSHOT</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+
+  <build>
+    <plugins>
+      <!-- do not publish this artifact to Maven repositories -->
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/features/de.cau.cs.kieler.klighd.view.feature/feature.xml b/features/de.cau.cs.kieler.klighd.view.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.cau.cs.kieler.klighd.view.feature"
       label="KIELER Lightweight Diagrams Generic Diagram View"
-      version="2.2.1.qualifier"
+      version="2.3.1.qualifier"
       provider-name="Kiel University"
       plugin="de.cau.cs.kieler.klighd.ui.view">
 

diff --git a/features/de.cau.cs.kieler.klighd.view.feature/pom.xml b/features/de.cau.cs.kieler.klighd.view.feature/pom.xml
@@ -5,10 +5,22 @@
   <parent>
     <groupId>de.cau.cs.kieler.klighd</groupId>
     <artifactId>features</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
   <groupId>de.cau.cs.kieler.klighd</groupId>
   <artifactId>de.cau.cs.kieler.klighd.view.feature</artifactId>
-  <version>2.2.1-SNAPSHOT</version>
+  <version>2.3.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
+
+  <build>
+    <plugins>
+      <!-- do not publish this artifact to Maven repositories -->
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/features/pom.xml b/features/pom.xml
@@ -9,11 +9,11 @@
   <parent>
     <groupId>de.cau.cs.kieler.klighd</groupId>
     <artifactId>parent</artifactId>
-    <version>2.2.1-SNAPSHOT</version>
+    <version>2.3.1-SNAPSHOT</version>
   </parent>
 
   <build>
-    <!-- find the configation of the following plug-ins in the parent pom -->
+    <!-- find the configuration of the following plug-ins in the parent pom -->
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho.extras</groupId>
@@ -25,6 +25,13 @@
         <artifactId>tycho-p2-plugin</artifactId>
         <version>${tycho-version}</version>
       </plugin>
+      <!-- do not publish this artifact to Maven repositories -->
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+          <configuration>
+            <skip>true</skip>
+          </configuration>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath b/plugins/de.cau.cs.kieler.kgraph.text.ide/.classpath
@@ -5,5 +5,5 @@
 	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="xtend-gen"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>