You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by bo...@apache.org on 2017/05/06 07:45:35 UTC
[1/2] lucenenet git commit: one license is enough
Repository: lucenenet
Updated Branches:
refs/heads/master db82646ee -> a42b1dbb8
one license is enough
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/c567120b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/c567120b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/c567120b
Branch: refs/heads/master
Commit: c567120b60619cb6bf6b3682c6716fddc7471a0a
Parents: db82646
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat May 6 06:25:10 2017 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat May 6 06:25:10 2017 +0200
----------------------------------------------------------------------
build.bat | 16 ----------------
1 file changed, 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/c567120b/build.bat
----------------------------------------------------------------------
diff --git a/build.bat b/build.bat
index 5a3ecad..3bdc8f1 100644
--- a/build.bat
+++ b/build.bat
@@ -14,22 +14,6 @@ GOTO endcommentblock
:: 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.
-:: -----------------------------------------------------------------------------------
-::
-:: 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.
::
:: -----------------------------------------------------------------------------------
::
[2/2] lucenenet git commit: we don't need to include a notice for
Apache licensed code
Posted by bo...@apache.org.
we don't need to include a notice for Apache licensed code
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/a42b1dbb
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/a42b1dbb
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/a42b1dbb
Branch: refs/heads/master
Commit: a42b1dbb894a553c10523fbed0041f835f6ed8f9
Parents: c567120
Author: Stefan Bodewig <bo...@apache.org>
Authored: Sat May 6 09:44:45 2017 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Sat May 6 09:44:45 2017 +0200
----------------------------------------------------------------------
LICENSE.txt | 26 --------------------------
1 file changed, 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a42b1dbb/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index f64ec67..9196e1c 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -758,29 +758,3 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-=============================
-
-Some code in
-src/Lucene.Net/Support/IO
-src/Lucene.Net/Support/PriorityQueue.cs
-src/Lucene.Net.Analysis.Common/Util/BufferedCharFilter.cs
-src/Lucene.Net.Tests/Support/IO
-src/Lucene.Net.Tests/Support/TestPriorityQueue.cs
-src/Lucene.Net.Tests.Analysis.Common/Util/TestBufferedCharFilter.cs
-was sourced from the Apache Harmony project, which falls under the
-following license:
-
-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.