Repository: incubator-netbeans Updated Branches: refs/heads/master 5d77508b6 -> 6a9bec569
[NETBEANS-54] Module Review css.prep Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/6a9bec56 Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/6a9bec56 Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/6a9bec56 Branch: refs/heads/master Commit: 6a9bec569eba1665d089ecd592847993905fb695 Parents: 5d77508 Author: tomazst <[email protected]> Authored: Sun Oct 15 12:16:20 2017 +0200 Committer: Emilian Bold <[email protected]> Committed: Sun Oct 15 13:16:20 2017 +0300 ---------------------------------------------------------------------- .../modules/css/prep/ui/resources/style.less | 47 ++++++-------------- .../modules/css/prep/ui/resources/style.scss | 47 ++++++-------------- nbbuild/build.xml | 4 ++ 3 files changed, 32 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a9bec56/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.less ---------------------------------------------------------------------- diff --git a/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.less b/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.less index d1233f5..72d73af 100644 --- a/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.less +++ b/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.less @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 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]" + 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. -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): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = ""> http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a9bec56/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.scss ---------------------------------------------------------------------- diff --git a/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.scss b/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.scss index d1233f5..72d73af 100644 --- a/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.scss +++ b/css.prep/src/org/netbeans/modules/css/prep/ui/resources/style.scss @@ -1,41 +1,22 @@ <#-- -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. -Copyright (c) 2016 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]" + 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. -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): --> <#assign licenseFirst = "/*"> <#assign licensePrefix = ""> http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/6a9bec56/nbbuild/build.xml ---------------------------------------------------------------------- diff --git a/nbbuild/build.xml b/nbbuild/build.xml index e351125..6a20ea7 100644 --- a/nbbuild/build.xml +++ b/nbbuild/build.xml @@ -2038,6 +2038,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d <exclude name="mercurial/src/org/netbeans/modules/mercurial/util/log*" /> <!-- user templates for mercurial commits, etc. --> <exclude name="mercurial/test/qa-functional/data/files/**"/> <!-- qa test data --> <exclude name="mercurial/test/unit/data/**" /> <!-- unit test data --> + <exclude name="css.prep/test/qa-functional/data/css_prep/public_html/**" /> <!--simple files for testing--> + <exclude name="css.prep/test/unit/data/testFiles/test.less" /> <!--simple file forss testing--> + <exclude name="css.prep/test/unit/data/testFiles/testIssue227676.scss" /> <!--simple file for testing--> + <exclude name="css.prep/test/unit/data/testProject/public_html/*" /> <!--simple files for testing--> </patternset> <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportfile="build/rat-report.txt"> <rat:substringMatcher licenseFamilyCategory="w3c2" licenseFamilyName="W3C Software and Document Notice and License">
