You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ju...@apache.org on 2017/10/07 22:11:45 UTC

incubator-netbeans git commit: [NETBEANS-54] Module Review team.commons

Repository: incubator-netbeans
Updated Branches:
  refs/heads/master 5ac54419f -> cca0cde69


[NETBEANS-54] Module Review team.commons

- no external library
- checked Rat report: update the license header in package-info.java. ignore manifest.mf
- skimmed through the module, did not notice additional problems


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

Branch: refs/heads/master
Commit: cca0cde69c84abcc9b4200a13b442aa2862ada62
Parents: 5ac5441
Author: Junichi Yamamoto <ju...@apache.org>
Authored: Fri Oct 6 09:19:12 2017 +0900
Committer: Junichi Yamamoto <ju...@apache.org>
Committed: Sun Oct 8 07:08:17 2017 +0900

----------------------------------------------------------------------
 .../team/commons/resources/package-info.java    | 53 ++++++--------------
 1 file changed, 15 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/cca0cde6/team.commons/src/org/netbeans/modules/team/commons/resources/package-info.java
----------------------------------------------------------------------
diff --git a/team.commons/src/org/netbeans/modules/team/commons/resources/package-info.java b/team.commons/src/org/netbeans/modules/team/commons/resources/package-info.java
index 86b4784..e7f2d1a 100644
--- a/team.commons/src/org/netbeans/modules/team/commons/resources/package-info.java
+++ b/team.commons/src/org/netbeans/modules/team/commons/resources/package-info.java
@@ -1,43 +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 2013 Oracle and/or its affiliates. All rights reserved.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * Oracle and Team 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):
- *
- * Portions Copyrighted 2013 Sun Microsystems, Inc.
+ * 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.
  */
 
 @OptionsPanelController.ContainerRegistration(