Evan, You are correct that the file header has been changed from the original which looked like [0].
I am not aware of any reason that the Google agreement made with the ASF during the migration would not cover this particular file under it. As such, my understanding is that the "licensed to the ASF under one or more contributor license agreements" holds, and supersedes the previous license (from google to the open-source world in general), which would require maintaining the "Copyright Google Inc" part. Replacing the file with a newer version would not fall under the Google-ASF migration agreement though, so would be required to maintain the "copyright Google" header instead (and update NOTICES as well). Ali [0]: https://code.google.com/p/wave-protocol/source/browse/src/google/protobuf/descriptor.proto On 21 November 2015 at 08:15, Evan Hughes <ehu...@gmail.com> wrote: > While working on moving us to gradle I decided to upgrade us to the 2.6 > version of the proto library and discovered that > proto/google/protobuf/descriptor.proto is the original google owned code > which has the license stripped. > > In order to upgrade I have had to import the 2.6 version of the file and it > works but seeking advice on what I do with the license of the file. > > regards > Evan Hughes
