Merge branch 'develop' into 'master'

#263 develop to master for v0.5-M1 See merge request !268

Merge branch 'develop' into 'master'
#263 develop to master for v0.5-M1 See merge request !268
dcc21995 · Dennis Hendriks · 97595edf · a8dadf0c · dcc21995 · dcc21995
Commit dcc21995 authored Feb 22, 2022 by Dennis Hendriks
--- a/.gitattributes
+++ b/.gitattributes
 ################################################################################
-# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2022 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
@@ -28,7 +28,6 @@ Makefile text eol=lf
 *.docx      binary
 *.eps       binary
 *.exe       binary
-*.fig       binary
 *.gif       binary
 *.gz        binary
 *.ico       binary

--- a/.gitconfig
+++ b/.gitconfig
 ################################################################################
-# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2022 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

--- a/.gitignore
+++ b/.gitignore
 ################################################################################
-# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2022 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
 <!--
-    Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
+    Copyright (c) 2010, 2022 Contributors to the Eclipse Foundation

    See the NOTICE file(s) distributed with this work for additional
    information regarding copyright ownership.

--- a/.project
+++ b/.project
@@ -48,7 +48,7 @@
 			<type>10</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-products</arguments>
+				<arguments>1.0-name-matches-false-false-product</arguments>
 			</matcher>
 		</filter>
 		<filter>

--- a/Jenkinsfile
+++ b/Jenkinsfile
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2022 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
@@ -106,12 +106,12 @@ pipeline {
                    archiveArtifacts 'releng/org.eclipse.escet.releng.website/target/eclipse-escet-*-website.zip'

                    // Update site.
-                    archiveArtifacts 'products/org.eclipse.escet.product/target/*-updatesite.zip'
+                    archiveArtifacts 'product/org.eclipse.escet.product/target/*-updatesite.zip'

                    // Product.
-                    archiveArtifacts 'products/org.eclipse.escet.product/target/products/*-linux*.tar.gz'
-                    archiveArtifacts 'products/org.eclipse.escet.product/target/products/*-mac*.dmg'
-                    archiveArtifacts 'products/org.eclipse.escet.product/target/products/*-win*.zip'
+                    archiveArtifacts 'product/org.eclipse.escet.product/target/products/*-linux*.tar.gz'
+                    archiveArtifacts 'product/org.eclipse.escet.product/target/products/*-mac*.dmg'
+                    archiveArtifacts 'product/org.eclipse.escet.product/target/products/*-win*.zip'

                    // Code coverage.
                    archiveArtifacts 'releng/org.eclipse.escet.releng.tests/target/eclipse-escet-jacoco-aggregate.zip'
@@ -133,7 +133,7 @@ pipeline {
                // Deploy downloads.
                sh '''
                    mkdir -p deploy/update-site/
-                    unzip -q products/org.eclipse.escet.product/target/*-updatesite.zip -d deploy/update-site/
+                    unzip -q product/org.eclipse.escet.product/target/*-updatesite.zip -d deploy/update-site/
                '''
                sshagent (['projects-storage.eclipse.org-bot-ssh']) {
                    // Remove any existing directory for this release.
@@ -146,16 +146,16 @@ pipeline {
                    sh 'scp -r releng/org.eclipse.escet.releng.website/target/eclipse-escet-*-website.zip ${DOWNLOADS_URL}/${RELEASE_VERSION}/'

                    // Update site (archive).
-                    sh 'scp -r products/org.eclipse.escet.product/target/*-updatesite.zip ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
+                    sh 'scp -r product/org.eclipse.escet.product/target/*-updatesite.zip ${DOWNLOADS_URL}/${RELEASE_VERSION}/'

                    // Update site (extracted).
                    sh 'ssh genie.escet@projects-storage.eclipse.org mkdir -p ${DOWNLOADS_PATH}/${RELEASE_VERSION}/update-site/'
                    sh 'scp -r deploy/update-site/* ${DOWNLOADS_URL}/${RELEASE_VERSION}/update-site/'

                    // Product.
-                    sh 'scp -r products/org.eclipse.escet.product/target/products/*-linux*.tar.gz ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
-                    sh 'scp -r products/org.eclipse.escet.product/target/products/*-mac*.dmg ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
-                    sh 'scp -r products/org.eclipse.escet.product/target/products/*-win*.zip ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
+                    sh 'scp -r product/org.eclipse.escet.product/target/products/*-linux*.tar.gz ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
+                    sh 'scp -r product/org.eclipse.escet.product/target/products/*-mac*.dmg ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
+                    sh 'scp -r product/org.eclipse.escet.product/target/products/*-win*.zip ${DOWNLOADS_URL}/${RELEASE_VERSION}/'
                }

                // Deploy websites.

--- a/LICENSE.txt
+++ b/LICENSE.txt
-Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
+Copyright (c) 2010, 2022 Contributors to the Eclipse Foundation

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

--- a/build-docs.launch
+++ b/build-docs.launch
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
    <booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
-    <stringAttribute key="M2_GOALS" value="clean package --projects releng/org.eclipse.escet.target,chi/org.eclipse.escet.chi.documentation,cif/org.eclipse.escet.cif.documentation,releng/org.eclipse.escet.releng.dev.documentation,releng/org.eclipse.escet.releng.project.documentation,tooldef/org.eclipse.escet.tooldef.documentation --also-make"/>
+    <stringAttribute key="M2_GOALS" value="clean package --projects releng/org.eclipse.escet.releng.target,chi/org.eclipse.escet.chi.documentation,cif/org.eclipse.escet.cif.documentation,releng/org.eclipse.escet.releng.dev.documentation,releng/org.eclipse.escet.releng.project.documentation,tooldef/org.eclipse.escet.tooldef.documentation --also-make"/>
    <booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
    <booleanAttribute key="M2_OFFLINE" value="false"/>
    <stringAttribute key="M2_PROFILES" value=""/>
    <listAttribute key="M2_PROPERTIES">
-        <listEntry value="tycho.pomless.aggregator.names=releng,chi,cif,common,setext,thirdparty,tooldef,products"/>
+        <listEntry value="tycho.pomless.aggregator.names=releng,chi,cif,common,setext,thirdparty,tooldef,product"/>
    </listAttribute>
    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>

--- a/build.cmd
+++ b/build.cmd
 @echo off

 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
+:: Copyright (c) 2010, 2022 Contributors to the Eclipse Foundation
 ::
 :: See the NOTICE file(s) distributed with this work for additional
 :: information regarding copyright ownership.

--- a/build.launch
+++ b/build.launch
@@ -6,7 +6,7 @@
    <booleanAttribute key="M2_OFFLINE" value="false"/>
    <stringAttribute key="M2_PROFILES" value=""/>
    <listAttribute key="M2_PROPERTIES">
-        <listEntry value="tycho.pomless.aggregator.names=releng,chi,cif,common,setext,thirdparty,tooldef,products"/>
+        <listEntry value="tycho.pomless.aggregator.names=releng,chi,cif,common,setext,thirdparty,tooldef,product"/>
    </listAttribute>
    <stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
    <booleanAttribute key="M2_SKIP_TESTS" value="false"/>

--- a/build.sh
+++ b/build.sh
 #!/usr/bin/env sh

 ################################################################################
-# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2022 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

--- a/chi/org.eclipse.escet.chi.codegen.tests/.project
+++ b/chi/org.eclipse.escet.chi.codegen.tests/.project
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.escet.chi.codegen.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
-	</natures>
-</projectDescription>
--- a/chi/org.eclipse.escet.chi.codegen.tests/META-INF/MANIFEST.MF
+++ b/chi/org.eclipse.escet.chi.codegen.tests/META-INF/MANIFEST.MF
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ESCET Chi Java Code Generator Tests (Incubation)
-Bundle-SymbolicName: org.eclipse.escet.chi.codegen.tests;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-Vendor: Eclipse ESCET
-Require-Bundle: org.junit;bundle-version="4.12.0",
- org.eclipse.escet.chi.metamodel.java;bundle-version="0.4.0",
- org.eclipse.escet.common.box;bundle-version="0.4.0",
- org.eclipse.escet.common.java;bundle-version="0.4.0",
- org.eclipse.escet.chi.typecheck;bundle-version="0.4.0",
- org.eclipse.escet.common.position.metamodel;bundle-version="0.4.0",
- org.eclipse.escet.chi.runtime;bundle-version="0.4.0",
- org.eclipse.escet.common.position.common;bundle-version="0.4.0",
- org.eclipse.escet.chi.codegen;bundle-version="0.4.0",
- org.eclipse.escet.chi.metamodel;bundle-version="0.4.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Automatic-Module-Name: org.eclipse.escet.chi.codegen.tests
-Export-Package: org.eclipse.escet.chi.codegen.statements.seq.tests;x-internal:=true
--- a/chi/org.eclipse.escet.chi.codegen.tests/build.properties
+++ b/chi/org.eclipse.escet.chi.codegen.tests/build.properties
-###############################################################################
-# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
-#
-# See the NOTICE file(s) distributed with this work for additional
-# information regarding copyright ownership.
-#
-# This program and the accompanying materials are made available under the terms
-# of the MIT License which is available at https://opensource.org/licenses/MIT
-#
-# SPDX-License-Identifier: MIT
-###############################################################################
-
-source.. = src/
-output.. = target/classes
-bin.includes = META-INF/,\
-               .
--- a/chi/org.eclipse.escet.chi.codegen/.checkstyle
+++ b/chi/org.eclipse.escet.chi.codegen/.checkstyle
 <?xml version="1.0" encoding="UTF-8"?>

 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Eclipse ESCET Checkstyle" location="/org.eclipse.escet.configuration/checkstyle.xml" type="project" description="Eclipse ESCET Checkstyle.&#10;&#10;Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation&#10;&#10;See the NOTICE file(s) distributed with this work for additional&#10;information regarding copyright ownership.&#10;&#10;This program and the accompanying materials are made available under the terms&#10;of the MIT License which is available at https://opensource.org/licenses/MIT&#10;&#10;SPDX-License-Identifier: MIT">
+  <local-check-config name="Eclipse ESCET Checkstyle" location="/org.eclipse.escet.releng.configuration/checkstyle.xml" type="project" description="Eclipse ESCET Checkstyle.&#10;&#10;Copyright (c) 2010, 2022 Contributors to the Eclipse Foundation&#10;&#10;See the NOTICE file(s) distributed with this work for additional&#10;information regarding copyright ownership.&#10;&#10;This program and the accompanying materials are made available under the terms&#10;of the MIT License which is available at https://opensource.org/licenses/MIT&#10;&#10;SPDX-License-Identifier: MIT">
    <additional-data name="protect-config-file" value="false"/>
  </local-check-config>
  <fileset name="all" enabled="true" check-config-name="Eclipse ESCET Checkstyle" local="true">

--- a/chi/org.eclipse.escet.chi.codegen/.classpath
+++ b/chi/org.eclipse.escet.chi.codegen/.classpath
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="target/test-classes" path="src-test">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/chi/org.eclipse.escet.chi.codegen/META-INF/MANIFEST.MF
+++ b/chi/org.eclipse.escet.chi.codegen/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ESCET Chi Java Code Generator (Incubation)
 Bundle-SymbolicName: org.eclipse.escet.chi.codegen;singleton:=true
-Bundle-Version: 0.4.0.qualifier
+Bundle-Version: 0.5.0.qualifier
 Bundle-Vendor: Eclipse ESCET
-Require-Bundle: org.eclipse.escet.chi.metamodel;bundle-version="0.4.0",
- org.eclipse.escet.chi.metamodel.java;bundle-version="0.4.0",
- org.eclipse.escet.common.box;bundle-version="0.4.0",
- org.eclipse.escet.common.java;bundle-version="0.4.0",
- org.eclipse.escet.chi.typecheck;bundle-version="0.4.0",
- org.eclipse.escet.common.position.metamodel;bundle-version="0.4.0",
- org.eclipse.escet.chi.runtime;bundle-version="0.4.0",
- org.eclipse.escet.common.position.common;bundle-version="0.4.0"
+Require-Bundle: org.eclipse.escet.chi.metamodel;bundle-version="0.5.0",
+ org.eclipse.escet.chi.metamodel.java;bundle-version="0.5.0",
+ org.eclipse.escet.common.box;bundle-version="0.5.0",
+ org.eclipse.escet.common.java;bundle-version="0.5.0",
+ org.eclipse.escet.chi.typecheck;bundle-version="0.5.0",
+ org.eclipse.escet.common.position.metamodel;bundle-version="0.5.0",
+ org.eclipse.escet.chi.runtime;bundle-version="0.5.0",
+ org.eclipse.escet.common.position.common;bundle-version="0.5.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.escet.chi.codegen,

--- a/chi/org.eclipse.escet.chi.codegen/build.properties
+++ b/chi/org.eclipse.escet.chi.codegen/build.properties
 ###############################################################################
-# Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
+# Copyright (c) 2010, 2022 Contributors to the Eclipse Foundation
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.

--- a/chi/org.eclipse.escet.chi.codegen/docs/simulator.asciidoc
+++ b/chi/org.eclipse.escet.chi.codegen/docs/simulator.asciidoc
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2022 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.

--- a/chi/org.eclipse.escet.chi.codegen.tests/src/org/eclipse/escet/chi/codegen/statements/seq/tests/ConvertTest.java
+++ b/chi/org.eclipse.escet.chi.codegen.tests/src/org/eclipse/escet/chi/codegen/statements/seq/tests/ConvertTest.java
 //////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
+// Copyright (c) 2010, 2022 Contributors to the Eclipse Foundation
 //
 // See the NOTICE file(s) distributed with this work for additional
 // information regarding copyright ownership.
@@ -11,7 +11,7 @@
 // SPDX-License-Identifier: MIT
 //////////////////////////////////////////////////////////////////////////////

-package org.eclipse.escet.chi.codegen.statements.seq.tests;
+package org.eclipse.escet.chi.codegen.statements.seq;

 import static org.eclipse.escet.chi.codegen.statements.seq.Seq.convertStatements;
 import static org.eclipse.escet.common.java.Lists.listc;
@@ -21,7 +21,6 @@ import java.util.List;

 import org.eclipse.escet.chi.codegen.CodeGeneratorContext;
 import org.eclipse.escet.chi.codegen.java.JavaClass;
-import org.eclipse.escet.chi.codegen.statements.seq.Seq;
 import org.eclipse.escet.chi.metamodel.chi.ChiFactory;
 import org.eclipse.escet.chi.metamodel.chi.Statement;
 import org.eclipse.escet.common.box.VBox;