Skip to content

Commit 52122a1

Browse files
a-sra-sr
authored
Merge pull request #110 from kieler/als/release
Release preparation for 1.4
2 parents 0571474 + 235c278 commit 52122a1

File tree

121 files changed

+329
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+329
-190
lines changed

‎build/de.cau.cs.kieler.kicool.cli/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<version>1.4.0-SNAPSHOT</version>
5+
<version>1.5.0-SNAPSHOT</version>
66
<artifactId>de.cau.cs.kieler.kicool.cli</artifactId>
77
<packaging>eclipse-repository</packaging>
88
<name>KIELER Compiler CLI</name>

‎build/de.cau.cs.kieler.kicool.klighd.cli/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<version>1.4.0-SNAPSHOT</version>
5+
<version>1.5.0-SNAPSHOT</version>
66
<artifactId>de.cau.cs.kieler.kicool.klighd.cli</artifactId>
77
<packaging>eclipse-repository</packaging>
88
<name>KIELER Compiler and Diagrams CLI</name>

‎build/de.cau.cs.kieler.language.server.cli/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<version>1.4.0-SNAPSHOT</version>
5+
<version>1.5.0-SNAPSHOT</version>
66
<artifactId>de.cau.cs.kieler.language.server.cli</artifactId>
77
<name>KIELER Language Server CLI</name>
88

@@ -50,8 +50,8 @@
5050
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
5151
<addHeader>false</addHeader>
5252
</transformer>
53-
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
54-
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer" />
53+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
54+
<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
5555
</transformers>
5656
<filters>
5757
<filter>

‎build/de.cau.cs.kieler.sccharts.cli/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<version>1.4.0-SNAPSHOT</version>
5+
<version>1.5.0-SNAPSHOT</version>
66
<artifactId>de.cau.cs.kieler.sccharts.cli</artifactId>
77
<packaging>eclipse-repository</packaging>
88
<name>KIELER SCCharts Compiler CLI</name>

‎build/de.cau.cs.kieler.semantics.product.repository/kieler.product

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?pde version="3.5"?>
3-
<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">
3+
<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">
44

55
<aboutInfo>
66
<image path="/de.cau.cs.kieler.core.product/images/about.png"/>

‎build/de.cau.cs.kieler.semantics.product.repository/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<version>1.4.0-SNAPSHOT</version>
5+
<version>1.5.0-SNAPSHOT</version>
66
<artifactId>de.cau.cs.kieler.semantics.product.repository</artifactId>
77
<packaging>eclipse-repository</packaging>
88
<name>SCCharts RCA</name>

‎build/de.cau.cs.kieler.semantics.repository/category.xml

+13-13
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,31 @@
1313
</description>
1414
</category-def>
1515
<!-- KIELER SEMANTICS -->
16-
<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">
16+
<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">
1717
<category name="kieler-sem"/>
1818
</feature>
19-
<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">
19+
<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">
2020
<category name="kieler-sources"/>
2121
</feature>
22-
<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">
22+
<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">
2323
<category name="kieler-sem"/>
2424
</feature>
25-
<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">
25+
<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">
2626
<category name="kieler-sources"/>
2727
</feature>
28-
<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">
28+
<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">
2929
<category name="kieler-sem"/>
3030
</feature>
31-
<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">
31+
<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">
3232
<category name="kieler-sources"/>
3333
</feature>
3434
<!-- Repository references to associated sites -->
35-
<repository-reference location="https://download.eclipse.org/releases/2023-12" enabled="true"/>
36-
<repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0" enabled="true"/>
37-
<repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/" enabled="true"/>
38-
<repository-reference location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/" enabled="true"/>
39-
<repository-reference location="https://kieler.github.io/KLighD/v2.3.0/" enabled="true"/>
40-
<repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2023-06" enabled="true"/>
41-
<repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.0/" enabled="true"/>
35+
<repository-reference location="https://download.eclipse.org/releases/2024-03" enabled="true"/>
36+
<repository-reference location="https://download.eclipse.org/releases/2023-06" enabled="true"/>
37+
<repository-reference location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0" enabled="true"/>
38+
<repository-reference location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/" enabled="true"/>
39+
<repository-reference location="https://kieler.github.io/KLighD/v3.0.1/" enabled="true"/>
40+
<repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2024-04" enabled="true"/>
41+
<repository-reference location="https://download.eclipse.org/elk/updates/releases/0.9.1/" enabled="true"/>
4242
<repository-reference location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.20/" enabled="true"/>
4343
</site>

‎build/de.cau.cs.kieler.semantics.repository/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<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">
33
<modelVersion>4.0.0</modelVersion>
44

5-
<version>1.4.0-SNAPSHOT</version>
5+
<version>1.5.0-SNAPSHOT</version>
66
<artifactId>de.cau.cs.kieler.semantics.repository</artifactId>
77
<packaging>eclipse-repository</packaging>
88
<name>KIELER Semantics Repository</name>

‎build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target

+6-8
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@
1010
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
1111
<unit id="org.eclipse.epp.mpc.feature.group" version="0.0.0"/>
1212
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
13-
<repository location="https://download.eclipse.org/releases/2023-12"/>
13+
<repository location="https://download.eclipse.org/releases/2024-03"/>
1414
</location>
1515
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
16-
<!-- Remove when no longer required by Klighd -->
17-
<unit id="javax.inject" version="0.0.0"/>
1816
<!-- Required for JUnit4 Tests to be able to run -->
1917
<!-- Remove when updating to JUnit5 or another solution is found.-->
2018
<unit id="javax.annotation" version="0.0.0"/>
@@ -23,12 +21,12 @@
2321
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
2422
<unit id="com.google.gson" version="0.0.0"/>
2523
<unit id="org.freemarker.freemarker" version="0.0.0"/>
26-
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/>
24+
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.31.0"/>
2725
</location>
2826
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
2927
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
3028
<unit id="org.eclipse.xtext.ui.feature.group" version="0.0.0"/>
31-
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/>
29+
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.34.0/"/>
3230
</location>
3331
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
3432
<unit id="de.cau.cs.kieler.klighd.feature.feature.group" version="0.0.0"/>
@@ -38,17 +36,17 @@
3836
<unit id="de.cau.cs.kieler.klighd.standalone" version="0.0.0"/>
3937
<unit id="de.cau.cs.kieler.klighd.ui.contrib3x" version="0.0.0"/>
4038
<unit id="de.cau.cs.kieler.kgraph.text.ui" version="0.0.0"/>
41-
<repository location="https://kieler.github.io/KLighD/v2.3.0/"/>
39+
<repository location="https://kieler.github.io/KLighD/v3.0.1/"/>
4240
</location>
4341
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
4442
<unit id="de.cau.cs.kieler.graphs.klighd" version="0.0.0"/>
45-
<repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2023-06"/>
43+
<repository location="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/release_pragmatics_2024-04"/>
4644
</location>
4745
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
4846
<unit id="org.eclipse.elk.graphviz.feature.feature.group" version="0.0.0"/>
4947
<unit id="org.eclipse.elk.ui.feature.feature.group" version="0.0.0"/>
5048
<unit id="org.eclipse.elk.sdk.feature.feature.group" version="0.0.0"/>
51-
<repository location="https://download.eclipse.org/elk/updates/releases/0.9.0/"/>
49+
<repository location="https://download.eclipse.org/elk/updates/releases/0.9.1/"/>
5250
</location>
5351
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
5452
<unit id="de.cau.cs.kieler.websocket.mirror" version="0.0.0"/>

‎build/pom.xml

+8-7
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<!-- Define a few properties used throughout all build profiles. -->
1111
<properties>
1212
<!-- Language server dependency versions -->
13-
<elk-version>0.9.0</elk-version>
14-
<klighd-version>2.3.0.v20230606</klighd-version>
13+
<elk-version>0.9.1</elk-version>
14+
<klighd-version>3.0.1.v20240410</klighd-version>
1515
<lsp4j-version>0.22.0</lsp4j-version>
16-
<pragmatics-version>0.50.0.v20230607</pragmatics-version>
16+
<pragmatics-version>0.51.0.v20240410</pragmatics-version>
1717

1818
<!-- Xtext compile dependency versions -->
19-
<xtend-version>2.33.0</xtend-version>
20-
<xtext-version>2.33.0</xtext-version>
19+
<xtend-version>2.34.0</xtend-version>
20+
<xtext-version>2.34.0</xtext-version>
2121

2222
<!-- Tycho -->
2323
<tycho-version>2.7.5</tycho-version>
@@ -327,7 +327,8 @@
327327
</plugin>
328328

329329
<!-- Produces a list of all direct and transient dependencies for each module -->
330-
<plugin>
330+
<!-- NO LONGER NEEDED: We do not make dependency sanity checks anymore -->
331+
<!-- <plugin>
331332
<groupId>org.apache.maven.plugins</groupId>
332333
<artifactId>maven-dependency-plugin</artifactId>
333334
<version>3.1.1</version>
@@ -343,7 +344,7 @@
343344
</configuration>
344345
</execution>
345346
</executions>
346-
</plugin>
347+
</plugin> -->
347348
</plugins>
348349

349350
<pluginManagement>

‎features/de.cau.cs.kieler.esterel.feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<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">
33

44
<description url="http://www.informatik.uni-kiel.de/rtsys/kieler">
55
KIELER Esterel feature contains an Xtext based full featured textual Esterel and Lustre editor.

‎features/de.cau.cs.kieler.esterel.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<groupId>de.cau.cs.kieler</groupId>
1111
<artifactId>de.cau.cs.kieler.esterel.feature</artifactId>
12-
<version>1.4.0-SNAPSHOT</version>
12+
<version>1.5.0-SNAPSHOT</version>
1313
<packaging>eclipse-feature</packaging>
1414

1515
<build>

‎features/de.cau.cs.kieler.framework.feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<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">
33

44
<description url="http://www.informatik.uni-kiel.de/rtsys/kieler">
55
KIELER Semantics Framework feature contains the KIELER Compiler and various tools and grammars for the KIELER SCCharts.

‎features/de.cau.cs.kieler.framework.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<groupId>de.cau.cs.kieler</groupId>
1111
<artifactId>de.cau.cs.kieler.framework.feature</artifactId>
12-
<version>1.4.0-SNAPSHOT</version>
12+
<version>1.5.0-SNAPSHOT</version>
1313
<packaging>eclipse-feature</packaging>
1414

1515
<build>

‎features/de.cau.cs.kieler.product.feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<feature id="de.cau.cs.kieler.product.feature" label="Product Dependencies" version="1.4.0.qualifier" provider-name="Kiel University">
2+
<feature id="de.cau.cs.kieler.product.feature" label="Product Dependencies" version="1.5.0.qualifier" provider-name="Kiel University">
33

44
<description url="http://www.informatik.uni-kiel.de/rtsys/kieler/">
55
Dependencies of the KIELER project used for building a Rich Client Application.

‎features/de.cau.cs.kieler.product.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
</parent>
1010
<groupId>de.cau.cs.kieler</groupId>
1111
<artifactId>de.cau.cs.kieler.product.feature</artifactId>
12-
<version>1.4.0-SNAPSHOT</version>
12+
<version>1.5.0-SNAPSHOT</version>
1313
<packaging>eclipse-feature</packaging>
1414
</project>

‎features/de.cau.cs.kieler.sccharts.feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<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">
33

44
<description url="http://www.informatik.uni-kiel.de/rtsys/kieler">
55
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.

‎features/de.cau.cs.kieler.sccharts.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010
<groupId>de.cau.cs.kieler</groupId>
1111
<artifactId>de.cau.cs.kieler.sccharts.feature</artifactId>
12-
<version>1.4.0-SNAPSHOT</version>
12+
<version>1.5.0-SNAPSHOT</version>
1313
<packaging>eclipse-feature</packaging>
1414

1515
<build>

‎language-server/de.cau.cs.kieler.language.server.components.fake/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010

1111
<artifactId>de.cau.cs.kieler.language.server.components</artifactId>
12-
<version>1.4.0-SNAPSHOT</version>
12+
<version>1.5.0-SNAPSHOT</version>
1313
<packaging>pom</packaging>
1414

1515
<!-- IMPORTANT -->

‎language-server/de.cau.cs.kieler.language.server.components/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</parent>
1010

1111
<artifactId>de.cau.cs.kieler.language.server.components</artifactId>
12-
<version>1.4.0-SNAPSHOT</version>
12+
<version>1.5.0-SNAPSHOT</version>
1313
<packaging>pom</packaging>
1414

1515
<dependencies>

‎language-server/de.cau.cs.kieler.language.server/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<relativePath>../../build/pom.xml</relativePath>
99
</parent>
1010
<artifactId>de.cau.cs.kieler.language.server</artifactId>
11-
<version>1.4.0-SNAPSHOT</version>
11+
<version>1.5.0-SNAPSHOT</version>
1212

1313
<dependencies>
1414

@@ -161,7 +161,7 @@
161161
</goals>
162162
</pluginExecutionFilter>
163163
<action>
164-
<ignore></ignore>
164+
<ignore/>
165165
</action>
166166
</pluginExecution>
167167
</pluginExecutions>

0 commit comments

Comments
 (0)