This is an automated email from the ASF dual-hosted git repository.
emi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 0857365 [NETBEANS-54] Module Review html.lexer
0857365 is described below
commit 0857365c29a10afb5a39e5241ea79ca863f2636d
Author: Mike Duigou <[email protected]>
AuthorDate: Sat Oct 21 23:43:39 2017 -0700
[NETBEANS-54] Module Review html.lexer
---
.../org/netbeans/lib/html/lexer/HtmlElements.java | 55 ++++++----------------
nbbuild/build.xml | 1 +
2 files changed, 16 insertions(+), 40 deletions(-)
diff --git a/html.lexer/src/org/netbeans/lib/html/lexer/HtmlElements.java
b/html.lexer/src/org/netbeans/lib/html/lexer/HtmlElements.java
index 54a2ee8..d949c28 100644
--- a/html.lexer/src/org/netbeans/lib/html/lexer/HtmlElements.java
+++ b/html.lexer/src/org/netbeans/lib/html/lexer/HtmlElements.java
@@ -1,45 +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 1997-2010 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 private 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):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * 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.
+ * 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.lib.html.lexer;
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index ab30fc8..f12270d 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2050,6 +2050,7 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y
to start the system in d
<exclude
name="javafx2.editor/test/unit/data/goldenfiles/org/netbeans/modules/javafx2/editor/completion/impl/**/*.out*"
/>
<exclude name="javawebstart/AntTasks/build/**" /> <!-- generated
build files -->
<exclude name="projectimport.eclipse.core/test/unit/data/**" />
<!--test data-->
+ <exclude name="html.lexer/test/unit/data/testfiles/*" /> <!--test
data-->
<exclude name="o.apache.tools.ant.module/release/VERSION.txt" />
<!--generated file-->
<exclude name="o.apache.tools.ant.module/test/unit/data/**/*.xml"
/> <!--test data-->
<exclude
name="o.apache.tools.ant.module/test/unit/data/**/*.properties" /> <!--test
data-->
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
