Skip to content

Commit

Permalink
relicense all paths other than MIT licensed code, client/cody*, jetbr…
Browse files Browse the repository at this point in the history
…ains, VS code, and browser extension to enterprise (#53345) (#53345)

Preparing for 5.1 based on latest executive decisions. Re-licensing the
majority of sourcegraph/sourcegraph to enterprise instead of Apache.
Official external statements forthcoming with 5.1 release.

[Searching this branch for LICENSE files
](https://sourcegraph.sourcegraph.com/search?q=context:sourcegraph+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24+file:LICENSE%24+-file:client/cody+rev:cclark/relicense&patternType=standard&sm=1&groupBy=path)

This leaves only 2 licenses in directories other than `client/cody*`
1. MIT code in syntax highlighter
2. MIT code in react-accessible-treeview

Edit: updates from exec team
Jetbrains extension / VS Code extension / browser extension will remain
Apache

Here is a search showing all Apache licensed paths in this branch
https://sourcegraph.sourcegraph.com/search?q=context:sourcegraph+repo:%5Egithub%5C.com/sourcegraph/sourcegraph%24+file:LICENSE%24++rev:cclark/relicense&patternType=standard&sm=1&groupBy=path

If either of those should be changing, please let me know.
## Test plan
N/A
<!-- All pull requests REQUIRE a test plan:
https://docs.sourcegraph.com/dev/background-information/testing_principles
-->
  • Loading branch information
coury-clark committed Jun 13, 2023
1 parent 1cd36d2 commit 3cd931e
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 621 deletions.
6 changes: 3 additions & 3 deletions LICENSE
@@ -1,3 +1,3 @@
LICENSE.apache (Apache License) applies to all files in this
repository, except for those in or under any directory named
"enterprise", which are covered by LICENSE.enterprise.
LICENSE.enterprise (Enterprise License) applies to all files in this
repository, except for files in or under any directory that contains a
superseding license file.
210 changes: 0 additions & 210 deletions LICENSE.apache

This file was deleted.

6 changes: 2 additions & 4 deletions README.md
Expand Up @@ -64,8 +64,6 @@ The `doc` directory has additional documentation for developing and understandin

## License

This repository contains both OSS-licensed and non-OSS-licensed files. We maintain one repository rather than two separate repositories mainly for development convenience.
This repository contains primarily non-OSS-licensed files, and some OSS licensed files (for example, IDE extensions). We maintain one repository rather than two separate repositories mainly for development convenience.

All files in the `enterprise` and `client/web/src/enterprise` fall under [LICENSE.enterprise](LICENSE.enterprise).

The remaining files fall under the [Apache 2 license](LICENSE.apache). Sourcegraph OSS is built only from the Apache-licensed files in this repository.
See the [LICENSE](LICENSE) for an explanation of how files are licensed.
@@ -1,3 +1,4 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down Expand Up @@ -186,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]
Copyright 2023 Sourcegraph, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down

0 comments on commit 3cd931e

Please sign in to comment.