Merge pull request #110 from kieler/als/release

Release preparation for 1.4
kieler · Apr 16, 2024 · 52122a1 · 52122a1
2 parents 0571474 + 235c278
commit 52122a1
Show file tree

Hide file tree

Showing 121 changed files with 329 additions and 190 deletions.
diff --git a/build/de.cau.cs.kieler.kicool.cli/pom.xml b/build/de.cau.cs.kieler.kicool.cli/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <artifactId>de.cau.cs.kieler.kicool.cli</artifactId>
   <packaging>eclipse-repository</packaging>
   <name>KIELER Compiler CLI</name>

diff --git a/build/de.cau.cs.kieler.kicool.klighd.cli/pom.xml b/build/de.cau.cs.kieler.kicool.klighd.cli/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <artifactId>de.cau.cs.kieler.kicool.klighd.cli</artifactId>
   <packaging>eclipse-repository</packaging>
   <name>KIELER Compiler and Diagrams CLI</name>

diff --git a/build/de.cau.cs.kieler.language.server.cli/pom.xml b/build/de.cau.cs.kieler.language.server.cli/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <artifactId>de.cau.cs.kieler.language.server.cli</artifactId>
   <name>KIELER Language Server CLI</name>
 
@@ -50,8 +50,8 @@
             <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
               <addHeader>false</addHeader>
             </transformer>
-            <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-            <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
+            <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+            <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
           </transformers>
           <filters>
               <filter>

diff --git a/build/de.cau.cs.kieler.sccharts.cli/pom.xml b/build/de.cau.cs.kieler.sccharts.cli/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <artifactId>de.cau.cs.kieler.sccharts.cli</artifactId>
   <packaging>eclipse-repository</packaging>
   <name>KIELER SCCharts Compiler CLI</name>

diff --git a/build/de.cau.cs.kieler.semantics.product.repository/kieler.product b/build/de.cau.cs.kieler.semantics.product.repository/kieler.product
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
-<product name="KIELER" uid="de.cau.cs.kieler.product" id="de.cau.cs.kieler.core.product.product" application="org.eclipse.ui.ide.workbench" version="1.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="KIELER" uid="de.cau.cs.kieler.product" id="de.cau.cs.kieler.core.product.product" application="org.eclipse.ui.ide.workbench" version="1.5.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/de.cau.cs.kieler.core.product/images/about.png"/>

diff --git a/build/de.cau.cs.kieler.semantics.product.repository/pom.xml b/build/de.cau.cs.kieler.semantics.product.repository/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <artifactId>de.cau.cs.kieler.semantics.product.repository</artifactId>
   <packaging>eclipse-repository</packaging>
   <name>SCCharts RCA</name>

diff --git a/build/de.cau.cs.kieler.semantics.repository/category.xml b/build/de.cau.cs.kieler.semantics.repository/category.xml
@@ -13,31 +13,31 @@
       </description>
   </category-def>
   <!-- KIELER SEMANTICS -->
-  <feature url="features/de.cau.cs.kieler.framework.feature_1.4.0.qualifier.jar" id="de.cau.cs.kieler.framework.feature" version="1.4.0.qualifier">
+  <feature url="features/de.cau.cs.kieler.framework.feature_1.5.0.qualifier.jar" id="de.cau.cs.kieler.framework.feature" version="1.5.0.qualifier">
     <category name="kieler-sem"/>
   </feature>
-  <feature url="features/de.cau.cs.kieler.framework.feature.source_1.4.0.qualifier.jar" id="de.cau.cs.kieler.framework.feature.source" version="1.4.0.qualifier">
+  <feature url="features/de.cau.cs.kieler.framework.feature.source_1.5.0.qualifier.jar" id="de.cau.cs.kieler.framework.feature.source" version="1.5.0.qualifier">
     <category name="kieler-sources"/>
   </feature>
-  <feature url="features/de.cau.cs.kieler.esterel.feature_1.4.0.qualifier.jar" id="de.cau.cs.kieler.esterel.feature" version="1.4.0.qualifier">
+  <feature url="features/de.cau.cs.kieler.esterel.feature_1.5.0.qualifier.jar" id="de.cau.cs.kieler.esterel.feature" version="1.5.0.qualifier">
     <category name="kieler-sem"/>
   </feature>
-  <feature url="features/de.cau.cs.kieler.esterel.feature.source_1.4.0.qualifier.jar" id="de.cau.cs.kieler.esterel.feature.source" version="1.4.0.qualifier">
+  <feature url="features/de.cau.cs.kieler.esterel.feature.source_1.5.0.qualifier.jar" id="de.cau.cs.kieler.esterel.feature.source" version="1.5.0.qualifier">
     <category name="kieler-sources"/>
   </feature>
-  <feature url="features/de.cau.cs.kieler.sccharts.feature_1.4.0.qualifier.jar" id="de.cau.cs.kieler.sccharts.feature" version="1.4.0.qualifier">
+  <feature url="features/de.cau.cs.kieler.sccharts.feature_1.5.0.qualifier.jar" id="de.cau.cs.kieler.sccharts.feature" version="1.5.0.qualifier">
     <category name="kieler-sem"/>
   </feature>
-  <feature url="features/de.cau.cs.kieler.sccharts.feature.source_1.4.0.qualifier.jar" id="de.cau.cs.kieler.sccharts.feature.source" version="1.4.0.qualifier">
+  <feature url="features/de.cau.cs.kieler.sccharts.feature.source_1.5.0.qualifier.jar" id="de.cau.cs.kieler.sccharts.feature.source" version="1.5.0.qualifier">
     <category name="kieler-sources"/>
   </feature>
   <!-- Repository references to associated sites -->
-  <repository-reference location="https://download.eclipse.org/releases/2023-12" enabled="true"/>
-  <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0" enabled="true"/>
-  <repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/" enabled="true"/>
-  <repository-reference location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/" enabled="true"/>
-  <repository-reference location="https://kieler.github.io/KLighD/v2.3.0/" enabled="true"/>
-  <repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2023-06" enabled="true"/>
-  <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.0/" enabled="true"/>
+  <repository-reference location="https://download.eclipse.org/releases/2024-03" enabled="true"/>
+  <repository-reference location="https://download.eclipse.org/releases/2023-06" enabled="true"/>
+  <repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0" enabled="true"/>
+  <repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/" enabled="true"/>
+  <repository-reference location="https://kieler.github.io/KLighD/v3.0.1/" enabled="true"/>
+  <repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2024-04" enabled="true"/>
+  <repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.1/" enabled="true"/>
   <repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.20/" enabled="true"/>
 </site>
diff --git a/build/de.cau.cs.kieler.semantics.repository/pom.xml b/build/de.cau.cs.kieler.semantics.repository/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <artifactId>de.cau.cs.kieler.semantics.repository</artifactId>
   <packaging>eclipse-repository</packaging>
   <name>KIELER Semantics Repository</name>

diff --git a/...e.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target b/...e.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target
@@ -10,11 +10,9 @@
       <unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/releases/2023-12"/>
+      <repository location="https://download.eclipse.org/releases/2024-03"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-      <!-- Remove when no longer required by Klighd -->
-      <unit id="javax.inject" version="0.0.0"/>
       <!-- Required for JUnit4 Tests to be able to run -->
       <!-- Remove when updating to JUnit5 or another solution is found.-->
       <unit id="javax.annotation" version="0.0.0"/>
@@ -23,12 +21,12 @@
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="com.google.gson" version="0.0.0"/>
       <unit id="org.freemarker.freemarker" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.xtext.ui.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
+      <repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="de.cau.cs.kieler.klighd.feature.feature.group" version="0.0.0"/>
@@ -38,17 +36,17 @@
       <unit id="de.cau.cs.kieler.klighd.standalone" version="0.0.0"/>
       <unit id="de.cau.cs.kieler.klighd.ui.contrib3x" version="0.0.0"/>
       <unit id="de.cau.cs.kieler.kgraph.text.ui" version="0.0.0"/>
-      <repository location="https://kieler.github.io/KLighD/v2.3.0/"/>
+      <repository location="https://kieler.github.io/KLighD/v3.0.1/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="de.cau.cs.kieler.graphs.klighd" version="0.0.0"/>
-      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2023-06"/>
+      <repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2024-04"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="org.eclipse.elk.graphviz.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
-      <repository location="https://download.eclipse.org/elk/updates/releases/0.9.0/"/>
+      <repository location="https://download.eclipse.org/elk/updates/releases/0.9.1/"/>
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="de.cau.cs.kieler.websocket.mirror" version="0.0.0"/>

diff --git a/build/pom.xml b/build/pom.xml
@@ -10,14 +10,14 @@
   <!-- Define a few properties used throughout all build profiles. -->
   <properties>
     <!-- Language server dependency versions -->
-    <elk-version>0.9.0</elk-version>
-    <klighd-version>2.3.0.v20230606</klighd-version>
+    <elk-version>0.9.1</elk-version>
+    <klighd-version>3.0.1.v20240410</klighd-version>
     <lsp4j-version>0.22.0</lsp4j-version>
-    <pragmatics-version>0.50.0.v20230607</pragmatics-version>
+    <pragmatics-version>0.51.0.v20240410</pragmatics-version>
 
     <!-- Xtext compile dependency versions -->
-    <xtend-version>2.33.0</xtend-version>
-    <xtext-version>2.33.0</xtext-version>
+    <xtend-version>2.34.0</xtend-version>
+    <xtext-version>2.34.0</xtext-version>
 
     <!-- Tycho -->
     <tycho-version>2.7.5</tycho-version>
@@ -327,7 +327,8 @@
       </plugin>
 
       <!-- Produces a list of all direct and transient dependencies for each module -->
-      <plugin>
+      <!-- NO LONGER NEEDED: We do not make dependency sanity checks anymore -->
+      <!-- <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>3.1.1</version>
@@ -343,7 +344,7 @@
             </configuration>
           </execution>
         </executions>
-      </plugin>
+      </plugin> -->
     </plugins>
 
     <pluginManagement>

diff --git a/features/de.cau.cs.kieler.esterel.feature/feature.xml b/features/de.cau.cs.kieler.esterel.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="de.cau.cs.kieler.esterel.feature" label="KIELER Esterel/Lustre" version="1.4.0.qualifier" provider-name="Kiel University" plugin="de.cau.cs.kieler.esterel.ui">
+<feature id="de.cau.cs.kieler.esterel.feature" label="KIELER Esterel/Lustre" version="1.5.0.qualifier" provider-name="Kiel University" plugin="de.cau.cs.kieler.esterel.ui">
 
    <description url="http://www.informatik.uni-kiel.de/rtsys/kieler">
       KIELER Esterel feature contains an Xtext based full featured textual Esterel and Lustre editor.

diff --git a/features/de.cau.cs.kieler.esterel.feature/pom.xml b/features/de.cau.cs.kieler.esterel.feature/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>de.cau.cs.kieler</groupId>
   <artifactId>de.cau.cs.kieler.esterel.feature</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>

diff --git a/features/de.cau.cs.kieler.framework.feature/feature.xml b/features/de.cau.cs.kieler.framework.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="de.cau.cs.kieler.framework.feature" label="KIELER Semantics Framework" version="1.4.0.qualifier" provider-name="Kiel University" plugin="de.cau.cs.kieler.framework">
+<feature id="de.cau.cs.kieler.framework.feature" label="KIELER Semantics Framework" version="1.5.0.qualifier" provider-name="Kiel University" plugin="de.cau.cs.kieler.framework">
 
    <description url="http://www.informatik.uni-kiel.de/rtsys/kieler">
       KIELER Semantics Framework feature contains the KIELER Compiler and various tools and grammars for the KIELER SCCharts.

diff --git a/features/de.cau.cs.kieler.framework.feature/pom.xml b/features/de.cau.cs.kieler.framework.feature/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>de.cau.cs.kieler</groupId>
   <artifactId>de.cau.cs.kieler.framework.feature</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>

diff --git a/features/de.cau.cs.kieler.product.feature/feature.xml b/features/de.cau.cs.kieler.product.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="de.cau.cs.kieler.product.feature" label="Product Dependencies" version="1.4.0.qualifier" provider-name="Kiel University">
+<feature id="de.cau.cs.kieler.product.feature" label="Product Dependencies" version="1.5.0.qualifier" provider-name="Kiel University">
 
    <description url="http://www.informatik.uni-kiel.de/rtsys/kieler/">
       Dependencies of the KIELER project used for building a Rich Client Application.

diff --git a/features/de.cau.cs.kieler.product.feature/pom.xml b/features/de.cau.cs.kieler.product.feature/pom.xml
@@ -9,6 +9,6 @@
   </parent>
   <groupId>de.cau.cs.kieler</groupId>
   <artifactId>de.cau.cs.kieler.product.feature</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/de.cau.cs.kieler.sccharts.feature/feature.xml b/features/de.cau.cs.kieler.sccharts.feature/feature.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="de.cau.cs.kieler.sccharts.feature" label="KIELER SCCharts" version="1.4.0.qualifier" provider-name="Kiel University" plugin="de.cau.cs.kieler.sccharts">
+<feature id="de.cau.cs.kieler.sccharts.feature" label="KIELER SCCharts" version="1.5.0.qualifier" provider-name="Kiel University" plugin="de.cau.cs.kieler.sccharts">
 
    <description url="http://www.informatik.uni-kiel.de/rtsys/kieler">
       KIELER SCCharts feature contains the KIELER SCCharts Textual Editor (*.sctx) with automatic KLighD diagram synthesis. Code generation to Synchronous C (SC) or Syncchronous Java (SJ) is provided.

diff --git a/features/de.cau.cs.kieler.sccharts.feature/pom.xml b/features/de.cau.cs.kieler.sccharts.feature/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>de.cau.cs.kieler</groupId>
   <artifactId>de.cau.cs.kieler.sccharts.feature</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>

diff --git a/language-server/de.cau.cs.kieler.language.server.components.fake/pom.xml b/language-server/de.cau.cs.kieler.language.server.components.fake/pom.xml
@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>de.cau.cs.kieler.language.server.components</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!-- IMPORTANT -->

diff --git a/language-server/de.cau.cs.kieler.language.server.components/pom.xml b/language-server/de.cau.cs.kieler.language.server.components/pom.xml
@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>de.cau.cs.kieler.language.server.components</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <dependencies>

diff --git a/language-server/de.cau.cs.kieler.language.server/pom.xml b/language-server/de.cau.cs.kieler.language.server/pom.xml
@@ -8,7 +8,7 @@
     <relativePath>../../build/pom.xml</relativePath>
   </parent>
   <artifactId>de.cau.cs.kieler.language.server</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
 
   <dependencies>
 
@@ -161,7 +161,7 @@
                     </goals>
                   </pluginExecutionFilter>
                   <action>
-                    <ignore></ignore>
+                    <ignore/>
                   </action>
                 </pluginExecution>
               </pluginExecutions>