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

More OSS improvements #115

Merged
merged 7 commits into from
Feb 13, 2024
Merged

More OSS improvements #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b2f019
Move Bedrock license into LICENSES/.
BigBlueHat Feb 13, 2024
a120771
Use the Bedrock license for the logo.
BigBlueHat Feb 13, 2024
55074f1
Bump copyright year in Bedrock license file.
BigBlueHat Feb 13, 2024
5e60fdb
Improve README license section a bit.
BigBlueHat Feb 13, 2024
d045298
Add final new line to LICENSE.md & .editorconfig.
BigBlueHat Feb 13, 2024
d0bda62
Add .editorconfig to licensed files.
BigBlueHat Feb 13, 2024
4fb4682
Fix node/npm version references in README.
BigBlueHat Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# http://editorconfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

[*.{js,json,jsonld,yaml,yml}]
indent_style = space
indent_size = 2
6 changes: 5 additions & 1 deletion .reuse/dep5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Contact: Digital Bazaar, Inc. <support@digitalbazaar.com>

Files: branding/*
Copyright: 2012-2024 Digital Bazaar, Inc.
License: LicenseRef-bedrock

Files: *.md .gitignore .npmrc package.json test/.npmrc test/mocha/.eslintrc
test/package.json
test/package.json .editorconfig
Copyright: 2012-2024 Digital Bazaar, Inc.
License: BSD-3-Clause
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 1 addition & 1 deletion LICENSE-bedrock.md → LICENSES/LicenseRef-bedrock.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Bedrock Non-Commercial License v1.0
===================================

Copyright (c) 2011-2021 Digital Bazaar, Inc.
Copyright (c) 2011-2024 Digital Bazaar, Inc.
All rights reserved.

Summary
Expand Down
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,8 +740,8 @@ Mac OS X development machine.
## Requirements

* Linux, Mac OS X, Windows
* node.js >= 14.x
* npm >= 6.x
* node.js >= 18.x
* npm >= 9.x

Running Bedrock
---------------
Expand Down Expand Up @@ -807,9 +807,9 @@ Bedrock and all Bedrock modules are:

You can use Bedrock for non-commercial purposes such as self-study, research,
personal projects, or for evaluation purposes. Many Bedrock libraries (including
the core) are open source licensed under the [BSD-3-Clause](LICENSE.md). However,
some components use a custom non-commercial, source visible license: see the
[LICENSE-bedrock.md](LICENSE-bedrock.md) file for details.
the core) are licensed as open source under the [BSD-3-Clause](LICENSE.md). However,
some components use a custom non-commercial source available license: see the
[LICENSES/LicenseRef-bedrock.md](LICENSES/LicenseRef-bedrock.md) file for details.

[AUTHORS]: AUTHORS.md
[FEATURES]: FEATURES.md
Expand Down
Loading