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/15 17:49:04 UTC
[1/2] incubator-netbeans git commit: [NETBEANS-54] Added missing
license and included 2 exclusion rules for test data
Repository: incubator-netbeans
Updated Branches:
refs/heads/master 23556bb43 -> 7879b6166
[NETBEANS-54] Added missing license and included 2 exclusion rules for test data
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/7162e072
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/7162e072
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/7162e072
Branch: refs/heads/master
Commit: 7162e0722c58aef6e73bf71e48176d15d2b4759e
Parents: 23556bb
Author: John McDonnell <jo...@bearingpoint.com>
Authored: Wed Oct 11 16:01:19 2017 +0100
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 15 19:48:19 2017 +0200
----------------------------------------------------------------------
.../editor/actions/FieldsWithTypeParams.java | 19 ++++++++++++++++++-
nbbuild/build.xml | 2 ++
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/7162e072/javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/actions/FieldsWithTypeParams.java
----------------------------------------------------------------------
diff --git a/javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/actions/FieldsWithTypeParams.java b/javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/actions/FieldsWithTypeParams.java
index 5d67e7b..9239c3d 100644
--- a/javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/actions/FieldsWithTypeParams.java
+++ b/javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/actions/FieldsWithTypeParams.java
@@ -1,4 +1,21 @@
-
+/**
+ * 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.
+ */
package org.netbeans.modules.javafx2.editor.actions;
import java.util.HashMap;
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/7162e072/nbbuild/build.xml
----------------------------------------------------------------------
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index d3c8669..620a8cf 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2045,6 +2045,8 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="css.prep/test/unit/data/testProject/public_html/*" /> <!--simple files for testing-->
<exclude name="junit.ui/src/org/netbeans/modules/junit/ui/resources/*.template" /> <!--license would be visible when users edit the templates inside their IDE-->
<exclude name="java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLine.tokens" /> <!--generated by ANTLR-->
+ <exclude name="javafx2.editor/test/unit/data/org/netbeans/modules/javafx2/editor/**/*.fxml" />
+ <exclude name="javafx2.editor/test/unit/data/goldenfiles/org/netbeans/modules/javafx2/editor/completion/impl/**/*.out*" />
</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">
[2/2] incubator-netbeans git commit: Merge branch 'pr/125'
Posted by ma...@apache.org.
Merge branch 'pr/125'
This closes #125
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/7879b616
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/7879b616
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/7879b616
Branch: refs/heads/master
Commit: 7879b6166808817069f7e4e02af733b926487f33
Parents: 23556bb 7162e07
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 15 19:48:51 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 15 19:48:51 2017 +0200
----------------------------------------------------------------------
.../editor/actions/FieldsWithTypeParams.java | 19 ++++++++++++++++++-
nbbuild/build.xml | 2 ++
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------