You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/10/08 16:08:44 UTC
[1/3] incubator-netbeans git commit: [NETBEANS-54] Module Review
j2ee.metadata
Repository: incubator-netbeans
Updated Branches:
refs/heads/master 48413082a -> 4548dd89f
[NETBEANS-54] Module Review j2ee.metadata
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/7935ee11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/7935ee11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/7935ee11
Branch: refs/heads/master
Commit: 7935ee11d1cfdb2efd3fefd72a63089455c6127c
Parents: b2fde45
Author: Josh Juneau <ju...@gmail.com>
Authored: Sun Oct 8 09:54:01 2017 -0500
Committer: Josh Juneau <ju...@gmail.com>
Committed: Sun Oct 8 09:54:01 2017 -0500
----------------------------------------------------------------------
j2ee.metadata/apichanges.xml | 61 ++++++--------------
.../JavaApplication1/nbproject/project.xml | 20 +++++++
2 files changed, 38 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/7935ee11/j2ee.metadata/apichanges.xml
----------------------------------------------------------------------
diff --git a/j2ee.metadata/apichanges.xml b/j2ee.metadata/apichanges.xml
index 4d7fe67..db75436 100644
--- a/j2ee.metadata/apichanges.xml
+++ b/j2ee.metadata/apichanges.xml
@@ -1,48 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Search for CHANGEME in this document when copying and using it: -->
<!--
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-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.
+
+ 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.
+
-->
<?xml-stylesheet type="text/xml" href="CHANGEME/nbbuild/javadoctools/apichanges.xsl"?>
<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../nbbuild/javadoctools/apichanges.dtd">
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/7935ee11/j2ee.metadata/test/unit/data/projects/JavaApplication1/nbproject/project.xml
----------------------------------------------------------------------
diff --git a/j2ee.metadata/test/unit/data/projects/JavaApplication1/nbproject/project.xml b/j2ee.metadata/test/unit/data/projects/JavaApplication1/nbproject/project.xml
index f3875b6..08218ab 100644
--- a/j2ee.metadata/test/unit/data/projects/JavaApplication1/nbproject/project.xml
+++ b/j2ee.metadata/test/unit/data/projects/JavaApplication1/nbproject/project.xml
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+
+-->
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
[3/3] incubator-netbeans git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-netbeans
Posted by ma...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-netbeans
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/4548dd89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/4548dd89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/4548dd89
Branch: refs/heads/master
Commit: 4548dd89fb9cbbcd5c59742f207c76f294a0270f
Parents: 36c2e4b 4841308
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 8 18:07:41 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 8 18:07:41 2017 +0200
----------------------------------------------------------------------
.../external/antlr-runtime-4.5.3-license.txt | 37 --------------------
.../external/antlr4-runtime-4.5.3-license.txt | 37 ++++++++++++++++++++
.../nbproject/project.properties | 4 +--
libs.antlr4.runtime/nbproject/project.xml | 4 +--
nbbuild/build.xml | 3 ++
5 files changed, 44 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-netbeans git commit: Merge branch 'pr/98'
Posted by ma...@apache.org.
Merge branch 'pr/98'
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/36c2e4bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/36c2e4bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/36c2e4bf
Branch: refs/heads/master
Commit: 36c2e4bf49e185644e6cae25978ac2c9556c9a6f
Parents: 50b698b 7935ee1
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 8 18:07:36 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 8 18:07:36 2017 +0200
----------------------------------------------------------------------
j2ee.metadata/apichanges.xml | 1 -
.../JavaApplication1/nbproject/project.xml | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------