Skip to content

Commit 9059c75

Browse files
committed
Update license details
Add LICENSE.txt file and make it clear in the README file that we are Apache 2.0 Fixes spring-projectsgh-1952
1 parent 863c099 commit 9059c75

File tree

3 files changed

+231
-3
lines changed

3 files changed

+231
-3
lines changed

CONTRIBUTING.adoc

+22-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
= Contributing to Spring Boot
22

3-
Spring Boot is released under the non-restrictive Apache 2.0 license. If you would like
4-
to contribute something, or simply want to hack on the code this document should help
5-
you get started.
3+
Spring Boot is released under the Apache 2.0 license. If you would like to contribute
4+
something, or simply want to hack on the code this document should help you get started.
5+
6+
67

78
== Sign the Contributor License Agreement
89
Before we accept a non-trivial patch or pull request we will need you to sign the
@@ -12,6 +13,8 @@ repository, but it does mean that we can accept your contributions, and you will
1213
author credit if we do. Active contributors might be asked to join the core team, and
1314
given the ability to merge pull requests.
1415

16+
17+
1518
== Code Conventions and Housekeeping
1619
None of these is essential for a pull request, but they will all help. They can also be
1720
added after the original pull request but before a merge.
@@ -34,17 +37,23 @@ added after the original pull request but before a merge.
3437
* If no-one else is using your branch, please rebase it against the current master (or
3538
other target branch in the main project).
3639

40+
41+
3742
== Working with the code
3843
If you don't have an IDE preference we would recommend that you use
3944
http://www.springsource.com/developer/sts[Spring Tools Suite] or
4045
http://eclipse.org[Eclipse] when working with the code. We use the
4146
http://eclipse.org/m2e/[m2eclipe] eclipse plugin for maven support. Other IDEs and tools
4247
should also work without issue.
4348

49+
50+
4451
=== Building from source
4552
To build the source you will need to install
4653
http://maven.apache.org/run-maven/index.html[Apache Maven] v3.0.6 or above and JDK 1.7.
4754

55+
56+
4857
==== Default build
4958
The project can be built from the root directory using the standard maven command:
5059

@@ -64,6 +73,8 @@ to submit a pull request:
6473
$ mvn clean install -DskipTests
6574
----
6675

76+
77+
6778
==== Full Build
6879
Multi-module Maven builds cannot directly include maven plugins that are part of the
6980
reactor unless they have previously been built. Unfortunately this restriction causes
@@ -106,6 +117,8 @@ to Maven by setting a `MAVEN_OPTS` environment variable with the value
106117
`-Xmx512m -XX:MaxPermSize=128m`. We generate more artifacts when running the full build
107118
(such as Javadoc jars), so you may find the process a little slower than the standard build.
108119

120+
121+
109122
=== Importing into eclipse with m2eclipse
110123
We recommend the http://eclipse.org/m2e/[m2eclipe] eclipse plugin when working with
111124
eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
@@ -129,6 +142,8 @@ With the requisite eclipse plugins installed you can select
129142
`import existing maven projects` from the `file` menu to import the code. You will
130143
need to import the root `spring-boot` pom and the `spring-boot-samples` pom separately.
131144

145+
146+
132147
=== Importing into eclipse without m2eclipse
133148
If you prefer not to use m2eclipse you can generate eclipse project metadata using the
134149
following command:
@@ -141,9 +156,13 @@ following command:
141156
The generated eclipse projects can be imported by selecting `import existing projects`
142157
from the `file` menu.
143158

159+
160+
144161
=== Importing into other IDEs
145162
Maven is well supported by most Java IDEs. Refer to you vendor documentation.
146163

164+
165+
147166
== Integration tests
148167
The sample application are used as integration tests during the build (when you
149168
`mvn install`). Due to the fact that they make use of the `spring-boot-maven-plugin`

LICENSE.txt

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

README.adoc

+7
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ Java samples are available in link:spring-boot-samples[spring-boot-samples] and
190190
be built with maven and run by invoking `java -jar target/<sample>.jar`.
191191

192192

193+
193194
== Guides
194195
The http://spring.io/[spring.io] site contains several guides that show how to use Spring
195196
Boot step-by-step:
@@ -202,3 +203,9 @@ Boot step-by-step:
202203
can be configured.
203204
* http://spring.io/guides/gs/convert-jar-to-war/[Converting a Spring Boot JAR Application
204205
to a WAR] shows you how to run applications in a web server as a WAR file.
206+
207+
208+
209+
== License
210+
Spring Boot is Open Source software released under the
211+
http://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].

0 commit comments

Comments
 (0)