Skip to content

Commit 2bc226d

Browse files
rijkvanzantenbenhaynespaescujlicitdevazrikahar
authored
Change license to BSL-1.1 (directus#18330)
* Change license to BSL1.1 * Mark major version * Fix formatting * Remove duplicate heading * Update formatting * Copy paste error * Update license * Update license * Format covenants * Update readme.md * Update licenses for packages * Update readme.md * Update contributors.yml OG... but to be clear, rijkvanzanten is the one who really built all of this ❤️ * Tweak license in openapi * Update packages/specs/src/openapi.yaml * Add MIT license headers * Use v10 in examples * Update additional examples * Update generate-extensions-entrypoint.test.ts * Update tests to use latest v9 and v10 versions * use lowercase for naming consistency * change casing for api license * Update migrations doc * Update dictionary * Consistent ordering of license field in app/package.json * Use major version in specs again (but as string) So it's valid for all v10 versions * Consolidate readme's --------- Co-authored-by: Ben Haynes <[email protected]> Co-authored-by: Pascal Jufer <[email protected]> Co-authored-by: ian <[email protected]> Co-authored-by: Azri Kahar <[email protected]>
1 parent 381f1c9 commit 2bc226d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1469
-3444
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ body:
2828
- type: input
2929
attributes:
3030
label: Directus Version
31-
placeholder: v9.x.x
31+
placeholder: v10.x.x
3232
validations:
3333
required: true
3434
- type: dropdown

api/LICENSE

-674
This file was deleted.

api/license

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
Licensor: Monospace, Inc.
2+
3+
Licensed Work: Directus
4+
The Licensed Work is Copyright © 2023 Monospace, Inc.
5+
6+
Additional Use Grant: You may use the Licensed Work in production as long as
7+
your Total Finances do not exceed US $5,000,000 for the
8+
most recent 12-month period, provided that Monospace, Inc.
9+
will not be liable to you in any way, including for any
10+
damages, including general, special, incidental or
11+
consequential damages, arising out of such use.
12+
13+
References to: “Total Finances” mean the largest of your
14+
aggregate gross revenues, entire budget, and/or funding
15+
(no matter the source); “you” and “your” include (without
16+
limitation) any individual or entity agreeing to these
17+
terms and any affiliates of such individual or entity; and
18+
“production” mean any use other than (i) development of
19+
(including evaluation of the Licensed Work), debugging, or
20+
testing your offerings, or (ii) making the Licensed Work
21+
available standalone in unmodified object code form.
22+
23+
Change Date: Three years from release date
24+
25+
Change License: GNU General Public License (GPL) v3
26+
27+
For information about alternative licensing arrangements, please visit
28+
https://directus.io/pricing.
29+
30+
--------------------------------------------------------------------------------
31+
32+
Business Source License 1.1
33+
34+
Terms
35+
36+
The Licensor hereby grants you the right to copy, modify, create derivative
37+
works, redistribute, and make non-production use of the Licensed Work. The
38+
Licensor may make an Additional Use Grant, above, permitting limited production
39+
use.
40+
41+
Effective on the Change Date, or the fourth anniversary of the first publicly
42+
available distribution of a specific version of the Licensed Work under this
43+
License, whichever comes first, the Licensor hereby grants you rights under the
44+
terms of the Change License, and the rights granted in the paragraph above
45+
terminate.
46+
47+
If your use of the Licensed Work does not comply with the requirements currently
48+
in effect as described in this License, you must purchase a commercial license
49+
from the Licensor, its affiliated entities, or authorized resellers, or you must
50+
refrain from using the Licensed Work.
51+
52+
All copies of the original and modified Licensed Work, and derivative works of
53+
the Licensed Work, are subject to this License. This License applies separately
54+
for each version of the Licensed Work and the Change Date may vary for each
55+
version of the Licensed Work released by Licensor.
56+
57+
You must conspicuously display this License on each original or modified copy of
58+
the Licensed Work. If you receive the Licensed Work in original or modified form
59+
from a third party, the terms and conditions set forth in this License apply to
60+
your use of that work.
61+
62+
Any use of the Licensed Work in violation of this License will automatically
63+
terminate your rights under this License for the current and all other versions
64+
of the Licensed Work.
65+
66+
This License does not grant you any right in any trademark or logo of Licensor
67+
or its affiliates (provided that you may use a trademark or logo of Licensor as
68+
expressly required by this License).
69+
70+
TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON AN
71+
“AS IS” BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, EXPRESS
72+
OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF MERCHANTABILITY,
73+
FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND TITLE.
74+
75+
MariaDB hereby grants you permission to use this License’s text to license your
76+
works, and to refer to it using the trademark “Business Source License”, as long
77+
as you comply with the Covenants of Licensor below.
78+
79+
Covenants of Licensor
80+
81+
In consideration of the right to use this License’s text and the “Business
82+
Source License” name and trademark, Licensor covenants to MariaDB, and to all
83+
other recipients of the licensed work to be provided by Licensor:
84+
85+
1. To specify as the Change License the GPL Version 2.0 or any later version,
86+
or a license that is compatible with GPL Version 2.0 or a later version,
87+
where “compatible” means that software provided under the Change License can
88+
be included in a program with software provided under GPL Version 2.0 or a
89+
later version. Licensor may specify additional Change Licenses without
90+
limitation.
91+
92+
2. To either: (a) specify an additional grant of rights to use that does not
93+
impose any additional restriction on the right granted in this License, as
94+
the Additional Use Grant; or (b) insert the text “None”.
95+
96+
3. To specify a Change Date.
97+
98+
4. Not to modify this License in any other way.
99+
100+
Notice
101+
102+
The Business Source License (this document, or the "License") is not an Open
103+
Source license. However, the Licensed Work will eventually be made available
104+
under an Open Source License, as stated in this License.
105+
106+
License text copyright © 2023 MariaDB plc, All Rights Reserved.
107+
“Business Source License” is a trademark of MariaDB plc.

api/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@directus/api",
3-
"version": "9.26.0",
3+
"version": "10.0.0",
44
"description": "Directus is a real-time API and App dashboard for managing SQL database content",
55
"type": "module",
66
"keywords": [
@@ -32,7 +32,7 @@
3232
"directory": "api"
3333
},
3434
"funding": "https://github.com/directus/directus?sponsor=1",
35-
"license": "GPL-3.0-only",
35+
"license": "BUSL-1.1",
3636
"author": {
3737
"name": "Monospace Inc",
3838
"email": "[email protected]",

api/src/utils/validate-snapshot.test.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { Snapshot } from '../types/snapshot.js';
33
import { validateSnapshot } from './validate-snapshot.js';
44

55
vi.mock('./package.js', () => ({
6-
version: '9.22.4',
6+
version: '10.0.0',
77
}));
88

99
vi.mock('../database/index.js', () => ({
@@ -24,23 +24,23 @@ describe('should fail on invalid snapshot schema', () => {
2424
});
2525

2626
test('invalid schema', () => {
27-
const snapshot = { version: 1, directus: '9.22.4', collections: {} } as Snapshot;
27+
const snapshot = { version: 1, directus: '10.0.0', collections: {} } as Snapshot;
2828

2929
expect(() => validateSnapshot(snapshot)).toThrowError('"collections" must be an array');
3030
});
3131
});
3232

3333
describe('should require force option on version / vendor mismatch', () => {
3434
test('directus version mismatch', () => {
35-
const snapshot = { version: 1, directus: '9.22.3' } as Snapshot;
35+
const snapshot = { version: 1, directus: '9.26.0' } as Snapshot;
3636

3737
expect(() => validateSnapshot(snapshot)).toThrowError(
38-
"Provided snapshot's directus version 9.22.3 does not match the current instance's version 9.22.4"
38+
"Provided snapshot's directus version 9.26.0 does not match the current instance's version 10.0.0"
3939
);
4040
});
4141

4242
test('db vendor mismatch', () => {
43-
const snapshot = { version: 1, directus: '9.22.4', vendor: 'postgres' } as Snapshot;
43+
const snapshot = { version: 1, directus: '10.0.0', vendor: 'postgres' } as Snapshot;
4444

4545
expect(() => validateSnapshot(snapshot)).toThrowError(
4646
"Provided snapshot's vendor postgres does not match the current instance's vendor sqlite."
@@ -49,7 +49,7 @@ describe('should require force option on version / vendor mismatch', () => {
4949
});
5050

5151
test('should allow bypass on version / vendor mismatch via force option ', () => {
52-
const snapshot = { version: 1, directus: '9.22.3', vendor: 'postgres' } as Snapshot;
52+
const snapshot = { version: 1, directus: '9.26.0', vendor: 'postgres' } as Snapshot;
5353

5454
expect(validateSnapshot(snapshot, true)).toBeUndefined();
5555
});

0 commit comments

Comments
 (0)