Skip to content

Commit 8a3bda4

Browse files
kobelbkobelb
authored
[7.11] Elastic License 2.0 (#90119)
* Updating everything except the license headers themselves * Applying ESLint rules * Manually replacing the stragglers
1 parent c93b317 commit 8a3bda4

26,973 files changed

Lines changed: 83281 additions & 62121 deletions

File tree

Some content is hidden

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

‎.eslintrc.js‎

Lines changed: 40 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
33
* or more contributor license agreements. Licensed under the Elastic License
4-
* and the Server Side Public License, v 1; you may not use this file except in
5-
* compliance with, at your election, the Elastic License or the Server Side
6-
* Public License, v 1.
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
77
*/
88

99
const APACHE_2_0_LICENSE_HEADER = `
@@ -27,7 +27,7 @@ const APACHE_2_0_LICENSE_HEADER = `
2727
*/
2828
`;
2929

30-
const DUAL_LICENSE_HEADER = `
30+
const OLD_DUAL_LICENSE_HEADER = `
3131
/*
3232
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3333
* or more contributor license agreements. Licensed under the Elastic License
@@ -37,14 +37,33 @@ const DUAL_LICENSE_HEADER = `
3737
*/
3838
`;
3939

40-
const ELASTIC_LICENSE_HEADER = `
40+
const DUAL_LICENSE_HEADER = `
41+
/*
42+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
43+
* or more contributor license agreements. Licensed under the Elastic License
44+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
45+
* in compliance with, at your election, the Elastic License 2.0 or the Server
46+
* Side Public License, v 1.
47+
*/
48+
`;
49+
50+
const OLD_ELASTIC_LICENSE_HEADER = `
4151
/*
4252
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
4353
* or more contributor license agreements. Licensed under the Elastic License;
4454
* you may not use this file except in compliance with the Elastic License.
4555
*/
4656
`;
4757

58+
const ELASTIC_LICENSE_HEADER = `
59+
/*
60+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
61+
* or more contributor license agreements. Licensed under the Elastic License
62+
* 2.0; you may not use this file except in compliance with the Elastic License
63+
* 2.0.
64+
*/
65+
`;
66+
4867
const SAFER_LODASH_SET_HEADER = `
4968
/*
5069
* Elasticsearch B.V licenses this file to you under the MIT License.
@@ -142,6 +161,8 @@ module.exports = {
142161
licenses: [
143162
APACHE_2_0_LICENSE_HEADER,
144163
ELASTIC_LICENSE_HEADER,
164+
OLD_DUAL_LICENSE_HEADER,
165+
OLD_ELASTIC_LICENSE_HEADER,
145166
SAFER_LODASH_SET_HEADER,
146167
SAFER_LODASH_SET_LODASH_HEADER,
147168
SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
@@ -172,6 +193,8 @@ module.exports = {
172193
licenses: [
173194
DUAL_LICENSE_HEADER,
174195
ELASTIC_LICENSE_HEADER,
196+
OLD_DUAL_LICENSE_HEADER,
197+
OLD_ELASTIC_LICENSE_HEADER,
175198
SAFER_LODASH_SET_HEADER,
176199
SAFER_LODASH_SET_LODASH_HEADER,
177200
SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
@@ -207,8 +230,10 @@ module.exports = {
207230
'error',
208231
{
209232
licenses: [
210-
DUAL_LICENSE_HEADER,
211233
APACHE_2_0_LICENSE_HEADER,
234+
DUAL_LICENSE_HEADER,
235+
OLD_DUAL_LICENSE_HEADER,
236+
OLD_ELASTIC_LICENSE_HEADER,
212237
SAFER_LODASH_SET_HEADER,
213238
SAFER_LODASH_SET_LODASH_HEADER,
214239
SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
@@ -234,9 +259,11 @@ module.exports = {
234259
'error',
235260
{
236261
licenses: [
262+
APACHE_2_0_LICENSE_HEADER,
237263
DUAL_LICENSE_HEADER,
238264
ELASTIC_LICENSE_HEADER,
239-
APACHE_2_0_LICENSE_HEADER,
265+
OLD_DUAL_LICENSE_HEADER,
266+
OLD_ELASTIC_LICENSE_HEADER,
240267
SAFER_LODASH_SET_HEADER,
241268
SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
242269
],
@@ -257,9 +284,11 @@ module.exports = {
257284
'error',
258285
{
259286
licenses: [
287+
APACHE_2_0_LICENSE_HEADER,
260288
DUAL_LICENSE_HEADER,
261289
ELASTIC_LICENSE_HEADER,
262-
APACHE_2_0_LICENSE_HEADER,
290+
OLD_DUAL_LICENSE_HEADER,
291+
OLD_ELASTIC_LICENSE_HEADER,
263292
SAFER_LODASH_SET_LODASH_HEADER,
264293
SAFER_LODASH_SET_DEFINITELYTYPED_HEADER,
265294
],
@@ -280,9 +309,11 @@ module.exports = {
280309
'error',
281310
{
282311
licenses: [
312+
APACHE_2_0_LICENSE_HEADER,
283313
DUAL_LICENSE_HEADER,
284314
ELASTIC_LICENSE_HEADER,
285-
APACHE_2_0_LICENSE_HEADER,
315+
OLD_ELASTIC_LICENSE_HEADER,
316+
OLD_DUAL_LICENSE_HEADER,
286317
SAFER_LODASH_SET_HEADER,
287318
SAFER_LODASH_SET_LODASH_HEADER,
288319
],

‎Gruntfile.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
33
* or more contributor license agreements. Licensed under the Elastic License
4-
* and the Server Side Public License, v 1; you may not use this file except in
5-
* compliance with, at your election, the Elastic License or the Server Side
6-
* Public License, v 1.
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
77
*/
88

99
require('./src/setup_node_env');

‎LICENSE.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Source code in this repository is covered by (i) a dual license under the Server
2-
Side Public License, v 1 and the Elastic License or (ii) an Apache License 2.0
3-
compatible license or (iii) solely under the Elastic License, in each case, as
4-
noted in the applicable header. The default throughout the repository is a dual
5-
license under the Server Side Public License, v 1 and the Elastic License,
6-
unless the header specifies another license. Code that is licensed solely under
7-
the Elastic License is found only in the x-pack folder.
2+
Side Public License, v 1 and the Elastic License 2.0 or (ii) an Apache License
3+
2.0 compatible license or (iii) solely under the Elastic License 2.0, in each
4+
case, as noted in the applicable header. The default throughout the repository
5+
is a dual license under the Server Side Public License, v 1 and the Elastic
6+
License 2.0, unless the header specifies another license. Code that is licensed
7+
solely under the Elastic License 2.0 is found only in the x-pack folder.

‎examples/bfetch_explorer/public/components/count_until/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
33
* or more contributor license agreements. Licensed under the Elastic License
4-
* and the Server Side Public License, v 1; you may not use this file except in
5-
* compliance with, at your election, the Elastic License or the Server Side
6-
* Public License, v 1.
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
77
*/
88

99
import React, { useState } from 'react';

‎examples/bfetch_explorer/public/components/double_integers/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
33
* or more contributor license agreements. Licensed under the Elastic License
4-
* and the Server Side Public License, v 1; you may not use this file except in
5-
* compliance with, at your election, the Elastic License or the Server Side
6-
* Public License, v 1.
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
77
*/
88

99
import React, { useState } from 'react';

‎examples/bfetch_explorer/public/components/page/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
33
* or more contributor license agreements. Licensed under the Elastic License
4-
* and the Server Side Public License, v 1; you may not use this file except in
5-
* compliance with, at your election, the Elastic License or the Server Side
6-
* Public License, v 1.
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
77
*/
88

99
import * as React from 'react';

‎examples/bfetch_explorer/public/containers/app/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
33
* or more contributor license agreements. Licensed under the Elastic License
4-
* and the Server Side Public License, v 1; you may not use this file except in
5-
* compliance with, at your election, the Elastic License or the Server Side
6-
* Public License, v 1.
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
77
*/
88

99
import React from 'react';

‎examples/bfetch_explorer/public/containers/app/pages/page_count_until/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
33
* or more contributor license agreements. Licensed under the Elastic License
4-
* and the Server Side Public License, v 1; you may not use this file except in
5-
* compliance with, at your election, the Elastic License or the Server Side
6-
* Public License, v 1.
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
77
*/
88

99
import * as React from 'react';

‎examples/bfetch_explorer/public/containers/app/pages/page_double_integers/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
33
* or more contributor license agreements. Licensed under the Elastic License
4-
* and the Server Side Public License, v 1; you may not use this file except in
5-
* compliance with, at your election, the Elastic License or the Server Side
6-
* Public License, v 1.
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
77
*/
88

99
import * as React from 'react';

‎examples/bfetch_explorer/public/containers/app/sidebar/index.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
33
* or more contributor license agreements. Licensed under the Elastic License
4-
* and the Server Side Public License, v 1; you may not use this file except in
5-
* compliance with, at your election, the Elastic License or the Server Side
6-
* Public License, v 1.
4+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
5+
* in compliance with, at your election, the Elastic License 2.0 or the Server
6+
* Side Public License, v 1.
77
*/
88

99
import React from 'react';

0 commit comments

Comments
 (0)