Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

relicense all paths other than MIT licensed code, client/cody*, jetbrains, VS code, and browser extension to enterprise (#53345) #53345

Merged
merged 6 commits into from Jun 13, 2023
Merged

relicense all paths other than MIT licensed code, client/cody*, jetbrains, VS code, and browser extension to enterprise (#53345) #53345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e159e58
wip
coury-clark Jun 12, 2023
43aea56
relicensing from apache to enterprise
coury-clark Jun 12, 2023
07ab372
adding client/browser, client/vscode, and client/jetbrains back as ap…
coury-clark Jun 13, 2023
d894962
fix text
coury-clark Jun 13, 2023
aa74f90
fix text
coury-clark Jun 13, 2023
af6b186
update readme
coury-clark Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions LICENSE
View file
Open in desktop
@@ -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
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions README.md
View file
Open in desktop
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.
3 changes: 2 additions & 1 deletion client/extension-api-types/LICENSE → client/browser/LICENSE
View file
Open in desktop
@@ -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