Prefer the term "3-Clause BSD License" over "New BSD License"

The first is the newer name, which is also more telling.
pull/2772/head
Sebastian Schuberth 8 years ago
parent 6395a1cbd9
commit 902af0816e
  1. 2
      CHANGES.txt
  2. 2
      Protobuf.podspec
  3. 2
      java/pom.xml
  4. 2
      javanano/pom.xml
  5. 6
      php/ext/google/protobuf/package.xml
  6. 2
      protoc-artifacts/pom.xml
  7. 2
      python/compatibility_tests/v2.5.0/setup.py
  8. 2
      python/setup.py
  9. 2
      ruby/pom.xml

@ -1381,7 +1381,7 @@
2008-09-29 version 2.0.2: 2008-09-29 version 2.0.2:
General General
* License changed from Apache 2.0 to New BSD. * License changed from Apache 2.0 to 3-Clause BSD.
* It is now possible to define custom "options", which are basically * It is now possible to define custom "options", which are basically
annotations which may be placed on definitions in a .proto file. annotations which may be placed on definitions in a .proto file.
For example, you might define a field option called "foo" like so: For example, you might define a field option called "foo" like so:

@ -8,7 +8,7 @@ Pod::Spec.new do |s|
s.version = '3.2.0' s.version = '3.2.0'
s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.' s.summary = 'Protocol Buffers v.3 runtime library for Objective-C.'
s.homepage = 'https://github.com/google/protobuf' s.homepage = 'https://github.com/google/protobuf'
s.license = 'New BSD' s.license = '3-Clause BSD License'
s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' } s.authors = { 'The Protocol Buffers contributors' => 'protobuf@googlegroups.com' }
s.cocoapods_version = '>= 1.0' s.cocoapods_version = '>= 1.0'

@ -39,7 +39,7 @@
<licenses> <licenses>
<license> <license>
<name>New BSD license</name> <name>3-Clause BSD License</name>
<url>https://opensource.org/licenses/BSD-3-Clause</url> <url>https://opensource.org/licenses/BSD-3-Clause</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>

@ -21,7 +21,7 @@
<url>https://developers.google.com/protocol-buffers/</url> <url>https://developers.google.com/protocol-buffers/</url>
<licenses> <licenses>
<license> <license>
<name>New BSD license</name> <name>3-Clause BSD License</name>
<url>https://opensource.org/licenses/BSD-3-Clause</url> <url>https://opensource.org/licenses/BSD-3-Clause</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>

@ -20,7 +20,7 @@
<release>alpha</release> <release>alpha</release>
<api>alpha</api> <api>alpha</api>
</stability> </stability>
<license uri="https://opensource.org/licenses/BSD-3-Clause">New BSD License</license> <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes> <notes>
Second alpha release. Second alpha release.
</notes> </notes>
@ -66,7 +66,7 @@ Second alpha release.
</stability> </stability>
<date>2016-09-23</date> <date>2016-09-23</date>
<time>16:06:07</time> <time>16:06:07</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">New BSD License</license> <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes> <notes>
First alpha release First alpha release
</notes> </notes>
@ -82,7 +82,7 @@ First alpha release
</stability> </stability>
<date>2017-01-13</date> <date>2017-01-13</date>
<time>16:06:07</time> <time>16:06:07</time>
<license uri="https://opensource.org/licenses/BSD-3-Clause">New BSD License</license> <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license>
<notes> <notes>
Second alpha release. Second alpha release.
</notes> </notes>

@ -21,7 +21,7 @@
<url>https://developers.google.com/protocol-buffers/</url> <url>https://developers.google.com/protocol-buffers/</url>
<licenses> <licenses>
<license> <license>
<name>New BSD license</name> <name>3-Clause BSD License</name>
<url>https://opensource.org/licenses/BSD-3-Clause</url> <url>https://opensource.org/licenses/BSD-3-Clause</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>

@ -64,7 +64,7 @@ if __name__ == '__main__':
url='https://developers.google.com/protocol-buffers/', url='https://developers.google.com/protocol-buffers/',
maintainer='protobuf@googlegroups.com', maintainer='protobuf@googlegroups.com',
maintainer_email='protobuf@googlegroups.com', maintainer_email='protobuf@googlegroups.com',
license='New BSD License', license='3-Clause BSD License',
classifiers=[ classifiers=[
"Programming Language :: Python", "Programming Language :: Python",
"Programming Language :: Python :: 2", "Programming Language :: Python :: 2",

@ -234,7 +234,7 @@ if __name__ == '__main__':
url='https://developers.google.com/protocol-buffers/', url='https://developers.google.com/protocol-buffers/',
maintainer='protobuf@googlegroups.com', maintainer='protobuf@googlegroups.com',
maintainer_email='protobuf@googlegroups.com', maintainer_email='protobuf@googlegroups.com',
license='New BSD License', license='3-Clause BSD License',
classifiers=[ classifiers=[
"Programming Language :: Python", "Programming Language :: Python",
"Programming Language :: Python :: 2", "Programming Language :: Python :: 2",

@ -21,7 +21,7 @@
<url>https://developers.google.com/protocol-buffers/</url> <url>https://developers.google.com/protocol-buffers/</url>
<licenses> <licenses>
<license> <license>
<name>New BSD license</name> <name>3-Clause BSD License</name>
<url>https://opensource.org/licenses/BSD-3-Clause</url> <url>https://opensource.org/licenses/BSD-3-Clause</url>
<distribution>repo</distribution> <distribution>repo</distribution>
</license> </license>

Loading…
Cancel
Save