Skip to content

Commit af44196

Browse files
Merge pull request #12 from arcticicestudio/subtask/gh-11-migrate-to-mit-license
Migrate to MIT license
2 parents 605caf0 + 82c0026 commit af44196

File tree

10 files changed

+94
-276
lines changed

10 files changed

+94
-276
lines changed

.travis.yml

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2-
# title Travis CI Build Configuration +
3-
# project nord-java +
4-
# repository https://github.com/arcticicestudio/nord-java +
5-
# author Arctic Ice Studio +
6-
7-
# copyright Copyright (C) 2016 +
8-
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
9-
#
10-
# [References]
11-
# Travis CI Documentation
12-
# (https://docs.travis-ci.com)
1+
# Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
2+
# Copyright (c) 2016-present Sven Greb <[email protected]>
3+
4+
# Project: Nord Java
5+
# Repository: https://github.com/arcticicestudio/nord-java
6+
# License: MIT
7+
# References
8+
# https://docs.travis-ci.com
9+
1310
language: java
1411
jdk:
1512
- oraclejdk8

LICENSE.md

+22-194
Original file line numberDiff line numberDiff line change
@@ -1,194 +1,22 @@
1-
Apache License
2-
==============
3-
4-
*Version 2.0, January 2004*
5-
*&lt;<http://www.apache.org/licenses/>&gt;*
6-
7-
### Terms and Conditions for use, reproduction, and distribution
8-
9-
#### 1. Definitions
10-
11-
"License" shall mean the terms and conditions for use, reproduction, and
12-
distribution as defined by Sections 1 through 9 of this document.
13-
14-
"Licensor" shall mean the copyright owner or entity authorized by the copyright
15-
owner that is granting the License.
16-
17-
"Legal Entity" shall mean the union of the acting entity and all other entities
18-
that control, are controlled by, or are under common control with that entity.
19-
For the purposes of this definition, "control" means **(i)** the power, direct or
20-
indirect, to cause the direction or management of such entity, whether by
21-
contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
22-
outstanding shares, or **(iii)** beneficial ownership of such entity.
23-
24-
"You" (or "Your") shall mean an individual or Legal Entity exercising
25-
permissions granted by this License.
26-
27-
"Source" form shall mean the preferred form for making modifications, including
28-
but not limited to software source code, documentation source, and configuration
29-
files.
30-
31-
"Object" form shall mean any form resulting from mechanical transformation or
32-
translation of a Source form, including but not limited to compiled object code,
33-
generated documentation, and conversions to other media types.
34-
35-
"Work" shall mean the work of authorship, whether in Source or Object form, made
36-
available under the License, as indicated by a copyright notice that is included
37-
in or attached to the work (an example is provided in the Appendix below).
38-
39-
"Derivative Works" shall mean any work, whether in Source or Object form, that
40-
is based on (or derived from) the Work and for which the editorial revisions,
41-
annotations, elaborations, or other modifications represent, as a whole, an
42-
original work of authorship. For the purposes of this License, Derivative Works
43-
shall not include works that remain separable from, or merely link (or bind by
44-
name) to the interfaces of, the Work and Derivative Works thereof.
45-
46-
"Contribution" shall mean any work of authorship, including the original version
47-
of the Work and any modifications or additions to that Work or Derivative Works
48-
thereof, that is intentionally submitted to Licensor for inclusion in the Work
49-
by the copyright owner or by an individual or Legal Entity authorized to submit
50-
on behalf of the copyright owner. For the purposes of this definition,
51-
"submitted" means any form of electronic, verbal, or written communication sent
52-
to the Licensor or its representatives, including but not limited to
53-
communication on electronic mailing lists, source code control systems, and
54-
issue tracking systems that are managed by, or on behalf of, the Licensor for
55-
the purpose of discussing and improving the Work, but excluding communication
56-
that is conspicuously marked or otherwise designated in writing by the copyright
57-
owner as "Not a Contribution."
58-
59-
"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
60-
of whom a Contribution has been received by Licensor and subsequently
61-
incorporated within the Work.
62-
63-
#### 2. Grant of Copyright License
64-
65-
Subject to the terms and conditions of this License, each Contributor hereby
66-
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
67-
irrevocable copyright license to reproduce, prepare Derivative Works of,
68-
publicly display, publicly perform, sublicense, and distribute the Work and such
69-
Derivative Works in Source or Object form.
70-
71-
#### 3. Grant of Patent License
72-
73-
Subject to the terms and conditions of this License, each Contributor hereby
74-
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
75-
irrevocable (except as stated in this section) patent license to make, have
76-
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
77-
such license applies only to those patent claims licensable by such Contributor
78-
that are necessarily infringed by their Contribution(s) alone or by combination
79-
of their Contribution(s) with the Work to which such Contribution(s) was
80-
submitted. If You institute patent litigation against any entity (including a
81-
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
82-
Contribution incorporated within the Work constitutes direct or contributory
83-
patent infringement, then any patent licenses granted to You under this License
84-
for that Work shall terminate as of the date such litigation is filed.
85-
86-
#### 4. Redistribution
87-
88-
You may reproduce and distribute copies of the Work or Derivative Works thereof
89-
in any medium, with or without modifications, and in Source or Object form,
90-
provided that You meet the following conditions:
91-
92-
* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
93-
this License; and
94-
* **(b)** You must cause any modified files to carry prominent notices stating that You
95-
changed the files; and
96-
* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
97-
all copyright, patent, trademark, and attribution notices from the Source form
98-
of the Work, excluding those notices that do not pertain to any part of the
99-
Derivative Works; and
100-
* **(d)** If the Work includes a "NOTICE" text file as part of its distribution, then any
101-
Derivative Works that You distribute must include a readable copy of the
102-
attribution notices contained within such NOTICE file, excluding those notices
103-
that do not pertain to any part of the Derivative Works, in at least one of the
104-
following places: within a NOTICE text file distributed as part of the
105-
Derivative Works; within the Source form or documentation, if provided along
106-
with the Derivative Works; or, within a display generated by the Derivative
107-
Works, if and wherever such third-party notices normally appear. The contents of
108-
the NOTICE file are for informational purposes only and do not modify the
109-
License. You may add Your own attribution notices within Derivative Works that
110-
You distribute, alongside or as an addendum to the NOTICE text from the Work,
111-
provided that such additional attribution notices cannot be construed as
112-
modifying the License.
113-
114-
You may add Your own copyright statement to Your modifications and may provide
115-
additional or different license terms and conditions for use, reproduction, or
116-
distribution of Your modifications, or for any such Derivative Works as a whole,
117-
provided Your use, reproduction, and distribution of the Work otherwise complies
118-
with the conditions stated in this License.
119-
120-
#### 5. Submission of Contributions
121-
122-
Unless You explicitly state otherwise, any Contribution intentionally submitted
123-
for inclusion in the Work by You to the Licensor shall be under the terms and
124-
conditions of this License, without any additional terms or conditions.
125-
Notwithstanding the above, nothing herein shall supersede or modify the terms of
126-
any separate license agreement you may have executed with Licensor regarding
127-
such Contributions.
128-
129-
#### 6. Trademarks
130-
131-
This License does not grant permission to use the trade names, trademarks,
132-
service marks, or product names of the Licensor, except as required for
133-
reasonable and customary use in describing the origin of the Work and
134-
reproducing the content of the NOTICE file.
135-
136-
#### 7. Disclaimer of Warranty
137-
138-
Unless required by applicable law or agreed to in writing, Licensor provides the
139-
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
140-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
141-
including, without limitation, any warranties or conditions of TITLE,
142-
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
143-
solely responsible for determining the appropriateness of using or
144-
redistributing the Work and assume any risks associated with Your exercise of
145-
permissions under this License.
146-
147-
#### 8. Limitation of Liability
148-
149-
In no event and under no legal theory, whether in tort (including negligence),
150-
contract, or otherwise, unless required by applicable law (such as deliberate
151-
and grossly negligent acts) or agreed to in writing, shall any Contributor be
152-
liable to You for damages, including any direct, indirect, special, incidental,
153-
or consequential damages of any character arising as a result of this License or
154-
out of the use or inability to use the Work (including but not limited to
155-
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
156-
any and all other commercial damages or losses), even if such Contributor has
157-
been advised of the possibility of such damages.
158-
159-
#### 9. Accepting Warranty or Additional Liability
160-
161-
While redistributing the Work or Derivative Works thereof, You may choose to
162-
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
163-
other liability obligations and/or rights consistent with this License. However,
164-
in accepting such obligations, You may act only on Your own behalf and on Your
165-
sole responsibility, not on behalf of any other Contributor, and only if You
166-
agree to indemnify, defend, and hold each Contributor harmless for any liability
167-
incurred by, or claims asserted against, such Contributor by reason of your
168-
accepting any such warranty or additional liability.
169-
170-
*END OF TERMS AND CONDITIONS*
171-
172-
### APPENDIX: How to apply the Apache License to your work
173-
174-
To apply the Apache License to your work, attach the following boilerplate
175-
notice, with the fields enclosed by brackets `[]` replaced with your own
176-
identifying information. (Don't include the brackets!) The text should be
177-
enclosed in the appropriate comment syntax for the file format. We also
178-
recommend that a file or class name and description of purpose be included on
179-
the same "printed page" as the copyright notice for easier identification within
180-
third-party archives.
181-
182-
Copyright [yyyy] [name of copyright owner]
183-
184-
Licensed under the Apache License, Version 2.0 (the "License");
185-
you may not use this file except in compliance with the License.
186-
You may obtain a copy of the License at
187-
188-
http://www.apache.org/licenses/LICENSE-2.0
189-
190-
Unless required by applicable law or agreed to in writing, software
191-
distributed under the License is distributed on an "AS IS" BASIS,
192-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
193-
See the License for the specific language governing permissions and
194-
limitations under the License.
1+
MIT License (MIT)
2+
3+
Copyright (c) 2016-present Arctic Ice Studio <[email protected]> (http://arcticicestudio.com)
4+
Copyright (c) 2016-present Sven Greb <[email protected]> (http://svengreb.de)
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all
14+
copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
SOFTWARE.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ Please report issues/bugs, feature requests and suggestions for improvements to
7676

7777
<p align="center"><img src="https://cdn.rawgit.com/arcticicestudio/nord/develop/src/assets/banner-footer-mountains.svg"/></p>
7878

79-
<p align="center"> <img src="http://arcticicestudio.com/favicon.ico" width=16 height=16/> Copyright &copy; 2016 Arctic Ice Studio</p>
79+
<p align="center">Copyright &copy; 2016-present Arctic Ice Studio</p>
8080

81-
<p align="center"><a href="http://www.apache.org/licenses/LICENSE-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-blue.svg"/></a></p>
81+
<p align="center"><a href="https://github.com/arcticicestudio/nord-java/blob/develop/LICENSE.md"><img src="https://img.shields.io/badge/License-MIT-5E81AC.svg?style=flat-square"/></a> <a href="https://creativecommons.org/licenses/by-sa/4.0"><img src="https://img.shields.io/badge/License-CC_BY--SA_4.0-5E81AC.svg?style=flat-square"/></a></p>

circle.yml

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2-
# title Circle CI Build Configuration +
3-
# project nord-java +
4-
# repository https://github.com/arcticicestudio/nord-java +
5-
# author Arctic Ice Studio +
6-
7-
# copyright Copyright (C) 2016 +
8-
# +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
9-
#
10-
# [References]
11-
# Circle CI
12-
# (https://circleci.com/docs)
1+
# Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
2+
# Copyright (c) 2016-present Sven Greb <[email protected]>
3+
4+
# Project: Nord Java
5+
# Repository: https://github.com/arcticicestudio/nord-java
6+
# License: MIT
7+
# References
8+
# https://circleci.com/docs
9+
1310
machine:
1411
java:
1512
version: oraclejdk8

nord-java.iml

-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
</content>
1313
<orderEntry type="inheritedJdk" />
1414
<orderEntry type="sourceFolder" forTests="false" />
15-
<orderEntry type="library" scope="TEST" name="Maven: com.arcticicestudio:arcver-java:0.11.0-SNAPSHOT" level="project" />
1615
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
1716
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
1817
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
19-
<orderEntry type="library" scope="TEST" name="Maven: com.arcticicestudio:arcver-java:0.11.0-SNAPSHOT" level="project" />
2018
</component>
2119
</module>

pom.xml

+14-18
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
21
<!--
3-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4-
title POM +
5-
project nord-java +
6-
repository https://github.com/arcticicestudio/nord-java +
7-
author Arctic Ice Studio +
8-
9-
copyright Copyright (C) 2016 +
10-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2+
Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
3+
Copyright (c) 2016-present Sven Greb <[email protected]>
114
12-
[References]
13-
Apache Maven
14-
(https://maven.apache.org/guides)
15-
(https://maven.apache.org/pom.html)
16-
(https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html)
17-
Sonatype
18-
(http://books.sonatype.com/mvnref-book/reference)
19-
JFrog
20-
(https://bintray.com/docs/usermanual)
5+
Project: Nord Java
6+
Repository: https://github.com/arcticicestudio/nord-java
7+
License: MIT
8+
References
9+
https://docs.travis-ci.com
10+
https://maven.apache.org/guides
11+
https://maven.apache.org/pom.html
12+
https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html
13+
http://books.sonatype.com/mvnref-book/reference
14+
https://bintray.com/docs/usermanual
2115
-->
16+
17+
<?xml version="1.0" encoding="UTF-8"?>
2218
<project
2319
xmlns="http://maven.apache.org/POM/4.0.0"
2420
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

src/main/assets/assembly-bin.xml

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
21
<!--
3-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
4-
title Binary Assembly Descriptor +
5-
project nord-java +
6-
repository https://github.com/arcticicestudio/nord-java +
7-
author Arctic Ice Studio +
8-
9-
copyright Copyright (C) 2016 +
10-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2+
Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
3+
Copyright (c) 2016-present Sven Greb <[email protected]>
4+
5+
Binary assembly descriptor.
6+
7+
Project: Nord Java
8+
Repository: https://github.com/arcticicestudio/nord-java
9+
License: MIT
1110
-->
11+
12+
<?xml version="1.0" encoding="UTF-8"?>
1213
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
1314
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1415
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">

src/main/java/com/arcticicestudio/nord/Nord.java

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
/*
2-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3-
title Nord API +
4-
project nord-java +
5-
repository https://github.com/arcticicestudio/nord-java +
6-
author Arctic Ice Studio +
7-
8-
copyright Copyright (C) 2016 +
9-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++
10-
*/
2+
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
3+
* Copyright (c) 2016-present Sven Greb <[email protected]>
4+
*
5+
* Nord API.
6+
*
7+
* Project: Nord Java
8+
* Repository: https://github.com/arcticicestudio/nord-java
9+
* License: MIT
10+
*/
11+
1112
package com.arcticicestudio.nord;
1213

1314
import javafx.scene.paint.Color;

src/main/java/com/arcticicestudio/nord/package-info.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
/*
2-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3-
title Nord API Package Info +
4-
project nord-java +
5-
repository https://github.com/arcticicestudio/nord-java +
6-
author Arctic Ice Studio +
7-
8-
copyright Copyright (C) 2016 +
9-
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++
10-
*/
2+
* Copyright (c) 2016-present Arctic Ice Studio <[email protected]>
3+
* Copyright (c) 2016-present Sven Greb <[email protected]>
4+
*
5+
* Project: Nord Java
6+
* Repository: https://github.com/arcticicestudio/nord-java
7+
* License: MIT
8+
*/
9+
1110
/**
1211
* Public API of the <a href="https://github.com/arcticicestudio/nord-java">Nord Java</a> project, which implements
1312
* the <a href="https://github.com/arcticicestudio/nord">Nord</a> color palette.

0 commit comments

Comments
 (0)