Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

License CCL and GPLv3 #2061

Merged
merged 2 commits into from
Aug 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ entity that controls or is controlled by the legal entity, or is under common co
existing work.

* **Submitted** - conveyed to a Project via a pull request, commit, issue, or any form of electronic, written, or
verbal communication with Pimcore, contributors or maintainers.
verbal communication with CoreShop, contributors or maintainers.

#### 1. Grant of Copyright License.
Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and
to Pimcore a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce,
to CoreShop a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce,
prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your contributions and such
derivative works. Except for this license, You reserve all rights, title, and interest in your contributions.

#### 2. Grant of Patent License.
Subject to the terms and conditions of this agreement, You grant to the Projects’ maintainers, contributors, users and
to Pimcore a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section)
to CoreShop a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section)
patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer your contributions, where
such license applies only to those patent claims licensable by you that are necessarily infringed by your contribution
or by combination of your contribution with the project to which this contribution was submitted.
Expand Down
21 changes: 20 additions & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# License
Copyright (C) 2015-2021 CoreShop GmbH (https://www.coreshop.org)
Copyright (C) CoreShop GmbH

This software is available under two different licenses:
* GNU General Public License version 3 (GPLv3) as Pimcore Community Edition
* CoreShop Commercial License (CCL)

The default CoreShop license, without a valid CoreShop Commercial License agreement, is the Open-Source GPLv3 license.

## GNU General Public License version 3 (GPLv3)
If you decide to choose the GPLv3 license, you must comply with the following terms:

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
Expand All @@ -13,3 +22,13 @@ 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/>.

## CoreShop Commercial License (CCL)
Alternatively, commercial and supported versions of the program - also known as
Commercial Distributions - must be used in accordance with the terms and conditions
contained in a separate written agreement between you and CoreShop GmbH.
For more information about the CoreShop Commercial License (CCL) please contact info@coreshop.org.


Please see also (files in this directory):
[GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - gpl-3.0.txt](gpl-3.0.txt)
14 changes: 6 additions & 8 deletions bin/console
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
#!/usr/bin/env php
<?php
/**
* Pimcore
* CoreShop.
*
* This source file is available under two different licenses:
* - GNU General Public License version 3 (GPLv3)
* - Pimcore Enterprise License (PEL)
* Full copyright and license information is available in
* LICENSE.md which is distributed with this source code.
* This source file is subject to the GNU General Public License version 3 (GPLv3)
* For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt
* files that are distributed with this source code.
*
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* @license http://www.pimcore.org/license GPLv3 and PEL
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

ob_get_clean();
Expand Down
14 changes: 6 additions & 8 deletions public/index.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<?php
/**
* Pimcore
* CoreShop.
*
* This source file is available under two different licenses:
* - GNU General Public License version 3 (GPLv3)
* - Pimcore Enterprise License (PEL)
* Full copyright and license information is available in
* LICENSE.md which is distributed with this source code.
* This source file is subject to the GNU General Public License version 3 (GPLv3)
* For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt
* files that are distributed with this source code.
*
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* @license http://www.pimcore.org/license GPLv3 and PEL
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

use Pimcore\Tool;
Expand Down
14 changes: 6 additions & 8 deletions public/index_test.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<?php
/**
* Pimcore
* CoreShop.
*
* This source file is available under two different licenses:
* - GNU General Public License version 3 (GPLv3)
* - Pimcore Enterprise License (PEL)
* Full copyright and license information is available in
* LICENSE.md which is distributed with this source code.
* This source file is subject to the GNU General Public License version 3 (GPLv3)
* For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt
* files that are distributed with this source code.
*
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* @license http://www.pimcore.org/license GPLv3 and PEL
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

use Pimcore\Tool;
Expand Down
14 changes: 6 additions & 8 deletions public/index_test_precision.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<?php
/**
* Pimcore
* CoreShop.
*
* This source file is available under two different licenses:
* - GNU General Public License version 3 (GPLv3)
* - Pimcore Enterprise License (PEL)
* Full copyright and license information is available in
* LICENSE.md which is distributed with this source code.
* This source file is subject to the GNU General Public License version 3 (GPLv3)
* For the full copyright and license information, please view the LICENSE.md and gpl-3.0.txt
* files that are distributed with this source code.
*
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* @license http://www.pimcore.org/license GPLv3 and PEL
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

use Pimcore\Tool;
Expand Down
2 changes: 1 addition & 1 deletion src/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

namespace App;
Expand Down
2 changes: 1 addition & 1 deletion src/BehatKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

use Pimcore\Kernel as PimcoreKernel;
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Cli/InstallerContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/CartContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/CartPriceRuleContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/CategoryContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/CountryContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/CurrencyContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/CustomerContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/CustomerGroupContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/ExchangeRateContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/FilterContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/IndexContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/LinkGeneratorContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/MenuContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/NotificationContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/OrderContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/PimcoreClassContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/PimcoreContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/ProductContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/ProductUnitContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/RecycleBinContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Behat/Context/Domain/SEOContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* files that are distributed with this source code.
*
* @copyright Copyright (c) CoreShop GmbH (https://www.coreshop.org)
* @license https://www.coreshop.org/license GNU General Public License version 3 (GPLv3)
* @license https://www.coreshop.org/license GPLv3 and CCL
*/

declare(strict_types=1);
Expand Down
Loading