Commit 1f383809 authored by Dennis Hendriks's avatar Dennis Hendriks
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !27
parents 721d6df6 44acd2c2
Pipeline #105 passed with stage
in 0 seconds
################################################################################ ################################################################################
# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation # Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
# #
# See the NOTICE file(s) distributed with this work for additional # See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
......
################################################################################ ################################################################################
# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation # Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
# #
# See the NOTICE file(s) distributed with this work for additional # See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
......
################################################################################ ################################################################################
# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation # Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
# #
# See the NOTICE file(s) distributed with this work for additional # See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
......
<!-- <!--
Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
See the NOTICE file(s) distributed with this work for additional See the NOTICE file(s) distributed with this work for additional
information regarding copyright ownership. information regarding copyright ownership.
......
...@@ -7,7 +7,7 @@ Thanks for your interest in this project. ...@@ -7,7 +7,7 @@ Thanks for your interest in this project.
The Eclipse Supervisory Control Engineering Toolkit (Eclipse ESCET) project The Eclipse Supervisory Control Engineering Toolkit (Eclipse ESCET) project
provides a toolkit for the development of supervisory controllers. The toolkit provides a toolkit for the development of supervisory controllers. The toolkit
has a strong focus on industrial applicability, e.g. to cyber physical has a strong focus on industrial applicability, e.g. to cyber-physical
systems. The toolkit includes tooling to support the entire development systems. The toolkit includes tooling to support the entire development
process of (supervisory) controllers, including among others specification, process of (supervisory) controllers, including among others specification,
supervisory controller synthesis, simulation-based validation and supervisory controller synthesis, simulation-based validation and
...@@ -22,9 +22,10 @@ For more information, see: ...@@ -22,9 +22,10 @@ For more information, see:
## Developer resources ## Developer resources
For more information regarding source code management, builds, setting up a For more information regarding source code management, builds, setting up a
developer environment, coding standards, how to contribute, and more, see: developer environment, coding standards, how to contribute, and more, see
the Eclipse ESCET development documentation at:
* https://projects.eclipse.org/projects/technology.escet/developer * https://eclipse.org/escet/escet/#developer-chapter-index
The project maintains the following source code repositories: The project maintains the following source code repositories:
......
This diff is collapsed.
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation // Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
// //
// See the NOTICE file(s) distributed with this work for additional // See the NOTICE file(s) distributed with this work for additional
// information regarding copyright ownership. // information regarding copyright ownership.
...@@ -39,6 +39,8 @@ pipeline { ...@@ -39,6 +39,8 @@ pipeline {
mvn -version mvn -version
printenv printenv
./misc/license-header/license-header-check.bash
BUILD_ARGS= BUILD_ARGS=
if [[ "$GIT_BRANCH" == "master" || "$TAG_NAME" =~ ^v[0-9]+\\.[0-9]+.*$ ]]; then if [[ "$GIT_BRANCH" == "master" || "$TAG_NAME" =~ ^v[0-9]+\\.[0-9]+.*$ ]]; then
# Sign releases, based on release version tag name. # Sign releases, based on release version tag name.
...@@ -114,7 +116,8 @@ pipeline { ...@@ -114,7 +116,8 @@ pipeline {
rm -rf deploy/www/${RELEASE_VERSION} rm -rf deploy/www/${RELEASE_VERSION}
mkdir -p deploy/www/${RELEASE_VERSION} mkdir -p deploy/www/${RELEASE_VERSION}
cp releng/website/index.html deploy/www/${RELEASE_VERSION} cp releng/website/*.html deploy/www/${RELEASE_VERSION}
cp releng/website/*.png deploy/www/${RELEASE_VERSION}
sed -i -e "s/@VERSION@/${RELEASE_VERSION}/g" deploy/www/${RELEASE_VERSION}/index.html sed -i -e "s/@VERSION@/${RELEASE_VERSION}/g" deploy/www/${RELEASE_VERSION}/index.html
unzip -q products/org.eclipse.escet.documentation/target/*-website.zip -d deploy/www/${RELEASE_VERSION}/escet/ unzip -q products/org.eclipse.escet.documentation/target/*-website.zip -d deploy/www/${RELEASE_VERSION}/escet/
unzip -q chi/org.eclipse.escet.chi.documentation/target/*-website.zip -d deploy/www/${RELEASE_VERSION}/chi/ unzip -q chi/org.eclipse.escet.chi.documentation/target/*-website.zip -d deploy/www/${RELEASE_VERSION}/chi/
......
Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
......
...@@ -50,80 +50,8 @@ These can also be accessed via a web interface: ...@@ -50,80 +50,8 @@ These can also be accessed via a web interface:
## Third-party Content ## Third-party Content
com.github.javabdd For a complete list of all dependencies, see the `DEPENDENCIES.txt` file.
* Project: https://github.com/com-github-javabdd/com.github.javabdd
* Source: https://github.com/com-github-javabdd/com.github.javabdd
* License: GNU Library General Public License v2 (LGPLv2) or later
io.github.java-diff-utils
* Project: https://github.com/java-diff-utils/java-diff-utils
* Source: https://github.com/java-diff-utils/java-diff-utils
* License: Apache License 2.0
javax.inject
* License: Apache License 2.0
org.apache.batik
* License: Apache License 2.0
org.apache.commons.exec
* License: Apache License 2.0
org.apache.commons.io
* License: Apache License 2.0
org.apache.commons.lang
* License: Apache License 2.0
org.apache.commons.lang3
* License: Apache License 2.0
org.apache.commons.math3
* License: Apache License 2.0
org.apache.xalan
* License: Apache License 2.0
org.apache.xerces
* License: Apache License 2.0
org.eclipse.sdk
* License: Eclipse Public License 2.0
org.eclipse.emf
* License: Eclipse Public License 2.0
org.junit
* License: Eclipse Public License 1.0
* License: Common Public License Version 1.0
org.knowm.xchart
* Project: https://knowm.org/open-source/xchart/
* Source: https://github.com/knowm/XChart
* License: Apache License 2.0
org.w3c.css.sac
* License: Apache License 2.0, Public Domain, W3C
org.w3c.dom.svg
* License: Apache License 2.0
## Cryptography ## Cryptography
......
@echo off @echo off
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation :: Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
:: ::
:: See the NOTICE file(s) distributed with this work for additional :: See the NOTICE file(s) distributed with this work for additional
:: information regarding copyright ownership. :: information regarding copyright ownership.
......
#!/usr/bin/env sh #!/usr/bin/env sh
################################################################################ ################################################################################
# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation # Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
# #
# See the NOTICE file(s) distributed with this work for additional # See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false"> <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, 2020 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.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">
<additional-data name="protect-config-file" value="false"/> <additional-data name="protect-config-file" value="false"/>
</local-check-config> </local-check-config>
<fileset name="all" enabled="true" check-config-name="Eclipse ESCET Checkstyle" local="true"> <fileset name="all" enabled="true" check-config-name="Eclipse ESCET Checkstyle" local="true">
......
############################################################################### ###############################################################################
# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation # Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
# #
# See the NOTICE file(s) distributed with this work for additional # See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
......
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation // Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
// //
// See the NOTICE file(s) distributed with this work for additional // See the NOTICE file(s) distributed with this work for additional
// information regarding copyright ownership. // information regarding copyright ownership.
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false"> <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, 2020 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.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">
<additional-data name="protect-config-file" value="false"/> <additional-data name="protect-config-file" value="false"/>
</local-check-config> </local-check-config>
<fileset name="all" enabled="true" check-config-name="Eclipse ESCET Checkstyle" local="true"> <fileset name="all" enabled="true" check-config-name="Eclipse ESCET Checkstyle" local="true">
......
############################################################################### ###############################################################################
# Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation # Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
# #
# See the NOTICE file(s) distributed with this work for additional # See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
......
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation // Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
// //
// See the NOTICE file(s) distributed with this work for additional // See the NOTICE file(s) distributed with this work for additional
// information regarding copyright ownership. // information regarding copyright ownership.
......
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation // Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
// //
// See the NOTICE file(s) distributed with this work for additional // See the NOTICE file(s) distributed with this work for additional
// information regarding copyright ownership. // information regarding copyright ownership.
......
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation // Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
// //
// See the NOTICE file(s) distributed with this work for additional // See the NOTICE file(s) distributed with this work for additional
// information regarding copyright ownership. // information regarding copyright ownership.
......
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2010, 2020 Contributors to the Eclipse Foundation // Copyright (c) 2010, 2021 Contributors to the Eclipse Foundation
// //
// See the NOTICE file(s) distributed with this work for additional // See the NOTICE file(s) distributed with this work for additional
// information regarding copyright ownership. // information regarding copyright ownership.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment