Repository: incubator-netbeans Updated Branches: refs/heads/master 86940d361 -> 2293cbac3
[NETBEANS-54] Module Review javadoc Update license in AddTagFixTest.java. Exclude test file index-4.title from Rat. Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/2293cbac Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/2293cbac Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/2293cbac Branch: refs/heads/master Commit: 2293cbac358a74244438a15903c687ffc42fb170 Parents: 86940d3 Author: Tuyen Tran <[email protected]> Authored: Wed Oct 11 00:16:31 2017 +0700 Committer: Emilian Bold <[email protected]> Committed: Tue Oct 10 20:16:31 2017 +0300 ---------------------------------------------------------------------- .../modules/javadoc/hints/AddTagFixTest.java | 43 +++++++------------- nbbuild/build.xml | 1 + 2 files changed, 16 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/2293cbac/javadoc/test/unit/src/org/netbeans/modules/javadoc/hints/AddTagFixTest.java ---------------------------------------------------------------------- diff --git a/javadoc/test/unit/src/org/netbeans/modules/javadoc/hints/AddTagFixTest.java b/javadoc/test/unit/src/org/netbeans/modules/javadoc/hints/AddTagFixTest.java index 6add0bf..772ddc5 100644 --- a/javadoc/test/unit/src/org/netbeans/modules/javadoc/hints/AddTagFixTest.java +++ b/javadoc/test/unit/src/org/netbeans/modules/javadoc/hints/AddTagFixTest.java @@ -1,33 +1,20 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved. +/** + * 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 * - * Oracle and Java are registered trademarks of Oracle and/or its affiliates. - * Other names may be trademarks of their respective owners. + * http://www.apache.org/licenses/LICENSE-2.0 * - * 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]" - * - * Contributor(s): - * - * Portions Copyrighted 2007 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. */ package org.netbeans.modules.javadoc.hints; http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/2293cbac/nbbuild/build.xml ---------------------------------------------------------------------- diff --git a/nbbuild/build.xml b/nbbuild/build.xml index 9d979a6..bf9e11c 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -1967,6 +1967,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="diff/test/unit/data/**" /> <!--test data--> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/provider/*.txt" /> <!--test data--> <exclude name="diff/test/unit/src/org/netbeans/modules/diff/builtin/visualizer/data/**" /> <!--test data--> + <exclude name="javadoc/test/unit/data/docs_jdk14_ja/api/index-files/**" /> <!--test data--> <exclude name="javafx2.project/src/org/netbeans/modules/javafx2/project/templates/**" /> <!--license would be visible when users edit the templates inside their IDE--> <exclude name="utilities/test/unit/src/org/netbeans/modules/openfile/resources/recent_files/*" /> <!--test data--> <exclude name="**/*.url" /> <!--no degree of creativity-->
