diff --git a/LICENSE-EPL.txt b/LICENSE-EPL.txt deleted file mode 100644 index 5d80026f8e..0000000000 --- a/LICENSE-EPL.txt +++ /dev/null @@ -1,227 +0,0 @@ -Eclipse Public License - v 1.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF - THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial code and - documentation distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - - i) changes to the Program, and - - ii) additions to the Program; - - where such changes and/or additions to the Program originate from and - are distributed by that particular Contributor. A Contribution - 'originates' from a Contributor if it was added to the Program by such - Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include additions to the Program which: (i) are - separate modules of software distributed in conjunction with the - Program under their own license agreement, and (ii) are not derivative - works of the Program. - - "Contributor" means any person or entity that distributes the Program. - - "Licensed Patents" mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. - - "Program" means the Contributions distributed in accordance with this - Agreement. - - "Recipient" means anyone who receives the Program under this Agreement, - including all Contributors. - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare derivative works of, publicly display, - publicly perform, distribute and sublicense the Contribution of such - Contributor, if any, and such derivative works, in source code and - object code form. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, if - any, in source code and object code form. This patent license shall - apply to the combination of the Contribution and the Program if, at the - time the Contribution is added by the Contributor, such addition of the - Contribution causes such combination to be covered by the Licensed - Patents. The patent license shall not apply to any other combinations - which include the Contribution. No hardware per se is licensed - hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. Each - Contributor disclaims any liability to Recipient for claims brought by - any other entity based on infringement of intellectual property rights - or otherwise. As a condition to exercising the rights and licenses - granted hereunder, each Recipient hereby assumes sole responsibility to - secure any other intellectual property rights needed, if any. For - example, if a third party patent license is required to allow Recipient - to distribute the Program, it is Recipient's responsibility to acquire - that license before distributing the Program. - - d) Each Contributor represents that to its knowledge it has sufficient - copyright rights in its Contribution, if any, to grant the copyright - license set forth in this Agreement. - - 3. REQUIREMENTS - - A Contributor may choose to distribute the Program in object code form - under its own license agreement, provided that: - - a) it complies with the terms and conditions of this Agreement; and - - b) its license agreement: - - i) effectively disclaims on behalf of all Contributors all warranties - and conditions, express and implied, including warranties or conditions - of title and non-infringement, and implied warranties or conditions of - merchantability and fitness for a particular purpose; - - ii) effectively excludes on behalf of all Contributors all liability - for damages, including direct, indirect, special, incidental and - consequential damages, such as lost profits; - - iii) states that any provisions which differ from this Agreement are - offered by that Contributor alone and not by any other party; and - - iv) states that source code for the Program is available from such - Contributor, and informs licensees how to obtain it in a reasonable - manner on or through a medium customarily used for software exchange. - - When the Program is made available in source code form: - - a) it must be made available under this Agreement; and - - b) a copy of this Agreement must be included with each copy of the - Program. - - Contributors may not remove or alter any copyright notices contained - within the Program. - - Each Contributor must identify itself as the originator of its - Contribution, if any, in a manner that reasonably allows subsequent - Recipients to identify the originator of the Contribution. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, - the Contributor who includes the Program in a commercial product - offering should do so in a manner which does not create potential - liability for other Contributors. Therefore, if a Contributor includes - the Program in a commercial product offering, such Contributor - ("Commercial Contributor") hereby agrees to defend and indemnify every - other Contributor ("Indemnified Contributor") against any losses, - damages and costs (collectively "Losses") arising from claims, lawsuits - and other legal actions brought by a third party against the - Indemnified Contributor to the extent caused by the acts or omissions - of such Commercial Contributor in connection with its distribution of - the Program in a commercial product offering. The obligations in this - section do not apply to any claims or Losses relating to any actual or - alleged intellectual property infringement. In order to qualify, an - Indemnified Contributor must: a) promptly notify the Commercial - Contributor in writing of such claim, and b) allow the Commercial - Contributor to control, and cooperate with the Commercial Contributor - in, the defense and any related settlement negotiations. The - Indemnified Contributor may participate in any such claim at its own - expense. - - For example, a Contributor might include the Program in a commercial - product offering, Product X. That Contributor is then a Commercial - Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance - claims and warranties are such Commercial Contributor's responsibility - alone. Under this section, the Commercial Contributor would have to - defend claims against the other Contributors related to those - performance claims and warranties, and if a court requires any other - Contributor to pay any damages as a result, the Commercial Contributor - must pay those damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS - PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY - WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR - FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible - for determining the appropriateness of using and distributing the - Program and assumes all risks associated with its exercise of rights - under this Agreement , including but not limited to the risks and costs - of program errors, compliance with applicable laws, damage to or loss - of data, programs or equipment, and unavailability or interruption of - operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR - ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING - WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR - DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED - HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this Agreement, and without further - action by the parties hereto, such provision shall be reformed to the - minimum extent necessary to make such provision valid and enforceable. - - If Recipient institutes patent litigation against any entity (including - a cross-claim or counterclaim in a lawsuit) alleging that the Program - itself (excluding combinations of the Program with other software or - hardware) infringes such Recipient's patent(s), then such Recipient's - rights granted under Section 2(b) shall terminate as of the date such - litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it fails - to comply with any of the material terms or conditions of this - Agreement and does not cure such failure in a reasonable period of time - after becoming aware of such noncompliance. If all Recipient's rights - under this Agreement terminate, Recipient agrees to cease use and - distribution of the Program as soon as reasonably practicable. However, - Recipient's obligations under this Agreement and any licenses granted - by Recipient relating to the Program shall continue and survive. - - Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and - may only be modified in the following manner. The Agreement Steward - reserves the right to publish new versions (including revisions) of - this Agreement from time to time. No one other than the Agreement - Steward has the right to modify this Agreement. The Eclipse Foundation - is the initial Agreement Steward. The Eclipse Foundation may assign the - responsibility to serve as the Agreement Steward to a suitable separate - entity. Each new version of the Agreement will be given a - distinguishing version number. The Program (including Contributions) - may always be distributed subject to the version of the Agreement under - which it was received. In addition, after a new version of the - Agreement is published, Contributor may elect to distribute the Program - (including its Contributions) under the new version. Except as - expressly stated in Sections 2(a) and 2(b) above, Recipient receives no - rights or licenses to the intellectual property of any Contributor - under this Agreement, whether expressly, by implication, estoppel or - otherwise. All rights in the Program not expressly granted under this - Agreement are reserved. - - This Agreement is governed by the laws of the State of New York and the - intellectual property laws of the United States of America. No party to - this Agreement will bring a legal action under this Agreement more than - one year after the cause of action arose. Each party waives its rights - to a jury trial in any resulting litigation. diff --git a/LICENSE-EPLv2.md b/LICENSE-EPLv2.md new file mode 100644 index 0000000000..a32decd83d --- /dev/null +++ b/LICENSE-EPLv2.md @@ -0,0 +1,98 @@ +Eclipse Public License - v 2.0 +============================== + +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +### 1. Definitions + +“Contribution” means: +* **a)** in the case of the initial Contributor, the initial content Distributed under this Agreement, and +* **b)** in the case of each subsequent Contributor: + * **i)** changes to the Program, and + * **ii)** additions to the Program; +where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works. + +“Contributor” means any person or entity that Distributes the Program. + +“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. + +“Program” means the Contributions Distributed in accordance with this Agreement. + +“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors. + +“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. + +“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or Modified Works thereof. + +“Distribute” means the acts of **a)** distributing or **b)** making available in any manner that enables the transfer of a copy. + +“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files. + +“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor. + +### 2. Grant of Rights + +**a)** Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works. + +**b)** Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. + +**c)** Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to Distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. + +**d)** Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. + +**e)** Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3). + +### 3. Requirements + +**3.1** If a Contributor Distributes the Program in any form, then: + +* **a)** the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and + +* **b)** the Contributor may Distribute the Program under a license different than this Agreement, provided that such license: + * **i)** effectively disclaims on behalf of all other Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; + * **ii)** effectively excludes on behalf of all other Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; + * **iii)** does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and + * **iv)** requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3. + +**3.2** When the Program is Distributed as Source Code: + +* **a)** it must be made available under this Agreement, or if the Program **(i)** is combined with other material in a separate file or files made available under a Secondary License, and **(ii)** the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and +* **b)** a copy of this Agreement must be included with each copy of the Program. + +**3.3** Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (“notices”) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices. + +### 4. Commercial Distribution + +Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (“Commercial Contributor”) hereby agrees to defend and indemnify every other Contributor (“Indemnified Contributor”) against any losses, damages and costs (collectively “Losses”) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: **a)** promptly notify the Commercial Contributor in writing of such claim, and **b)** allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. + +### 5. No Warranty + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. + +### 6. Disclaimer of Liability + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +### 7. General + +If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be Distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to Distribute the Program (including its Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement. + +#### Exhibit A - Form of Secondary Licenses Notice + +> “This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}.” + +Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses. + +If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice. + +You may add additional accurate notices of copyright ownership. diff --git a/README.md b/README.md index c069a7e45c..48f4f2a9a9 100644 --- a/README.md +++ b/README.md @@ -45,14 +45,14 @@ Current development is supported by the Federal Ministry for Economic Affairs an Copyright (c) 2012-2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution, -and are available at http://www.eclipse.org/legal/epl-v10.html +and are available at http://www.eclipse.org/legal/epl-v20.html and http://www.apache.org/licenses/LICENSE-2.0 [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html [CloudCycle]: http://www.cloudcycle.org/en/ - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html [Federal Ministry for Economic Affairs and Energy]: http://www.bmwi.de/EN/ [Scalable JavaScript Application Architecture]: http://www.slideshare.net/nzakas/scalable-javascript-application-architecture-2012 [SmartOrchestra]: http://smartorchestra.de/en/ diff --git a/docs/adr/0000-use-architectural-decision-records.md b/docs/adr/0000-use-architectural-decision-records.md index 869a4d9cad..21f1b81225 100644 --- a/docs/adr/0000-use-architectural-decision-records.md +++ b/docs/adr/0000-use-architectural-decision-records.md @@ -19,7 +19,7 @@ We need to record the architectural decisions made on this project. Copyright (c) 2017 University of Stuttgart. -All rights reserved. Made available under the terms of the [Eclipse Public License v1.0] and the [Apache License v2.0] which both accompany this distribution. +All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/adr/0001-use-filesystem-as-backend.md b/docs/adr/0001-use-filesystem-as-backend.md index fe3555f521..d4e85bee17 100644 --- a/docs/adr/0001-use-filesystem-as-backend.md +++ b/docs/adr/0001-use-filesystem-as-backend.md @@ -33,7 +33,7 @@ These contents need to be shared. Copyright (c) 2017 University of Stuttgart. -All rights reserved. Made available under the terms of the [Eclipse Public License v1.0] and the [Apache License v2.0] which both accompany this distribution. +All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/adr/0002-filesystem-folder-structure-using-type-namespace-id-structure.md b/docs/adr/0002-filesystem-folder-structure-using-type-namespace-id-structure.md index e0a5844c8a..ab3e69d675 100644 --- a/docs/adr/0002-filesystem-folder-structure-using-type-namespace-id-structure.md +++ b/docs/adr/0002-filesystem-folder-structure-using-type-namespace-id-structure.md @@ -47,7 +47,7 @@ Therefore, the names have to be [encoded](https://en.wikipedia.org/wiki/Characte Copyright (c) 2017 University of Stuttgart. -All rights reserved. Made available under the terms of the [Eclipse Public License v1.0] and the [Apache License v2.0] which both accompany this distribution. +All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/adr/0003-double-encoded-urls.md b/docs/adr/0003-double-encoded-urls.md index 78d1d57a74..0a37540888 100644 --- a/docs/adr/0003-double-encoded-urls.md +++ b/docs/adr/0003-double-encoded-urls.md @@ -37,7 +37,7 @@ More information about encoding is available at [dev/Encoding.md](dev/Encoding). Copyright (c) 2017 University of Stuttgart. -All rights reserved. Made available under the terms of the [Eclipse Public License v1.0] and the [Apache License v2.0] which both accompany this distribution. +All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/adr/0004-oauth.md b/docs/adr/0004-oauth.md index 6a10d57951..ba7940e7e4 100644 --- a/docs/adr/0004-oauth.md +++ b/docs/adr/0004-oauth.md @@ -47,13 +47,13 @@ In order to use (private) repositories instead of uploading all files into a Art Copyright (c) 2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution, -and are available at http://www.eclipse.org/legal/epl-v10.html +and are available at http://www.eclipse.org/legal/epl-v20.html and http://www.apache.org/licenses/LICENSE-2.0 Contributors: * Lukas Harzenetter - initial API and implementation [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/adr/0005-XML-editor-does-not-enfore-validation.md b/docs/adr/0005-XML-editor-does-not-enfore-validation.md index c9300a6372..719a25215c 100644 --- a/docs/adr/0005-XML-editor-does-not-enfore-validation.md +++ b/docs/adr/0005-XML-editor-does-not-enfore-validation.md @@ -17,7 +17,7 @@ Copyright (c) 2017 University of Stuttgart. -All rights reserved. Made available under the terms of the [Eclipse Public License v1.0] and the [Apache License v2.0] which both accompany this distribution. +All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/adr/template.md b/docs/adr/template.md index 42403e2eba..3673ac2e16 100644 --- a/docs/adr/template.md +++ b/docs/adr/template.md @@ -46,7 +46,7 @@ Copyright (c) 2017 University of Stuttgart. -All rights reserved. Made available under the terms of the [Eclipse Public License v1.0] and the [Apache License v2.0] which both accompany this distribution. +All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/dev/CodeHeaders.md b/docs/dev/CodeHeaders.md index 7a24d479fe..fdfe685d3e 100644 --- a/docs/dev/CodeHeaders.md +++ b/docs/dev/CodeHeaders.md @@ -8,9 +8,9 @@ This file explains how to create and maintain copyright headers in source files. /*********************************************************************** * Copyright (c) {DATE} {INITIAL COPYRIGHT OWNER} {OTHER COPYRIGHT OWNERS}. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * and Apache License v2.0 which accompanies this distribution. - * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v20.html * and the Apache License v2.0 is available at * http://www.opensource.org/licenses/apache2.0.php. * You may elect to redistribute this code under either of these licenses. @@ -33,8 +33,8 @@ Full information is available at: http://www.eclipse.org/legal/copyrightandlicen Copyright (c) 2013-2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/dev/Encoding.md b/docs/dev/Encoding.md index 8d750712fb..928ae3c813 100644 --- a/docs/dev/Encoding.md +++ b/docs/dev/Encoding.md @@ -57,8 +57,8 @@ Summary: Because the namespace is part of the used URIs and the ns itself is a U Copyright (c) 2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/dev/RepositoryLayout.md b/docs/dev/RepositoryLayout.md index f359d4a901..0814958bbb 100644 --- a/docs/dev/RepositoryLayout.md +++ b/docs/dev/RepositoryLayout.md @@ -111,8 +111,8 @@ The local name is sufficient as the namespace is given by the parent directory. Copyright (c) 2013-2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/dev/RepositoryUI.md b/docs/dev/RepositoryUI.md index bc946689bb..1715e81ffb 100644 --- a/docs/dev/RepositoryUI.md +++ b/docs/dev/RepositoryUI.md @@ -54,8 +54,8 @@ can be found in `org.eclipse.winery.repository.ui/dist/doc/index.html`. It is al Copyright (c) 2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/dev/ToolChain.md b/docs/dev/ToolChain.md index c2f76a5851..4ccc4f9179 100644 --- a/docs/dev/ToolChain.md +++ b/docs/dev/ToolChain.md @@ -129,8 +129,8 @@ For that, create a pull request to https://github.com/opentosca/winery to enable Copyright (c) 2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/dev/angular-ui.md b/docs/dev/angular-ui.md index 5c785d333c..77f5d70740 100644 --- a/docs/dev/angular-ui.md +++ b/docs/dev/angular-ui.md @@ -73,8 +73,8 @@ Execute `mvn package`. Copyright (c) 2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/dev/config/Eclipse/README.md b/docs/dev/config/Eclipse/README.md index 03dcff7cf4..7e8efc6dc8 100644 --- a/docs/dev/config/Eclipse/README.md +++ b/docs/dev/config/Eclipse/README.md @@ -65,8 +65,8 @@ Copy `winery.properties` to `path-to-workspace\.metadata\.plugins\org.eclipse.ws Copyright (c) 2012-2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/dev/config/IntelliJ IDEA/README.md b/docs/dev/config/IntelliJ IDEA/README.md index ae2c6228be..b87ceacd2c 100644 --- a/docs/dev/config/IntelliJ IDEA/README.md +++ b/docs/dev/config/IntelliJ IDEA/README.md @@ -45,8 +45,8 @@ Preparation: Generate a war to have all dependencies fetched by maven: `mvn pack Copyright (c) 2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/dev/index.md b/docs/dev/index.md index eb7822acbf..ae3a99a5db 100644 --- a/docs/dev/index.md +++ b/docs/dev/index.md @@ -573,10 +573,10 @@ This can be directly cloned into `c:\winery-repository`. Copyright (c) 2013-2017 University of Stuttgart. -All rights reserved. Made available under the terms of the [Eclipse Public License v1.0] and the [Apache License v2.0] which both accompany this distribution. +All rights reserved. Made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache Maven]: https://maven.apache.org/ [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html [bower]: https://bower.io/ - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html [jsPlumb#165]: https://github.com/jsplumb/jsPlumb/issues/165 diff --git a/docs/dev/repositoryUiAngularComponentDiagram.plantuml b/docs/dev/repositoryUiAngularComponentDiagram.plantuml index 92de2d8321..1ab2871e9e 100644 --- a/docs/dev/repositoryUiAngularComponentDiagram.plantuml +++ b/docs/dev/repositoryUiAngularComponentDiagram.plantuml @@ -3,9 +3,9 @@ Onlineeditor: https://www.planttext.com/ Copyright (c) 2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 +are made available under the terms of the Eclipse Public License v2.0 and the Apache License 2.0 which both accompany this distribution, -and are available at http://www.eclipse.org/legal/epl-v10.html +and are available at http://www.eclipse.org/legal/epl-v20.html and http://www.apache.org/licenses/LICENSE-2.0 Contributors: diff --git a/docs/index.md b/docs/index.md index 9d79a43e07..cbabe5d15d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -13,10 +13,10 @@ Please head to [CONTRIBUTING.md](https://github.com/eclipse/winery/blob/master/C Copyright (c) 2013-2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution, -and are available at http://www.eclipse.org/legal/epl-v10.html +and are available at http://www.eclipse.org/legal/epl-v20.html and http://www.apache.org/licenses/LICENSE-2.0 [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/inject-interaction.plantuml b/docs/inject-interaction.plantuml index 63ee88c910..60d2e97d9e 100644 --- a/docs/inject-interaction.plantuml +++ b/docs/inject-interaction.plantuml @@ -3,9 +3,9 @@ Onlineeditor: https://www.planttext.com/ Copyright (c) 2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License v1.0 +are made available under the terms of the Eclipse Public License v2.0 and the Apache License 2.0 which both accompany this distribution, -and are available at http://www.eclipse.org/legal/epl-v10.html +and are available at http://www.eclipse.org/legal/epl-v20.html and http://www.apache.org/licenses/LICENSE-2.0 Contributors: diff --git a/docs/tosca/README.md b/docs/tosca/README.md index 4088525e89..1baeab11b3 100644 --- a/docs/tosca/README.md +++ b/docs/tosca/README.md @@ -29,9 +29,9 @@ See http://www.opentosca.org/#publications for a list of publications in the Ope Copyright (c) 2014 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution, -and are available at http://www.eclipse.org/legal/epl-v10.html +and are available at http://www.eclipse.org/legal/epl-v20.html and http://www.apache.org/licenses/LICENSE-2.0 [DOI:10.1109/MIC.2012.43]: http://dx.doi.org/10.1109/MIC.2012.43 diff --git a/docs/tosca/TOSCA-Simple-Profile-in-YAML-v1.0-os-class-diagram.plantuml b/docs/tosca/TOSCA-Simple-Profile-in-YAML-v1.0-os-class-diagram.plantuml index 863f4de68d..126c795f86 100644 --- a/docs/tosca/TOSCA-Simple-Profile-in-YAML-v1.0-os-class-diagram.plantuml +++ b/docs/tosca/TOSCA-Simple-Profile-in-YAML-v1.0-os-class-diagram.plantuml @@ -1,9 +1,9 @@ /******************************************************************************* * Copyright (c) 2017 University of Stuttgart. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html + * and are available at http://www.eclipse.org/legal/epl-v20.html * and http://www.apache.org/licenses/LICENSE-2.0 * * Contributors: @@ -339,4 +339,4 @@ class toscaArtifactImplementation { } -@enduml \ No newline at end of file +@enduml diff --git a/docs/tosca/TOSCA-v1.0-os-class-diagram.plantuml b/docs/tosca/TOSCA-v1.0-os-class-diagram.plantuml index d1860783e5..075a858fa6 100644 --- a/docs/tosca/TOSCA-v1.0-os-class-diagram.plantuml +++ b/docs/tosca/TOSCA-v1.0-os-class-diagram.plantuml @@ -1,9 +1,9 @@ /*********************************************************************** * Copyright (c) 2013-2014 University of Stuttgart. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * and Apache License v2.0 which accompanies this distribution. - * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v20.html * and the Apache License v2.0 is available at * http://www.opensource.org/licenses/apache2.0.php. * You may elect to redistribute this code under either of these licenses. diff --git a/docs/tosca/startplantuml.bat b/docs/tosca/startplantuml.bat index 9da178a845..aefd23efee 100644 --- a/docs/tosca/startplantuml.bat +++ b/docs/tosca/startplantuml.bat @@ -1,9 +1,9 @@ :/*********************************************************************** : * Copyright (c) 2013-2014 University of Stuttgart. : * All rights reserved. This program and the accompanying materials -: * are made available under the terms of the Eclipse Public License v1.0 +: * are made available under the terms of the Eclipse Public License v2.0 : * and Apache License v2.0 which accompanies this distribution. -: * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html +: * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v20.html : * and the Apache License v2.0 is available at : * http://www.opensource.org/licenses/apache2.0.php. : * You may elect to redistribute this code under either of these licenses. diff --git a/docs/user/DASpecification.md b/docs/user/DASpecification.md index 3fdea94264..9d8ff140f4 100644 --- a/docs/user/DASpecification.md +++ b/docs/user/DASpecification.md @@ -18,8 +18,8 @@ As a result, arbitrary middleware can be injected and the respective driver is u Copyright (c) 2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/user/Splitting.md b/docs/user/Splitting.md index d0300ed22e..5e5ff01031 100644 --- a/docs/user/Splitting.md +++ b/docs/user/Splitting.md @@ -51,8 +51,8 @@ By using this function a vertical as well as horizontal matching is possible. Copyright (c) 2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/user/TopologyCompletion.md b/docs/user/TopologyCompletion.md index 95a483333d..917c1f43bc 100644 --- a/docs/user/TopologyCompletion.md +++ b/docs/user/TopologyCompletion.md @@ -79,11 +79,11 @@ Please head to the [tutorial](TopologyCompletionTutorial). Copyright (c) 2013-2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html Contributors: * Pascal Hirmer - initial API and implementation diff --git a/docs/user/TopologyCompletionTutorial.md b/docs/user/TopologyCompletionTutorial.md index 043f96330e..ae1bbf1288 100644 --- a/docs/user/TopologyCompletionTutorial.md +++ b/docs/user/TopologyCompletionTutorial.md @@ -90,11 +90,11 @@ Keep choosing Node Templates until you receive a notification that the completio Copyright (c) 2013-2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html Contributors: * Pascal Hirmer - initial API and implementation diff --git a/docs/user/XaaSPackager.md b/docs/user/XaaSPackager.md index 799bcbc93f..1c0c11eb20 100644 --- a/docs/user/XaaSPackager.md +++ b/docs/user/XaaSPackager.md @@ -63,8 +63,8 @@ After setting all required inputs, a click on the *add* button triggers a search Copyright (c) 2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/docs/user/index.md b/docs/user/index.md index 15e3cd2e39..862692688a 100644 --- a/docs/user/index.md +++ b/docs/user/index.md @@ -61,8 +61,8 @@ In case you start from a fresh repository, please ensure that the Artifact Type Copyright (c) 2017 University of Stuttgart. All rights reserved. This program and the accompanying materials -are made available under the terms of the [Eclipse Public License v1.0] +are made available under the terms of the [Eclipse Public License v2.0] and the [Apache License v2.0] which both accompany this distribution. [Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html - [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html + [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html diff --git a/generate-stats.bat b/generate-stats.bat index 006853bf6b..0edd27d60c 100644 --- a/generate-stats.bat +++ b/generate-stats.bat @@ -3,9 +3,9 @@ GOTO EndOfLicense /** * Copyright (c) 2017 University of Stuttgart. * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 + * are made available under the terms of the Eclipse Public License v2.0 * and the Apache License 2.0 which both accompany this distribution, - * and are available at http://www.eclipse.org/legal/epl-v10.html + * and are available at http://www.eclipse.org/legal/epl-v20.html * and http://www.apache.org/licenses/LICENSE-2.0 * * Contributors: diff --git a/notice.html b/notice.html index f19c483b9c..c201955ba1 100644 --- a/notice.html +++ b/notice.html @@ -21,8 +21,8 @@
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. +
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 + ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v20.html. For purposes of the EPL, "Program" will mean the Content.
Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
diff --git a/org.eclipse.winery.bpmn4tosca.converter.tobpel/README.md b/org.eclipse.winery.bpmn4tosca.converter.tobpel/README.md
index c8a6ae12c4..8a1be37a27 100644
--- a/org.eclipse.winery.bpmn4tosca.converter.tobpel/README.md
+++ b/org.eclipse.winery.bpmn4tosca.converter.tobpel/README.md
@@ -13,12 +13,12 @@ Use IntelliJ as Eclipse has issues with `trim_trailing_whitespace = true`.
Copyright (c) 2015-2017 University of Stuttgart.
All rights reserved. This program and the accompanying materials
-are made available under the terms of the [Eclipse Public License v1.0]
+are made available under the terms of the [Eclipse Public License v2.0]
and the [Apache License v2.0] which both accompany this distribution,
-and are available at http://www.eclipse.org/legal/epl-v10.html
+and are available at http://www.eclipse.org/legal/epl-v20.html
and http://www.apache.org/licenses/LICENSE-2.0.
Please check the [EPL FAQ](https://eclipse.org/legal/eplfaq.php#DUALLIC) for implications.
[Apache License v2.0]: http://www.apache.org/licenses/LICENSE-2.0.html
- [Eclipse Public License v1.0]: http://www.eclipse.org/legal/epl-v10.html
+ [Eclipse Public License v2.0]: http://www.eclipse.org/legal/epl-v20.html
diff --git a/org.eclipse.winery.bpmn4tosca.converter.tobpel/pom.xml b/org.eclipse.winery.bpmn4tosca.converter.tobpel/pom.xml
index dc38e4d27b..f820ed760b 100644
--- a/org.eclipse.winery.bpmn4tosca.converter.tobpel/pom.xml
+++ b/org.eclipse.winery.bpmn4tosca.converter.tobpel/pom.xml
@@ -2,9 +2,9 @@
/*******************************************************************************
* Copyright (c) 2017 University of Stuttgart.
* All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ * are made available under the terms of the Eclipse Public License v2.0
* and the Apache License 2.0 which both accompany this distribution,
- * and are available at http://www.eclipse.org/legal/epl-v10.html
+ * and are available at http://www.eclipse.org/legal/epl-v20.html
* and http://www.apache.org/licenses/LICENSE-2.0
*
* Contributors:
@@ -77,8 +77,8 @@
The Eclipse Foundation makes available all content in this plug-in (“Content”). Unless otherwise
indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (“EPL”)
+Eclipse Public License Version 2.0 (“EPL”)
and Apache License Version 2.0.
-A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html
+A copy of the EPL is available at http://www.eclipse.org/legal/epl-v20.html
and a copy of the Apache License Version 2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
You may elect to redistribute this code under either of these licenses.
For purposes of the EPL, “Program” will mean the Content.
@@ -80,7 +80,7 @@ License
Logback Classic – Version 1.1.1
License
EPL/LGPL dual license.
- EPL: http://www.eclipse.org/legal/epl-v10.html.
+ EPL: http://www.eclipse.org/legal/epl-v20.html.
LGPL v2.1: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.
A copy of the license is contained in the file LICENSE-logback.txt and is also available at http://logback.qos.ch/license.html.
The Eclipse Foundation elects to include this software in this distribution under the EPL license.
@@ -96,7 +96,7 @@ Logback Core – Version 1.1.1
License
EPL/LGPL dual license.
- EPL: http://www.eclipse.org/legal/epl-v10.html.
+ EPL: http://www.eclipse.org/legal/epl-v20.html.
LGPL v2.1: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.
A copy of the license is contained in the file LICENSE-logback.txt and is also available at http://logback.qos.ch/license.html.
The Eclipse Foundation elects to include this software in this distribution under the EPL license.
@@ -128,4 +128,4 @@ SLF4J: jcl-over-slf4j – Version 1.7.6