Skip to content

Commit

Permalink
Merge pull request #22 from spryker-eco/misc/license-file-change
Browse files Browse the repository at this point in the history
v2.0.0 misc/license-file-change
  • Loading branch information
alex-galych authored Sep 30, 2020
2 parents 3bd6dd5 + c135027 commit 11cadfa
Show file tree
Hide file tree
Showing 162 changed files with 556 additions and 486 deletions.
16 changes: 16 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
; This file is for unifying the coding style for different editors and IDEs.
; More information at https://editorconfig.org
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.bat]
end_of_line = crlf

[composer.json]
indent_size = 2
33 changes: 33 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Define the line ending behavior of the different file extensions
# Set the default behavior, in case people don't have core.autocrlf set.
* text text=auto eol=lf

# Denote all files that are truly binary and should not be modified.
*.png binary
*.jpg binary
*.gif binary
*.jpeg binary
*.zip binary
*.phar binary
*.ttf binary
*.woff binary
*.woff2 binary
*.eot binary
*.ico binary
*.mo binary
*.pdf binary
*.xsd binary
*.ts binary
*.exe binary

# Remove files for archives generated using `git archive`
codeception.yml export-ignore
dependency.json export-ignore
phpstan.json export-ignore
phpstan.neon export-ignore
tooling.yml export-ignore
.coveralls.yml export-ignore
.travis.yml export-ignore
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
4 changes: 2 additions & 2 deletions .license
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
* MIT License
* For full license information, please view the LICENSE file that was distributed with this source code.
* Copyright © 2016-present Spryker Systems GmbH. All rights reserved.
* Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.
*/
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
build:
environment:
php: '7.1'
php: '7.2'

tests:
override:
Expand Down
29 changes: 22 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: php
dist: trusty
os: linux
dist: bionic

notifications:
email: false
Expand All @@ -12,39 +13,53 @@ matrix:
- php: 7.2
env:
- PRODUCT_NAME=suite

- php: 7.2
env:
- PRODUCT_NAME=b2c-demo-shop

- php: 7.2
env:
- PRODUCT_NAME=b2b-demo-shop

services:
- postgresql
- redis
- redis-server
- rabbitmq

addons:
postgresql: 9.4
postgresql: 12

apt:
sources:
- sourceline: ppa:chris-lea/redis-server
- sourceline: deb http://dl.bintray.com/rabbitmq-erlang/debian bionic erlang
key_url: https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
- sourceline: deb https://dl.bintray.com/rabbitmq/debian bionic main
key_url: https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
- sourceline: ppa:ondrej/php
packages:
- redis-tools
- redis-server
- rabbitmq-server
- graphviz
- postgresql-12
- postgresql-client-12
- postgresql-server-dev-12

hosts:
- zed.de.spryker.test
- www.de.spryker.test

env:
global:
- APPLICATION_ENV=devtest
- APPLICATION_ENV=ci.pgsql
- SPRYKER_TESTING_ENABLED=1
- APPLICATION_STORE=DE
- MODULE_DIR=module
- SHOP_DIR=current
- MODULE_NAME=akeneo-pim-middleware-connector
- POSTGRES_PORT=5432
- POSTGRES_PORT=5433

cache:
directories:
Expand Down
22 changes: 5 additions & 17 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
MIT License
SPRYKER SYSTEMS GMBH – SPRYKER AKENEO CONNECTOR LICENSE AGREEMENT

Copyright (c) 2016-present Spryker Systems GmbH
SPRYKER SYSTEMS GMBH, REGISTERED WITH THE COMMERCIAL REGISTER OF THE LOWER COURT OF HAMBURG UNDER HRB 134310 (“WE” OR ”SPRYKER”) GRANTS YOU (THE “LICENSEE”) THE RIGHT TO USE THE SPRYKER AKENEO CONNECTOR (AS DEFINED BELOW) UNDER THE PROVISIONS OF THIS SPRYKER AKENEO CONNECTOR LICENSE AGREEMENT (THE “AGREEMENT”).

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The “SPRYKER AKENEO CONNECTOR” includes any software owned and distributed by Spryker under this Agreement. The SPRYKER AKENEO CONNECTOR contains elements of open source components, to which different license terms apply respectively. These open source components are needed to be installed separately. Spryker will grant to Licensee a license based on the general Software License Agreement of the Spryker Commerce OS or a license based on an Individual Agreement regarding the SPRYKER AKENEO CONNECTOR, which is mandatory to be signed between Spryker and Licensee prior to Licensee’s use of the SPRYKER AKENEO CONNECTOR. For referrence of the terms and conditions of Spryker’s general Software License Agreement or Individual Agreement, please get in contact with [email protected] or [email protected].

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
Licensee shall not (i) use the SPRYKER AKENEO CONNECTOR to set up a productive live system, for development purposes or any other purposes; (ii) copy any part of the SPRYKER AKENEO CONNECTOR (iii) distribute, disclose, market, rent, lease, or transfer the SPRYKER AKENEO CONNECTOR or act as a service bureau with respect to the SPRYKER AKENEO CONNECTOR; (iv) export the SPRYKER AKENEO CONNECTOR or install it in multiple locations; (v) disclose any confidential information provided by Spryker; (vi) modify or make derivative works of the SPRYKER AKENEO CONNECTOR; or (vii) allow others to make or obtain copies of the SPRYKER AKENEO CONNECTOR, unless it is permitted in the general Software License Agreement or a Individual Agreement, which has been concluded between Spryker and the Licensee.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
This Agreement shall be governed by the laws of Germany to the exclusion of IPR (International Law) and the United Nations Conventionon Contracts for the International Sale of Goods (CISG). The Parties consent to the jurisdiction of the courts in Berlin (Germany). This Agreement is not assignable or transferable by Licensee and any attempt to do so is null and void. This Agreement, the general Software License Agreement of the Spryker Commerce OS or the Individual Agreement constitutes the entire agreement between the Parties concerning Licensee’s use of SPRYKER AKENEO CONNECTOR. This Agreement supersedes any prior verbal understanding between the Parties and any Licensee purchase order or other ordering document, regardless of whether such document is received by Spryker before or after execution of this Agreement. This Agreement may be amended only in a writing signed by an authorized officer of Spryker.
19 changes: 16 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"name": "spryker-eco/akeneo-pim-middleware-connector",
"description": "AkeneoPimMiddlewareConnector module",
"type": "library",
"license": "MIT",
"license": "proprietary",
"require": {
"php": ">=7.1",
"php": ">=7.2",
"spryker/kernel": "^3.0.0",
"spryker/locale": "^3.0.0",
"spryker/tax": "^5.0.0",
"spryker-eco/akeneo-pim": "^1.0.0",
"spryker-eco/akeneo-pim": "^2.0.0",
"spryker-middleware/process": "^1.0.0",
"spryker/data-import": "^1.0.0"
},
Expand All @@ -19,9 +19,22 @@
}
},
"minimum-stability": "dev",
"prefer-stable": true,
"autoload-dev": {
"psr-4": {
"SprykerEcoTest\\": "tests/SprykerEcoTest/"
}
},
"scripts": {
"cs-check": "phpcs -p -s --standard=vendor/spryker/code-sniffer/Spryker/ruleset.xml src/ tests/",
"cs-fix": "phpcbf -p --standard=vendor/spryker/code-sniffer/Spryker/ruleset.xml src/ tests/"
},
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
},
"config": {
"sort-packages": true
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

/**
* MIT License
* For full license information, please view the LICENSE file that was distributed with this source code.
* Copyright © 2016-present Spryker Systems GmbH. All rights reserved.
* Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.
*/

namespace SprykerEco\Shared\AkeneoPimMiddlewareConnector;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php

/**
* MIT License
* For full license information, please view the LICENSE file that was distributed with this source code.
* Copyright © 2016-present Spryker Systems GmbH. All rights reserved.
* Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.
*/

namespace SprykerEco\Zed\AkeneoPimMiddlewareConnector;
Expand Down
Loading

0 comments on commit 11cadfa

Please sign in to comment.