Skip to content

Commit a92a647

Browse files
mark-vieiramark-vieira
committed
Update sources with new SSPL+Elastic-2.0 license headers
As per the new licensing change for Elasticsearch and Kibana this commit moves existing Apache 2.0 licensed source code to the new dual license SSPL+Elastic license 2.0. In addition, existing x-pack code now uses the new version 2.0 of the Elastic license. Full changes include: - Updating LICENSE and NOTICE files throughout the code base, as well as those packaged in our published artifacts - Update IDE integration to now use the new license header on newly created source files - Remove references to the "OSS" distribution from our documentation - Update build time verification checks to no longer allow Apache 2.0 license header in Elasticsearch source code - Replace all existing Apache 2.0 license headers for non-xpack code with updated header (vendored code with Apache 2.0 headers obviously remains the same). - Replace all Elastic license 1.0 headers with new 2.0 header in xpack.
1 parent 564d757 commit a92a647

File tree

14,916 files changed

+64439
-152492
lines changed

Some content is hidden

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

14,916 files changed

+64439
-152492
lines changed

‎.ci/teamcity.init.gradle

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
/*
2-
* Licensed to Elasticsearch under one or more contributor
3-
* license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright
5-
* ownership. Elasticsearch licenses this file to you under
6-
* the Apache License, Version 2.0 (the "License"); you may
7-
* not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
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.
187
*/
198

209
gradle.settingsEvaluated { settings ->

‎CONTRIBUTING.md

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -442,35 +442,26 @@ We require license headers on all Java files. With the exception of the
442442
top-level `x-pack` directory, all contributed code should have the following
443443
license header unless instructed otherwise:
444444

445-
/*
446-
* Licensed to Elasticsearch under one or more contributor
447-
* license agreements. See the NOTICE file distributed with
448-
* this work for additional information regarding copyright
449-
* ownership. Elasticsearch licenses this file to you under
450-
* the Apache License, Version 2.0 (the "License"); you may
451-
* not use this file except in compliance with the License.
452-
* You may obtain a copy of the License at
453-
*
454-
* http://www.apache.org/licenses/LICENSE-2.0
455-
*
456-
* Unless required by applicable law or agreed to in writing,
457-
* software distributed under the License is distributed on an
458-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
459-
* KIND, either express or implied. See the License for the
460-
* specific language governing permissions and limitations
461-
* under the License.
462-
*/
445+
/*
446+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
447+
* or more contributor license agreements. Licensed under the Elastic License
448+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
449+
* in compliance with, at your election, the Elastic License 2.0 or the Server
450+
* Side Public License, v 1.
451+
*/
463452

464453
The top-level `x-pack` directory contains code covered by the [Elastic
465-
license](licenses/ELASTIC-LICENSE.txt). Community contributions to this code are
454+
license](licenses/ELASTIC-LICENSE-2.0.txt). Community contributions to this code are
466455
welcome, and should have the following license header unless instructed
467456
otherwise:
468457

469-
/*
470-
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
471-
* or more contributor license agreements. Licensed under the Elastic License;
472-
* you may not use this file except in compliance with the Elastic License.
473-
*/
458+
/*
459+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
460+
* or more contributor license agreements. Licensed under the Elastic License
461+
* 2.0; you may not use this file except in compliance with the Elastic License
462+
* 2.0.
463+
*/
464+
474465

475466
It is important that the only code covered by the Elastic licence is contained
476467
within the top-level `x-pack` directory. The build will fail its pre-commit

‎LICENSE.txt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
Source code in this repository is covered by one of three licenses: (i) the
2-
Apache License 2.0 (ii) an Apache License 2.0 compatible license (iii) the
3-
Elastic License. The default license throughout the repository is Apache License
4-
2.0 unless the header specifies another license. Elastic Licensed code is found
5-
only in the x-pack directory.
6-
7-
The build produces two sets of binaries - one set that falls under the Elastic
8-
License and another set that falls under Apache License 2.0. The binaries that
9-
contain `-oss` in the artifact name are licensed under Apache License 2.0 and
10-
these binaries do not package any code from the x-pack directory.
1+
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 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.

‎NOTICE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Elasticsearch
2-
Copyright 2009-2018 Elasticsearch
2+
Copyright 2009-2021 Elasticsearch
33

44
This product includes software developed by The Apache Software
55
Foundation (http://www.apache.org/).

‎Vagrantfile

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,11 @@
44
# This Vagrantfile exists to test packaging. Read more about its use in the
55
# vagrant section in TESTING.asciidoc.
66

7-
# Licensed to Elasticsearch under one or more contributor
8-
# license agreements. See the NOTICE file distributed with
9-
# this work for additional information regarding copyright
10-
# ownership. Elasticsearch licenses this file to you under
11-
# the Apache License, Version 2.0 (the "License"); you may
12-
# not use this file except in compliance with the License.
13-
# You may obtain a copy of the License at
14-
#
15-
# http://www.apache.org/licenses/LICENSE-2.0
16-
#
17-
# Unless required by applicable law or agreed to in writing,
18-
# software distributed under the License is distributed on an
19-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
20-
# KIND, either express or implied. See the License for the
21-
# specific language governing permissions and limitations
22-
# under the License.
7+
# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
8+
# or more contributor license agreements. Licensed under the Elastic License
9+
# 2.0 and the Server Side Public License, v 1; you may not use this file except
10+
# in compliance with, at your election, the Elastic License 2.0 or the Server
11+
# Side Public License, v 1.
2312

2413
define_opts = {
2514
autostart: false

‎benchmarks/build.gradle

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,11 @@
11
import org.elasticsearch.gradle.info.BuildParams
22

33
/*
4-
* Licensed to Elasticsearch under one or more contributor
5-
* license agreements. See the NOTICE file distributed with
6-
* this work for additional information regarding copyright
7-
* ownership. Elasticsearch licenses this file to you under
8-
* the Apache License, Version 2.0 (the "License"); you may
9-
* not use this file except in compliance with the License.
10-
* You may obtain a copy of the License at
11-
*
12-
* http://www.apache.org/licenses/LICENSE-2.0
13-
*
14-
* Unless required by applicable law or agreed to in writing,
15-
* software distributed under the License is distributed on an
16-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17-
* KIND, either express or implied. See the License for the
18-
* specific language governing permissions and limitations
19-
* under the License.
4+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
5+
* or more contributor license agreements. Licensed under the Elastic License
6+
* 2.0 and the Server Side Public License, v 1; you may not use this file except
7+
* in compliance with, at your election, the Elastic License 2.0 or the Server
8+
* Side Public License, v 1.
209
*/
2110

2211
apply plugin: 'elasticsearch.build'

‎benchmarks/src/main/java/org/elasticsearch/benchmark/fs/AvailableIndexFoldersBenchmark.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
/*
2-
* Licensed to Elasticsearch under one or more contributor
3-
* license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright
5-
* ownership. Elasticsearch licenses this file to you under
6-
* the Apache License, Version 2.0 (the "License"); you may
7-
* not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
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.
187
*/
198
package org.elasticsearch.benchmark.fs;
209

‎benchmarks/src/main/java/org/elasticsearch/benchmark/indices/breaker/MemoryStatsBenchmark.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
/*
2-
* Licensed to Elasticsearch under one or more contributor
3-
* license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright
5-
* ownership. Elasticsearch licenses this file to you under
6-
* the Apache License, Version 2.0 (the "License"); you may
7-
* not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
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.
187
*/
198
package org.elasticsearch.benchmark.indices.breaker;
209

‎benchmarks/src/main/java/org/elasticsearch/benchmark/routing/allocation/AllocationBenchmark.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
/*
2-
* Licensed to Elasticsearch under one or more contributor
3-
* license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright
5-
* ownership. Elasticsearch licenses this file to you under
6-
* the Apache License, Version 2.0 (the "License"); you may
7-
* not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
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.
187
*/
198
package org.elasticsearch.benchmark.routing.allocation;
209

‎benchmarks/src/main/java/org/elasticsearch/benchmark/routing/allocation/Allocators.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
/*
2-
* Licensed to Elasticsearch under one or more contributor
3-
* license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright
5-
* ownership. Elasticsearch licenses this file to you under
6-
* the Apache License, Version 2.0 (the "License"); you may
7-
* not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
9-
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11-
*
12-
* Unless required by applicable law or agreed to in writing,
13-
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied. See the License for the
16-
* specific language governing permissions and limitations
17-
* under the License.
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
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.
187
*/
198
package org.elasticsearch.benchmark.routing.allocation;
209

0 commit comments

Comments
 (0)