Skip to content

Update Project Licensing to Apache 2.0 #1105

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

Open
FSG-Cat wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update Project Licensing to Apache 2.0 #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2024 Gnuxie <Gnuxie@protonmail.com>
#
# SPDX-License-Identifier: CC0-1.0
# SPDX-License-Identifier: Apache-2.0

node_modules
config
Expand Down
2 changes: 1 addition & 1 deletion .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2024 Gnuxie <Gnuxie@protonmail.com>
#
# SPDX-License-Identifier: 0BSD
# SPDX-License-Identifier: Apache-2.0

root = true

Expand Down
2 changes: 1 addition & 1 deletion .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SPDX-FileCopyrightText: 2024 Gnuxie <Gnuxie@protonmail.com>
#
# SPDX-License-Identifier: CC0-1.0
# SPDX-License-Identifier: Apache-2.0
# The first time that we ran prettier.
3b2036c2db205e7f9a10a6b4fef2ec1760b8f51b
2 changes: 1 addition & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2024 Aminda Suomalainen <suomalainen+git@mikaela.info>
#
# SPDX-License-Identifier: CC0-1.0
# SPDX-License-Identifier: Apache-2.0

* text=auto eol=lf
*.gif filter=lfs diff=lfs merge=lfs -text
2 changes: 1 addition & 1 deletion .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-FileCopyrightText: 2024 Aminda Suomalainen <suomalainen@aminda.eu>
//
// SPDX-License-Identifier: CC0-1.0
// SPDX-License-Identifier: Apache-2.0
{
extends: ["github>the-draupnir-project/.github:renovate-shared"],
}
4 changes: 2 additions & 2 deletions .github/workflows/docker-hub-develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2024 Gnuxie <Gnuxie@protonmail.com>
# SPDX-FileCopyrightText: 2026 Catalan Lover <catalanlover@protonmail.com>
#
# SPDX-License-Identifier: CC0-1.0
# SPDX-License-Identifier: Apache-2.0

# Copied from https://github.com/matrix-org/matrix-bifrost/blob/develop/.github/workflows/docker-hub-latest.yml

Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
org.opencontainers.image.revision=${{ github.sha }}
org.opencontainers.image.version=${{ github.ref_name }}-${{ github.sha }}
org.opencontainers.image.ref.name=${{ github.ref_name }}
org.opencontainers.image.licenses=AFL-3.0
org.opencontainers.image.licenses=Apache-2.0
sbom: true
tags: |
${{ env.DOCKER_NAMESPACE }}/draupnir:develop
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-hub-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2024 Gnuxie <Gnuxie@protonmail.com>
# SPDX-FileCopyrightText: 2026 Catalan Lover <catalanlover@protonmail.com>
#
# SPDX-License-Identifier: CC0-1.0
# SPDX-License-Identifier: Apache-2.0

# Copied from https://github.com/matrix-org/matrix-bifrost/blob/develop/.github/workflows/docker-hub-release.yml
# This is duplicated with docker-hub-release.yml the only difference is the tag and hook
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
org.opencontainers.image.source=${{ env.IMG_SOURCE }}
org.opencontainers.image.revision=${{ github.sha }}
org.opencontainers.image.version=${{ github.ref_name }}
org.opencontainers.image.licenses=AFL-3.0
org.opencontainers.image.licenses=Apache-2.0
sbom: true
tags: |
${{ env.DOCKER_NAMESPACE }}/draupnir:latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-hub-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-FileCopyrightText: 2024 Gnuxie <Gnuxie@protonmail.com>
# SPDX-FileCopyrightText: 2026 Catalan Lover <catalanlover@protonmail.com>
#
# SPDX-License-Identifier: CC0-1.0
# SPDX-License-Identifier: Apache-2.0

# Copied from https://github.com/matrix-org/matrix-bifrost/blob/develop/.github/workflows/docker-hub-release.yml
# This is duplicated with docker-hub-latest.yml the only difference is the tag and hook
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
org.opencontainers.image.source=${{ env.IMG_SOURCE }}
org.opencontainers.image.revision=${{ github.sha }}
org.opencontainers.image.version=${{ github.ref_name }}
org.opencontainers.image.licenses=AFL-3.0
org.opencontainers.image.licenses=Apache-2.0
sbom: true
tags: |
${{ env.DOCKER_NAMESPACE }}/draupnir:${{ steps.release_version.outputs.release_version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ghcr-all-dev-branches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2026 Catalan Lover <catalanlover@protonmail.com>
#
# SPDX-License-Identifier: CC0-1.0
# SPDX-License-Identifier: Apache-2.0
# This file is derived from the docker-hub-develop.yml workflow, but instead of pushing to Docker Hub, it pushes to GHCR. It also runs on all non excluded branches to allow easier access to development builds.

name: "GHCR - Development Branches"
Expand Down Expand Up @@ -85,6 +85,6 @@ jobs:
org.opencontainers.image.revision=${{ github.sha }}
org.opencontainers.image.version=${{ github.ref_name }}-${{ github.sha }}
org.opencontainers.image.ref.name=${{ github.ref_name }}
org.opencontainers.image.licenses=AFL-3.0
org.opencontainers.image.licenses=Apache-2.0
sbom: true
tags: ${{ steps.meta.outputs.tags }}
4 changes: 2 additions & 2 deletions .github/workflows/ghcr-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2026 Catalan Lover <catalanlover@protonmail.com>
#
# SPDX-License-Identifier: CC0-1.0
# SPDX-License-Identifier: Apache-2.0

name: "GHCR - Latest"

Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
org.opencontainers.image.source=${{ env.IMG_SOURCE }}
org.opencontainers.image.revision=${{ github.sha }}
org.opencontainers.image.version=${{ github.ref_name }}
org.opencontainers.image.licenses=AFL-3.0
org.opencontainers.image.licenses=Apache-2.0
sbom: true
tags: |
ghcr.io/${{ steps.image_owner.outputs.image_owner }}/draupnir:latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ghcr-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2026 Catalan Lover <catalanlover@protonmail.com>
#
# SPDX-License-Identifier: CC0-1.0
# SPDX-License-Identifier: Apache-2.0

name: "GHCR - Release"

Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
org.opencontainers.image.source=${{ env.IMG_SOURCE }}
org.opencontainers.image.revision=${{ github.sha }}
org.opencontainers.image.version=${{ github.ref_name }}
org.opencontainers.image.licenses=AFL-3.0
org.opencontainers.image.licenses=Apache-2.0
sbom: true
tags: |
ghcr.io/${{ steps.image_owner.outputs.image_owner }}/draupnir:${{ steps.release_version.outputs.release_version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mjolnir.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2024 Gnuxie <Gnuxie@protonmail.com>
#
# SPDX-License-Identifier: CC0-1.0
# SPDX-License-Identifier: Apache-2.0

name: Tests

Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2024 Gnuxie <Gnuxie@protonmail.com>
#
# SPDX-License-Identifier: CC0-1.0
# SPDX-License-Identifier: Apache-2.0

# Draupnir config
config/*
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2024 Gnuxie <Gnuxie@protonmail.com>
#
# SPDX-License-Identifier: 0BSD
# SPDX-License-Identifier: Apache-2.0

# See https://pre-commit.com for more information
# See https://pre-commit.com/hooks.html for more hooks
Expand Down
2 changes: 1 addition & 1 deletion .prettierignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2024 Gnuxie <Gnuxie@protonmail.com>
#
# SPDX-License-Identifier: 0BSD
# SPDX-License-Identifier: Apache-2.0

dist
packages/matrix-protection-suite/docs
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# SPDX-FileCopyrightText: 2024 Gnuxie <Gnuxie@protonmail.com>
#
# SPDX-License-Identifier: 0BSD
# SPDX-License-Identifier: Apache-2.0

tabWidth: 2
useTabs: false
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
SPDX-FileCopyrightText: 2024 Gnuxie <Gnuxie@protonmail.com>

SPDX-License-Identifier: CC-BY-SA-4.0
SPDX-License-Identifier: Apache-2.0
-->

# Changelog
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
SPDX-FileCopyrightText: 2024 Gnuxie <Gnuxie@protonmail.com>

SPDX-License-Identifier: CC0-1.0
SPDX-License-Identifier: Apache-2.0
-->

# Contributing to Draupnir
Expand Down
2 changes: 1 addition & 1 deletion DEPENDENCIES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
SPDX-FileCopyrightText: 2026 Gnuxie <Gnuxie@protonmail.com>

SPDX-License-Identifier: 0BSD
SPDX-License-Identifier: Apache-2.0
-->

# Dependencies
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright 2024 Gnuxie <Gnuxie@protonmail.com>
# Copyright 2019 The Matrix.org Foundation C.I.C.
#
# SPDX-License-Identifier: Apache-2.0 AND AFL-3.0

# SPDX-License-Identifier: Apache-2.0
# syntax=docker/dockerfile:1.7

FROM node:24-slim AS build-stage
Expand Down
6 changes: 3 additions & 3 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ No single license applies to all files in this repository.

## Additional note

This project is primarily developed under the Academic Free License 3.0
(AFL-3.0), with some components under Apache-2.0, and others under more
permissive licenses such as MIT or 0BSD.
This project is primarily developed under the Apache License Version 2.0
(Apache-2.0), with some components integrating code under more permissive
licenses such as MIT or 0BSD.

When redistributing Draupnir, you must comply with the terms of each applicable
license. In practice, this primarily involves preserving license texts and any
Expand Down
5 changes: 0 additions & 5 deletions LICENSES/0BSD.txt
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions LICENSES/AFL-3.0.txt
View file
Open in desktop

This file was deleted.

Loading
Loading