Repository: incubator-netbeans Updated Branches: refs/heads/master 55d6e787c -> d1706383b
[NETBEANS-54] Module Review libs.json_simple [NETBEANS-54] Module Review maven Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/d1706383 Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/d1706383 Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/d1706383 Branch: refs/heads/master Commit: d1706383b5ef68174e9dc50c363ae06997559717 Parents: 55d6e78 Author: rick jones <[email protected]> Authored: Sun Oct 8 15:26:11 2017 -0400 Committer: Emilian Bold <[email protected]> Committed: Sun Oct 8 22:26:11 2017 +0300 ---------------------------------------------------------------------- .../netbeans/libs/json_simple/Bundle.properties | 54 +++++--------------- .../simplewizard/SimpleWizard.archetype | 17 ++++++ .../newproject/simplewizard/SimpleWizard.html | 21 ++++++++ 3 files changed, 52 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d1706383/libs.json_simple/src/org/netbeans/libs/json_simple/Bundle.properties ---------------------------------------------------------------------- diff --git a/libs.json_simple/src/org/netbeans/libs/json_simple/Bundle.properties b/libs.json_simple/src/org/netbeans/libs/json_simple/Bundle.properties index 96e10ae..bc949cb 100644 --- a/libs.json_simple/src/org/netbeans/libs/json_simple/Bundle.properties +++ b/libs.json_simple/src/org/netbeans/libs/json_simple/Bundle.properties @@ -1,44 +1,18 @@ -# 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 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): -# -# The Original Software is NetBeans. The Initial Developer of the Original -# Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 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. -# Sample ResourceBundle properties file +# 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. OpenIDE-Module-Name=JSON Simple Library http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d1706383/maven/test/unit/src/org/netbeans/modules/maven/newproject/simplewizard/SimpleWizard.archetype ---------------------------------------------------------------------- diff --git a/maven/test/unit/src/org/netbeans/modules/maven/newproject/simplewizard/SimpleWizard.archetype b/maven/test/unit/src/org/netbeans/modules/maven/newproject/simplewizard/SimpleWizard.archetype index 69617df..1755524 100644 --- a/maven/test/unit/src/org/netbeans/modules/maven/newproject/simplewizard/SimpleWizard.archetype +++ b/maven/test/unit/src/org/netbeans/modules/maven/newproject/simplewizard/SimpleWizard.archetype @@ -1,3 +1,20 @@ +# 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# 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. + archetypeGroupId=org.codehaus.mojo.archetypes archetypeArtifactId=javafx archetypeVersion=0.6 http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/d1706383/maven/test/unit/src/org/netbeans/modules/maven/newproject/simplewizard/SimpleWizard.html ---------------------------------------------------------------------- diff --git a/maven/test/unit/src/org/netbeans/modules/maven/newproject/simplewizard/SimpleWizard.html b/maven/test/unit/src/org/netbeans/modules/maven/newproject/simplewizard/SimpleWizard.html index da9e054..bbe79e2 100644 --- a/maven/test/unit/src/org/netbeans/modules/maven/newproject/simplewizard/SimpleWizard.html +++ b/maven/test/unit/src/org/netbeans/modules/maven/newproject/simplewizard/SimpleWizard.html @@ -1,3 +1,24 @@ +<!-- + + 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 + + http://www.apache.org/licenses/LICENSE-2.0 + + 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. + +--> + <html> <head> <title>SimpleWizard</title>
