Merge pull request #2772 from sschuberth/master

Fix links to the license in meta-data

CHANGES.txt

@@ -1381,7 +1381,7 @@
 2008-09-29 version 2.0.2:
 
   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
     annotations which may be placed on definitions in a .proto file.
     For example, you might define a field option called "foo" like so:

Protobuf.podspec

@@ -8,7 +8,7 @@ Pod::Spec.new do |s|
   s.version  = '3.2.0'
   s.summary  = 'Protocol Buffers v.3 runtime library for Objective-C.'
   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.cocoapods_version = '>= 1.0'
 

java/pom.xml

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

javanano/pom.xml

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

php/ext/google/protobuf/package.xml

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

protoc-artifacts/pom.xml

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

python/compatibility_tests/v2.5.0/setup.py

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

python/setup.py

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

ruby/pom.xml

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