You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jl...@apache.org on 2017/10/08 13:49:28 UTC

[11/50] [abbrv] incubator-netbeans git commit: [NETBEANS-54] Module Review notifications

[NETBEANS-54] Module Review notifications

Add apache license to notifications/src/org/netbeans/modules/notifications/Bundle.properties

Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/4d75ecdf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/4d75ecdf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/4d75ecdf

Branch: refs/heads/jdk-javac
Commit: 4d75ecdf00f115447ed144ad5d9054d2581267a4
Parents: 61e51dc
Author: Mohammed Ammer <mo...@gmail.com>
Authored: Sat Oct 7 09:00:40 2017 +0200
Committer: Emilian Bold <em...@gmail.com>
Committed: Sat Oct 7 10:00:40 2017 +0300

----------------------------------------------------------------------
 .../modules/notifications/Bundle.properties     | 50 ++++++--------------
 1 file changed, 15 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/4d75ecdf/notifications/src/org/netbeans/modules/notifications/Bundle.properties
----------------------------------------------------------------------
diff --git a/notifications/src/org/netbeans/modules/notifications/Bundle.properties b/notifications/src/org/netbeans/modules/notifications/Bundle.properties
index fe3b532..6672e86 100644
--- a/notifications/src/org/netbeans/modules/notifications/Bundle.properties
+++ b/notifications/src/org/netbeans/modules/notifications/Bundle.properties
@@ -1,40 +1,20 @@
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+# 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
 #
-# Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved.
+#  http://www.apache.org/licenses/LICENSE-2.0
 #
-# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-# Other names may be trademarks of their respective owners.
-#
-# The contents of this file are subject to the terms of either the GNU
-# General Public License Version 2 only ("GPL") or the Common
-# Development and Distribution License("CDDL") (collectively, the
-# "License"). You may not use this file except in compliance with the
-# License. You can obtain a copy of the License at
-# http://www.netbeans.org/cddl-gplv2.html
-# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
-# specific language governing permissions and limitations under the
-# License.  When distributing the software, include this License Header
-# Notice in each file and include the License file at
-# nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the GPL Version 2 section of the License file that
-# accompanied this code. If applicable, add the following below the
-# License Header, with the fields enclosed by brackets [] replaced by
-# your own identifying information:
-# "Portions Copyrighted [year] [name of copyright owner]"
-#
-# If you wish your version of this file to be governed by only the CDDL
-# or only the GPL Version 2, indicate your decision by adding
-# "[Contributor] elects to include this software in this distribution
-# under the [CDDL or GPL Version 2] license." If you do not indicate a
-# single choice of license, a recipient has the option to distribute
-# your version of this file under either the CDDL, the GPL Version 2 or
-# to extend the choice of license to its licensees as provided above.
-# However, if you add GPL Version 2 code and therefore, elected the GPL
-# Version 2 license, then the option applies only if the new code is
-# made subject to such option by the copyright holder.
-#
-# Contributor(s):
+# 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.
+# 
 #display name of the module category
 OpenIDE-Module-Display-Category=Notifications
 #name of the module