From 90134aef95bdd3689f8236eab233b09e6c84a9a1 Mon Sep 17 00:00:00 2001
From: Marcel Hauri <marcel@hauri.me>
Date: Mon, 30 Jul 2018 08:48:05 +0200
Subject: [PATCH 1/2] [fix] license in composer

---
 app/code/Magento/AdvancedSearch/Test/Mftf/composer.json      | 5 +++--
 app/code/Magento/AdvancedSearch/composer.json                | 3 ++-
 app/code/Magento/Amqp/Test/Mftf/composer.json                | 3 ++-
 app/code/Magento/Amqp/composer.json                          | 3 ++-
 .../Magento/AsynchronousOperations/Test/Mftf/composer.json   | 3 ++-
 app/code/Magento/AsynchronousOperations/composer.json        | 3 ++-
 app/code/Magento/Authorizenet/Test/Mftf/composer.json        | 3 ++-
 app/code/Magento/Authorizenet/composer.json                  | 3 ++-
 app/code/Magento/Braintree/Test/Mftf/composer.json           | 3 ++-
 app/code/Magento/Braintree/composer.json                     | 3 ++-
 app/code/Magento/Elasticsearch/Test/Mftf/composer.json       | 3 ++-
 app/code/Magento/Elasticsearch/composer.json                 | 3 ++-
 app/code/Magento/EncryptionKey/Test/Mftf/composer.json       | 3 ++-
 app/code/Magento/EncryptionKey/composer.json                 | 3 ++-
 app/code/Magento/MessageQueue/Test/Mftf/composer.json        | 3 ++-
 app/code/Magento/MessageQueue/composer.json                  | 3 ++-
 app/code/Magento/MysqlMq/Test/Mftf/composer.json             | 3 ++-
 app/code/Magento/MysqlMq/composer.json                       | 3 ++-
 app/code/Magento/Paypal/Test/Mftf/composer.json              | 3 ++-
 app/code/Magento/Paypal/composer.json                        | 3 ++-
 app/code/Magento/ProductVideo/Test/Mftf/composer.json        | 3 ++-
 app/code/Magento/ProductVideo/composer.json                  | 3 ++-
 app/code/Magento/Signifyd/Test/Mftf/composer.json            | 3 ++-
 app/code/Magento/Signifyd/composer.json                      | 3 ++-
 app/code/Magento/SwaggerWebapiAsync/Test/Mftf/composer.json  | 3 ++-
 app/code/Magento/SwaggerWebapiAsync/composer.json            | 3 ++-
 app/code/Magento/Swatches/Test/Mftf/composer.json            | 3 ++-
 app/code/Magento/Swatches/composer.json                      | 3 ++-
 app/code/Magento/Vault/Test/Mftf/composer.json               | 3 ++-
 app/code/Magento/Vault/composer.json                         | 3 ++-
 30 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/app/code/Magento/AdvancedSearch/Test/Mftf/composer.json b/app/code/Magento/AdvancedSearch/Test/Mftf/composer.json
index b5582c72a039a..77220575715ac 100644
--- a/app/code/Magento/AdvancedSearch/Test/Mftf/composer.json
+++ b/app/code/Magento/AdvancedSearch/Test/Mftf/composer.json
@@ -17,6 +17,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
-    ]
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
 }
diff --git a/app/code/Magento/AdvancedSearch/composer.json b/app/code/Magento/AdvancedSearch/composer.json
index a224a1001cd01..c6a5af07e60a7 100644
--- a/app/code/Magento/AdvancedSearch/composer.json
+++ b/app/code/Magento/AdvancedSearch/composer.json
@@ -17,7 +17,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/Amqp/Test/Mftf/composer.json b/app/code/Magento/Amqp/Test/Mftf/composer.json
index 348200c5d1cb4..3cb9637c9a7ba 100644
--- a/app/code/Magento/Amqp/Test/Mftf/composer.json
+++ b/app/code/Magento/Amqp/Test/Mftf/composer.json
@@ -12,6 +12,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/Amqp/composer.json b/app/code/Magento/Amqp/composer.json
index 23130dfb01a4e..b50e951b46f81 100644
--- a/app/code/Magento/Amqp/composer.json
+++ b/app/code/Magento/Amqp/composer.json
@@ -12,7 +12,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/AsynchronousOperations/Test/Mftf/composer.json b/app/code/Magento/AsynchronousOperations/Test/Mftf/composer.json
index baadc0d0d914a..e1ac71b46c546 100644
--- a/app/code/Magento/AsynchronousOperations/Test/Mftf/composer.json
+++ b/app/code/Magento/AsynchronousOperations/Test/Mftf/composer.json
@@ -19,6 +19,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/AsynchronousOperations/composer.json b/app/code/Magento/AsynchronousOperations/composer.json
index 3acb92710e62b..7d5a097eeea3f 100644
--- a/app/code/Magento/AsynchronousOperations/composer.json
+++ b/app/code/Magento/AsynchronousOperations/composer.json
@@ -19,7 +19,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/Authorizenet/Test/Mftf/composer.json b/app/code/Magento/Authorizenet/Test/Mftf/composer.json
index b02806a0ae3f3..176f6207e1bac 100644
--- a/app/code/Magento/Authorizenet/Test/Mftf/composer.json
+++ b/app/code/Magento/Authorizenet/Test/Mftf/composer.json
@@ -20,6 +20,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/Authorizenet/composer.json b/app/code/Magento/Authorizenet/composer.json
index 31f2295da4307..4e646004d9a6d 100644
--- a/app/code/Magento/Authorizenet/composer.json
+++ b/app/code/Magento/Authorizenet/composer.json
@@ -20,7 +20,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/Braintree/Test/Mftf/composer.json b/app/code/Magento/Braintree/Test/Mftf/composer.json
index 2f827424cb7f1..b973b89602347 100644
--- a/app/code/Magento/Braintree/Test/Mftf/composer.json
+++ b/app/code/Magento/Braintree/Test/Mftf/composer.json
@@ -28,6 +28,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
index 8fb98dce72c92..ba51a5436fedb 100644
--- a/app/code/Magento/Braintree/composer.json
+++ b/app/code/Magento/Braintree/composer.json
@@ -29,7 +29,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/Elasticsearch/Test/Mftf/composer.json b/app/code/Magento/Elasticsearch/Test/Mftf/composer.json
index 4f0b74e9c5660..b8c984c6e4ff6 100644
--- a/app/code/Magento/Elasticsearch/Test/Mftf/composer.json
+++ b/app/code/Magento/Elasticsearch/Test/Mftf/composer.json
@@ -21,6 +21,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/Elasticsearch/composer.json b/app/code/Magento/Elasticsearch/composer.json
index a6b4f93ade579..a821506f5ef6e 100644
--- a/app/code/Magento/Elasticsearch/composer.json
+++ b/app/code/Magento/Elasticsearch/composer.json
@@ -19,7 +19,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/EncryptionKey/Test/Mftf/composer.json b/app/code/Magento/EncryptionKey/Test/Mftf/composer.json
index 732a18753779f..5805c221e6e75 100644
--- a/app/code/Magento/EncryptionKey/Test/Mftf/composer.json
+++ b/app/code/Magento/EncryptionKey/Test/Mftf/composer.json
@@ -12,6 +12,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/EncryptionKey/composer.json b/app/code/Magento/EncryptionKey/composer.json
index 0bf0728606684..4a140c4b1315e 100644
--- a/app/code/Magento/EncryptionKey/composer.json
+++ b/app/code/Magento/EncryptionKey/composer.json
@@ -12,7 +12,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/MessageQueue/Test/Mftf/composer.json b/app/code/Magento/MessageQueue/Test/Mftf/composer.json
index e499fed390751..20783280811c7 100644
--- a/app/code/Magento/MessageQueue/Test/Mftf/composer.json
+++ b/app/code/Magento/MessageQueue/Test/Mftf/composer.json
@@ -11,6 +11,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/MessageQueue/composer.json b/app/code/Magento/MessageQueue/composer.json
index 5cdf7351bbb61..9d3c77fa0184a 100644
--- a/app/code/Magento/MessageQueue/composer.json
+++ b/app/code/Magento/MessageQueue/composer.json
@@ -11,7 +11,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/MysqlMq/Test/Mftf/composer.json b/app/code/Magento/MysqlMq/Test/Mftf/composer.json
index 0aa70a28428e4..fec40ce087ab8 100644
--- a/app/code/Magento/MysqlMq/Test/Mftf/composer.json
+++ b/app/code/Magento/MysqlMq/Test/Mftf/composer.json
@@ -12,6 +12,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/MysqlMq/composer.json b/app/code/Magento/MysqlMq/composer.json
index 3d7ee4f8b037b..d9bcf307a5bf9 100644
--- a/app/code/Magento/MysqlMq/composer.json
+++ b/app/code/Magento/MysqlMq/composer.json
@@ -12,7 +12,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/Paypal/Test/Mftf/composer.json b/app/code/Magento/Paypal/Test/Mftf/composer.json
index 4822c694580ef..1e2bc3c33a0c4 100644
--- a/app/code/Magento/Paypal/Test/Mftf/composer.json
+++ b/app/code/Magento/Paypal/Test/Mftf/composer.json
@@ -29,6 +29,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json
index 8bc05710452bb..b62985e8b8b70 100644
--- a/app/code/Magento/Paypal/composer.json
+++ b/app/code/Magento/Paypal/composer.json
@@ -30,7 +30,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/composer.json b/app/code/Magento/ProductVideo/Test/Mftf/composer.json
index a2f1223db010d..df3a9afb3584f 100644
--- a/app/code/Magento/ProductVideo/Test/Mftf/composer.json
+++ b/app/code/Magento/ProductVideo/Test/Mftf/composer.json
@@ -20,6 +20,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/ProductVideo/composer.json b/app/code/Magento/ProductVideo/composer.json
index 829816321c1a5..24497f891db43 100644
--- a/app/code/Magento/ProductVideo/composer.json
+++ b/app/code/Magento/ProductVideo/composer.json
@@ -20,7 +20,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/Signifyd/Test/Mftf/composer.json b/app/code/Magento/Signifyd/Test/Mftf/composer.json
index dc969cc4780ef..7ae52655d19f4 100644
--- a/app/code/Magento/Signifyd/Test/Mftf/composer.json
+++ b/app/code/Magento/Signifyd/Test/Mftf/composer.json
@@ -21,6 +21,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/Signifyd/composer.json b/app/code/Magento/Signifyd/composer.json
index c766ccd848ca4..992a74d0dc3ec 100644
--- a/app/code/Magento/Signifyd/composer.json
+++ b/app/code/Magento/Signifyd/composer.json
@@ -21,7 +21,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/composer.json b/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/composer.json
index fe20e7a539d03..58d3740a12021 100644
--- a/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/composer.json
+++ b/app/code/Magento/SwaggerWebapiAsync/Test/Mftf/composer.json
@@ -14,6 +14,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/SwaggerWebapiAsync/composer.json b/app/code/Magento/SwaggerWebapiAsync/composer.json
index 5ca538636b38a..3735bcd0ee458 100644
--- a/app/code/Magento/SwaggerWebapiAsync/composer.json
+++ b/app/code/Magento/SwaggerWebapiAsync/composer.json
@@ -14,7 +14,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/Swatches/Test/Mftf/composer.json b/app/code/Magento/Swatches/Test/Mftf/composer.json
index 76c8037995754..daac589907f2c 100644
--- a/app/code/Magento/Swatches/Test/Mftf/composer.json
+++ b/app/code/Magento/Swatches/Test/Mftf/composer.json
@@ -23,6 +23,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json
index 71f9fc8f80baa..0940003b6a72d 100644
--- a/app/code/Magento/Swatches/composer.json
+++ b/app/code/Magento/Swatches/composer.json
@@ -23,7 +23,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [
diff --git a/app/code/Magento/Vault/Test/Mftf/composer.json b/app/code/Magento/Vault/Test/Mftf/composer.json
index 78e765bebc429..64fe51a3a1a3c 100644
--- a/app/code/Magento/Vault/Test/Mftf/composer.json
+++ b/app/code/Magento/Vault/Test/Mftf/composer.json
@@ -16,6 +16,7 @@
     },
     "type": "magento2-test",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ]
 }
diff --git a/app/code/Magento/Vault/composer.json b/app/code/Magento/Vault/composer.json
index a4093617b82cc..f888a98692288 100644
--- a/app/code/Magento/Vault/composer.json
+++ b/app/code/Magento/Vault/composer.json
@@ -16,7 +16,8 @@
     },
     "type": "magento2-module",
     "license": [
-        "proprietary"
+        "OSL-3.0",
+        "AFL-3.0"
     ],
     "autoload": {
         "files": [

From 0d5cb1e4d2f74eab03c637c68cb820e5adab75e0 Mon Sep 17 00:00:00 2001
From: Marcel Hauri <marcel@hauri.me>
Date: Mon, 30 Jul 2018 08:53:39 +0200
Subject: [PATCH 2/2] [fix] Remove trailing comma

---
 app/code/Magento/AdvancedSearch/Test/Mftf/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/AdvancedSearch/Test/Mftf/composer.json b/app/code/Magento/AdvancedSearch/Test/Mftf/composer.json
index 77220575715ac..7ae6dbb7eb709 100644
--- a/app/code/Magento/AdvancedSearch/Test/Mftf/composer.json
+++ b/app/code/Magento/AdvancedSearch/Test/Mftf/composer.json
@@ -19,5 +19,5 @@
     "license": [
         "OSL-3.0",
         "AFL-3.0"
-    ],
+    ]
 }