Skip to content

Commit 902af08

Browse files
committed
Prefer the term "3-Clause BSD License" over "New BSD License"
The first is the newer name, which is also more telling.
1 parent 6395a1c commit 902af08

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

CHANGES.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,7 @@
13811381
2008-09-29 version 2.0.2:
13821382

13831383
General
1384-
* License changed from Apache 2.0 to New BSD.
1384+
* License changed from Apache 2.0 to 3-Clause BSD.
13851385
* It is now possible to define custom "options", which are basically
13861386
annotations which may be placed on definitions in a .proto file.
13871387
For example, you might define a field option called "foo" like so:

Protobuf.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
88
s.version = '3.2.0'
99
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
1010
s.homepage = 'https://github.com/google/protobuf'
11-
s.license = 'New BSD'
11+
s.license = '3-Clause BSD License'
1212
s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' }
1313
s.cocoapods_version = '>= 1.0'
1414

java/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
<licenses>
4141
<license>
42-
<name>New BSD license</name>
42+
<name>3-Clause BSD License</name>
4343
<url>https://opensource.org/licenses/BSD-3-Clause</url>
4444
<distribution>repo</distribution>
4545
</license>

javanano/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<url>https://developers.google.com/protocol-buffers/</url>
2222
<licenses>
2323
<license>
24-
<name>New BSD license</name>
24+
<name>3-Clause BSD License</name>
2525
<url>https://opensource.org/licenses/BSD-3-Clause</url>
2626
<distribution>repo</distribution>
2727
</license>

php/ext/google/protobuf/package.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<release>alpha</release>
2121
<api>alpha</api>
2222
</stability>
23-
<license uri="https://opensource.org/licenses/BSD-3-Clause">New BSD License</license>
23+
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
2424
<notes>
2525
Second alpha release.
2626
</notes>
@@ -66,7 +66,7 @@ Second alpha release.
6666
</stability>
6767
<date>2016-09-23</date>
6868
<time>16:06:07</time>
69-
<license uri="https://opensource.org/licenses/BSD-3-Clause">New BSD License</license>
69+
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
7070
<notes>
7171
First alpha release
7272
</notes>
@@ -82,7 +82,7 @@ First alpha release
8282
</stability>
8383
<date>2017-01-13</date>
8484
<time>16:06:07</time>
85-
<license uri="https://opensource.org/licenses/BSD-3-Clause">New BSD License</license>
85+
<license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
8686
<notes>
8787
Second alpha release.
8888
</notes>

protoc-artifacts/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<url>https://developers.google.com/protocol-buffers/</url>
2222
<licenses>
2323
<license>
24-
<name>New BSD license</name>
24+
<name>3-Clause BSD License</name>
2525
<url>https://opensource.org/licenses/BSD-3-Clause</url>
2626
<distribution>repo</distribution>
2727
</license>

python/compatibility_tests/v2.5.0/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def run(self):
6464
url='https://developers.google.com/protocol-buffers/',
6565
maintainer='protobuf@googlegroups.com',
6666
maintainer_email='protobuf@googlegroups.com',
67-
license='New BSD License',
67+
license='3-Clause BSD License',
6868
classifiers=[
6969
"Programming Language :: Python",
7070
"Programming Language :: Python :: 2",

python/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ def get_option_from_sys_argv(option_str):
234234
url='https://developers.google.com/protocol-buffers/',
235235
maintainer='protobuf@googlegroups.com',
236236
maintainer_email='protobuf@googlegroups.com',
237-
license='New BSD License',
237+
license='3-Clause BSD License',
238238
classifiers=[
239239
"Programming Language :: Python",
240240
"Programming Language :: Python :: 2",

ruby/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<url>https://developers.google.com/protocol-buffers/</url>
2222
<licenses>
2323
<license>
24-
<name>New BSD license</name>
24+
<name>3-Clause BSD License</name>
2525
<url>https://opensource.org/licenses/BSD-3-Clause</url>
2626
<distribution>repo</distribution>
2727
</license>

0 commit comments

Comments
 (0)