Coming in out of context on this. Is this situation basically that we have some non-asf licensed code we’re making modifications to? If so the pattern for that is we include both licenses in the header.
I don’t call which file it is or what I was working on, but we definitely had one in there like that from years ago. -- David Blevins http://twitter.com/dblevins http://www.tomitribe.com > On Sep 14, 2017, at 10:03 PM, Romain Manni-Bucau <[email protected]> > wrote: > > Hey Andy > > Livereload is under MIT license as written in the notice file, not asf one, > we should probably strip the header from it to keep the original file. If > better we can dowload the file during the build to make it more obvious it > is not ours. > > > > Le 14 sept. 2017 21:39, <[email protected]> a écrit : > > Repository: tomee > Updated Branches: > refs/heads/master 5d0b2726f -> 5df2bd805 > > > Fix licence issues > > > Project: http://git-wip-us.apache.org/repos/asf/tomee/repo > Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5df2bd80 > Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5df2bd80 > Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5df2bd80 > > Branch: refs/heads/master > Commit: 5df2bd805eb8c4096529e84fbf8aacf0e8b12972 > Parents: 5d0b272 > Author: andygumbrecht <[email protected]> > Authored: Thu Sep 14 21:39:28 2017 +0200 > Committer: andygumbrecht <[email protected]> > Committed: Thu Sep 14 21:39:28 2017 +0200 > > ---------------------------------------------------------------------- > .../resource/activemq/jms2/TomEEXAConnection.java | 16 ++++++++++++++++ > .../assembler/classic/AppNamingReadOnlyTest.java | 16 ++++++++++++++++ > .../openejb/core/ivm/EjbObjectInputStreamTest.java | 16 ++++++++++++++++ > .../server/cxf/rs/JSonStreamingOutputTest.java | 16 ++++++++++++++++ > .../src/main/resources/js/livereload.js | 16 ++++++++++++++++ > 5 files changed, 80 insertions(+) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/tomee/blob/5df2bd80/ > container/openejb-core/src/main/java/org/apache/openejb/ > resource/activemq/jms2/TomEEXAConnection.java > ---------------------------------------------------------------------- > diff --git a/container/openejb-core/src/main/java/org/apache/openejb/ > resource/activemq/jms2/TomEEXAConnection.java b/container/openejb-core/src/ > main/java/org/apache/openejb/resource/activemq/jms2/TomEEXAConnection.java > index efe07cc..ff54579 100644 > --- a/container/openejb-core/src/main/java/org/apache/openejb/ > resource/activemq/jms2/TomEEXAConnection.java > +++ b/container/openejb-core/src/main/java/org/apache/openejb/ > resource/activemq/jms2/TomEEXAConnection.java > @@ -1,3 +1,19 @@ > +/* > + * 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.openejb.resource.activemq.jms2; > > import org.apache.activemq.ActiveMQXAConnection; > > http://git-wip-us.apache.org/repos/asf/tomee/blob/5df2bd80/ > container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/ > AppNamingReadOnlyTest.java > ---------------------------------------------------------------------- > diff --git a/container/openejb-core/src/test/java/org/apache/openejb/ > assembler/classic/AppNamingReadOnlyTest.java b/container/openejb-core/src/ > test/java/org/apache/openejb/assembler/classic/AppNamingReadOnlyTest.java > index 8ea3a02..e63a275 100644 > --- a/container/openejb-core/src/test/java/org/apache/openejb/ > assembler/classic/AppNamingReadOnlyTest.java > +++ b/container/openejb-core/src/test/java/org/apache/openejb/ > assembler/classic/AppNamingReadOnlyTest.java > @@ -1,3 +1,19 @@ > +/* > + * 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.openejb.assembler.classic; > > import java.net.URI; > > http://git-wip-us.apache.org/repos/asf/tomee/blob/5df2bd80/ > container/openejb-core/src/test/java/org/apache/openejb/core/ivm/ > EjbObjectInputStreamTest.java > ---------------------------------------------------------------------- > diff --git a/container/openejb-core/src/test/java/org/apache/openejb/ > core/ivm/EjbObjectInputStreamTest.java b/container/openejb-core/src/ > test/java/org/apache/openejb/core/ivm/EjbObjectInputStreamTest.java > index 6bf7e92..fd1d057 100644 > --- a/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/ > EjbObjectInputStreamTest.java > +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/ivm/ > EjbObjectInputStreamTest.java > @@ -1,3 +1,19 @@ > +/* > + * 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.openejb.core.ivm; > > import org.apache.openejb.OpenEJB; > > http://git-wip-us.apache.org/repos/asf/tomee/blob/5df2bd80/ > server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ > JSonStreamingOutputTest.java > ---------------------------------------------------------------------- > diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/ > server/cxf/rs/JSonStreamingOutputTest.java b/server/openejb-cxf-rs/src/ > test/java/org/apache/openejb/server/cxf/rs/JSonStreamingOutputTest.java > index 635bdb0..de284cf 100644 > --- a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ > JSonStreamingOutputTest.java > +++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ > JSonStreamingOutputTest.java > @@ -1,3 +1,19 @@ > +/* > + * 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.openejb.server.cxf.rs; > > import org.apache.openejb.junit.ApplicationComposer; > > http://git-wip-us.apache.org/repos/asf/tomee/blob/5df2bd80/ > utils/livereload-tomee/src/main/resources/js/livereload.js > ---------------------------------------------------------------------- > diff --git a/utils/livereload-tomee/src/main/resources/js/livereload.js > b/utils/livereload-tomee/src/main/resources/js/livereload.js > index eee60ec..156d707 100644 > --- a/utils/livereload-tomee/src/main/resources/js/livereload.js > +++ b/utils/livereload-tomee/src/main/resources/js/livereload.js > @@ -1,3 +1,19 @@ > +/* > + * 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. > + */ > (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof > require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return > i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw > f.code="MODULE_NOT_FOUND",f}var > l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var > n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var > i=typeof require=="function"&&require;for(var > o=0;o<r.length;o++)s(r[o]);return > s})({1:[function(require,module,exports){ > (function() { > var Connector, PROTOCOL_6, PROTOCOL_7, Parser, Version, _ref;
