Skip to content
This repository has been archived by the owner on Oct 25, 2021. It is now read-only.

fix #190: update licenses to dual MIT+Apache #194

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ keywords = [
"documentation",
"testing",
]
license = "LGPL-3.0+"
license = "MIT OR Apache-2.0"
name = "artifact-app"
readme = "README.md"
repository = "https://github.com/vitiral/artifact"
Expand Down
13 changes: 13 additions & 0 deletions LICENSE-APACHE
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Copyright 2017 Garrett Berg, vitiral@gmail.com

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
21 changes: 21 additions & 0 deletions LICENSE-MIT
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2017 Garrett Berg, vitiral@gmail.com

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
192 changes: 0 additions & 192 deletions LICENSE.txt

This file was deleted.

23 changes: 17 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ experimental features. If you find a bug please [open a ticket][6].

### Goals
The intent of the artifact licensing is that:
- The artifact application remains open source under a copy-left license
but can be linked and built upon in any way (LGPLv3+)
- The artifact application be open source for anyone to use for any
purpose (dual licensed MIT + Apache).
- Anything generated by artifact can be licensed any way the user wishes
to, including the built static html pages.
- Any documents, tutorials or specifications for artifact (except the code
Expand Down Expand Up @@ -178,10 +178,21 @@ any purpose without needing additional attribution. The artifact logo is located
in `docs/logo` and was originally created by
[packapotatoes](https://github.com/packapotatoes).

The artifact source code (located in `src/` and `web-ui/src`) are licensed under
the LGPLv3+, except for files which say otherwise in their header or folders
containing a different `LICENSE` file. See [LICENSE.txt](LICENSE.txt) for more
information.
#### Source Code License

The source code is Licensed under either of

* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
http://www.apache.org/licenses/LICENSE-2.0)
* MIT license ([LICENSE-MIT](LICENSE-MIT) or
http://opensource.org/licenses/MIT)

at your option.

Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in the work by you, as defined in the Apache-2.0 license, shall
be dual licensed as above, without any additional terms or conditions.


[1]: https://vitiral.gitbooks.io/simple-quality/content/
[2]: http://vitiral.github.io/artifact/#artifacts/REQ-1
Expand Down
7 changes: 7 additions & 0 deletions scripts/lic_header.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/* Copyright (c) 2017 Garrett Berg, vitiral@gmail.com
*
* Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
* http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
* http://opensource.org/licenses/MIT>, at your option. This file may not be
* copied, modified, or distributed except according to those terms.
*/
25 changes: 25 additions & 0 deletions scripts/license.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import argparse

SOURCE = 'source'
OLD_HEADER = 'old_header'
NEW_HEADER = 'new_header'

parser = argparse.ArgumentParser()
parser.add_argument(SOURCE)
parser.add_argument(OLD_HEADER)
parser.add_argument(NEW_HEADER)

args = parser.parse_args()

with open(args.source) as f:
source = f.read()

with open(args.old_header) as f:
old_header = f.read()

with open(args.new_header) as f:
new_header = f.read()

with open(args.source, 'w') as f:
f.truncate(0)
f.write(source.replace(old_header, new_header))
21 changes: 6 additions & 15 deletions src/bin/art.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
/* artifact: the requirements tracking tool made for developers
* Copyright (C) 2017 Garrett Berg <@vitiral, vitiral@gmail.com>
/* Copyright (c) 2017 Garrett Berg, vitiral@gmail.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the Lesser GNU General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the Lesser GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* */
* Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
* http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
* http://opensource.org/licenses/MIT>, at your option. This file may not be
* copied, modified, or distributed except according to those terms.
*/

extern crate artifact_app;
use std::io;
Expand Down
21 changes: 6 additions & 15 deletions src/cmd/check.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
/* artifact: the requirements tracking tool made for developers
* Copyright (C) 2017 Garrett Berg <@vitiral, vitiral@gmail.com>
/* Copyright (c) 2017 Garrett Berg, vitiral@gmail.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the Lesser GNU General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the Lesser GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* */
* Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
* http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
* http://opensource.org/licenses/MIT>, at your option. This file may not be
* copied, modified, or distributed except according to those terms.
*/
use dev_prefix::*;
use types::*;
use cmd::types::*;
Expand Down
21 changes: 6 additions & 15 deletions src/cmd/display.rs
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@

/* artifact: the requirements tracking tool made for developers
* Copyright (C) 2017 Garrett Berg <@vitiral, vitiral@gmail.com>
/* Copyright (c) 2017 Garrett Berg, vitiral@gmail.com
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the Lesser GNU General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the Lesser GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* */
* Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
* http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
* http://opensource.org/licenses/MIT>, at your option. This file may not be
* copied, modified, or distributed except according to those terms.
*/
//! methods to format the `FmtArtifact` object and write it to a stream

use dev_prefix::*;
Expand Down