Commit 3b0f95d5 authored by Markus Mirz's avatar Markus Mirz
Browse files

complete relicensing to MPL2


Signed-off-by: Markus Mirz's avatarMarkus Mirz <mmirz@eonerc.rwth-aachen.de>
parent 588b5d6c
This diff is collapsed.
......@@ -27,7 +27,7 @@ CMD [ "jupyter", "lab", "--ip=0.0.0.0", "--allow-root", "--no-browser", "--LabAp
LABEL \
org.label-schema.schema-version = "1.0" \
org.label-schema.name = "DPsim" \
org.label-schema.license = "GPL-3.0" \
org.label-schema.license = "MPL 2.0" \
org.label-schema.vendor = "Institute for Automation of Complex Power Systems, RWTH Aachen University" \
org.label-schema.author.name = "Markus Mirz" \
org.label-schema.author.email = "mmirz@eonerc.rwth-aachen.de" \
......
......@@ -7,7 +7,7 @@ ARG CIM_VERSION=CGMES_2.4.15_16FEB2016
LABEL \
org.label-schema.schema-version = "1.0" \
org.label-schema.name = "DPsim" \
org.label-schema.license = "GPL-3.0" \
org.label-schema.license = "MPL 2.0" \
org.label-schema.vendor = "Institute for Automation of Complex Power Systems, RWTH Aachen University" \
org.label-schema.author.name = "Markus Mirz" \
org.label-schema.author.email = "mmirz@eonerc.rwth-aachen.de" \
......
......@@ -6,7 +6,7 @@ ARG CIM_VERSION=CGMES_2.4.15_16FEB2016
LABEL \
org.label-schema.schema-version = "1.0" \
org.label-schema.name = "DPsim" \
org.label-schema.license = "GPL-3.0" \
org.label-schema.license = "MPL 2.0" \
org.label-schema.vendor = "Institute for Automation of Complex Power Systems, RWTH Aachen University" \
org.label-schema.author.name = "Steffen Vogel" \
org.label-schema.author.email = "stvogel@eonerc.rwth-aachen.de" \
......
......@@ -5,7 +5,7 @@ ARG VILLAS_VERSION=0.8.0
LABEL \
org.label-schema.schema-version = "1.0" \
org.label-schema.name = "DPsim" \
org.label-schema.license = "GPL-3.0" \
org.label-schema.license = "MPL 2.0" \
org.label-schema.vendor = "Institute for Automation of Complex Power Systems, RWTH Aachen University" \
org.label-schema.author.name = "Steffen Vogel" \
org.label-schema.author.email = "stvogel@eonerc.rwth-aachen.de" \
......
......@@ -11,7 +11,7 @@ ENV PLAT=manylinux2010_x86_64
LABEL \
org.label-schema.schema-version = "1.0" \
org.label-schema.name = "DPsim" \
org.label-schema.license = "GPL-3.0" \
org.label-schema.license = "MPL 2.0" \
org.label-schema.vendor = "Institute for Automation of Complex Power Systems, RWTH Aachen University" \
org.label-schema.author.name = "Steffen Vogel" \
org.label-schema.author.email = "stvogel@eonerc.rwth-aachen.de" \
......
......@@ -20,7 +20,7 @@ FROM fedora:29
LABEL \
org.label-schema.schema-version = "1.0" \
org.label-schema.name = "DPsim" \
org.label-schema.license = "GPL-3.0" \
org.label-schema.license = "MPL 2.0" \
org.label-schema.vendor = "Institute for Automation of Complex Power Systems, RWTH Aachen University" \
org.label-schema.author.name = "Steffen Vogel" \
org.label-schema.author.email = "stvogel@eonerc.rwth-aachen.de" \
......
......@@ -5,7 +5,7 @@ FROM rwthacs/dpsim:${DOCKER_TAG}
LABEL \
org.label-schema.schema-version = "1.0" \
org.label-schema.name = "DPsim" \
org.label-schema.license = "GPL-3.0" \
org.label-schema.license = "MPL 2.0" \
org.label-schema.vendor = "Institute for Automation of Complex Power Systems, RWTH Aachen University" \
org.label-schema.author.name = "Steffen Vogel" \
org.label-schema.author.email = "stvogel@eonerc.rwth-aachen.de" \
......
......@@ -20,10 +20,7 @@ The DPsim [documentation source](https://github.com/dpsim-simulator/docs) reposi
## License
Most of the DPsim source files are dual-licensed under the [MPL2](https://mozilla.org/MPL/2.0/) and [GPL3](http://www.gnu.org/licenses/).
The project is released under the terms of the GPL3 due to its dependency on VILLASnode.
For other licensing options, please consult [Prof. Antonello Monti](mailto:amonti@eonerc.rwth-aachen.de).
The project is released under the terms of the [MPL 2.0](https://mozilla.org/MPL/2.0/).
## Contact
......
......@@ -5,7 +5,7 @@
__author__ = "Markus Mirz, Steffen Vogel"
__copyright__ = "Copyright 2017-2018, Institute for Automation of Complex Power Systems, EONERC"
__credits__ = [ "Georg Reinke", "Steffen Vogel", "Markus Mirz" ]
__license__ = "GPL-3.0"
__license__ = "MPL 2.0"
__version__ = "0.1.0"
__maintainer__ = "Steffen Vogel"
__email__ = "stvogel@eonerc.rwth-aachen.de"
......
/* Copyright 2017-2020 Institute for Automation of Complex Power Systems,
* EONERC, RWTH Aachen University
* DPsim
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*********************************************************************************/
#include <chrono>
......
......@@ -10,7 +10,7 @@ set(CPACK_RPM_PACKAGE_RELEASE ${DPSIM_RELEASE})
set(CPACK_RPM_PACKAGE_VERSION ${DPSIM_VERSION})
set(CPACK_RPM_PACKAGE_RELEASE ${DPSIM_RELEASE})
set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
set(CPACK_RPM_PACKAGE_LICENSE "GPLv3")
set(CPACK_RPM_PACKAGE_LICENSE "MPL 2.0")
set(CPACK_RPM_PACKAGE_REQUIRES "libcimpp16v29a libvillas graphviz python3-libs python3 python3-pip")
set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
......
# CMakeLists.txt.
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2018, Institute for Automation of Complex Power Systems, EONERC
# @license GNU General Public License (version 3)
#
# VILLASnode
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
###################################################################################
# This CMake function sets the following variables:
#
# ${PREFIX}_VERSION_STR v0.6.3
......
......@@ -118,7 +118,7 @@ setup(
description='A real-time simulator that operates in the dynamic phasor as'
' well as electromagentic transient domain',
long_description_content_type='text/markdown',
license='GPL-3.0',
license='MPL 2.0',
keywords='simulation power system real-time',
url='https://www.fein-aachen.org/projects/dpsim/',
packages=find_packages('Source/Python'),
......@@ -130,7 +130,7 @@ setup(
classifiers=[
'Development Status :: 4 - Beta',
'Topic :: Scientific/Engineering',
'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
'Operating System :: MacOS :: MacOS X',
'Operating System :: Microsoft :: Windows',
'Operating System :: POSIX :: Linux',
......
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