If you can do it easily, I think that would be ideal, I can then re-do it. May be silly, but provides a slightly easier to follow legal path.
many thanks david jencks > On Jun 23, 2016, at 8:23 AM, Carsten Ziegeler <[email protected]> wrote: > > Should I revert? > > David Jencks wrote >> If I had added the license header then svn alone would have included the >> entire legal trail related to the file licensing. Now, anyone concerned >> with it has to also consult this mailing list to see that I emailed my >> agreement to the license change. >> >> david jencks >> >>> On Jun 23, 2016, at 8:00 AM, Carsten Ziegeler <[email protected]> wrote: >>> >>> David Jencks wrote >>>> Um, I think you should have let me fix this as I’m the author? In any >>>> case I had a similar commit lined up to deliver and indeed intended the >>>> file to be apache-2.0 licensed. >>> >>> Ehm, why should only you fix a problem? If, for whatever reason, these >>> files cant be apache licensed, you could still revert/remove. >>> >>> The build was failing because of this and I wanted to fix this asap. >>> >>> Thanks >>> Carsten >>> >>>> >>>> david jencks >>>> >>>>> On Jun 23, 2016, at 4:45 AM, [email protected] wrote: >>>>> >>>>> Author: cziegeler >>>>> Date: Thu Jun 23 11:45:33 2016 >>>>> New Revision: 1749869 >>>>> >>>>> URL: http://svn.apache.org/viewvc?rev=1749869&view=rev >>>>> Log: >>>>> add missing license header >>>>> >>>>> Modified: >>>>> >>>>> felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/components/felix5248/Component.java >>>>> >>>>> Modified: >>>>> felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/components/felix5248/Component.java >>>>> URL: >>>>> http://svn.apache.org/viewvc/felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/components/felix5248/Component.java?rev=1749869&r1=1749868&r2=1749869&view=diff >>>>> ============================================================================== >>>>> --- >>>>> felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/components/felix5248/Component.java >>>>> (original) >>>>> +++ >>>>> felix/trunk/scr/src/test/java/org/apache/felix/scr/integration/components/felix5248/Component.java >>>>> Thu Jun 23 11:45:33 2016 >>>>> @@ -1,10 +1,28 @@ >>>>> +/* >>>>> + * Licensed to the Apache Software Foundation (ASF) under one >>>>> + * or more contributor license agreements. See the NOTICE file >>>>> + * distributed with this work for additional information >>>>> + * regarding copyright ownership. The ASF licenses this file >>>>> + * to you under the Apache License, Version 2.0 (the >>>>> + * "License"); you may not use this file except in compliance >>>>> + * with the License. You may obtain a copy of the License at >>>>> + * >>>>> + * http://www.apache.org/licenses/LICENSE-2.0 >>>>> + * >>>>> + * Unless required by applicable law or agreed to in writing, >>>>> + * software distributed under the License is distributed on an >>>>> + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY >>>>> + * KIND, either express or implied. See the License for the >>>>> + * specific language governing permissions and limitations >>>>> + * under the License. >>>>> + */ >>>>> package org.apache.felix.scr.integration.components.felix5248; >>>>> >>>>> import java.util.Map; >>>>> >>>>> public class Component >>>>> { >>>>> - >>>>> + >>>>> void activate(Map<String, Object> props) >>>>> { >>>>> if (props.containsKey( "FAIL" )) >>>>> >>>>> >>>> >>>> >>> >>> >>> >>> -- >>> Carsten Ziegeler >>> Adobe Research Switzerland >>> [email protected] <mailto:[email protected]> >> > > > > -- > Carsten Ziegeler > Adobe Research Switzerland > [email protected]
