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/11/23 19:14:15 UTC
[incubator-netbeans] branch master updated (b5aaf27 -> b5989e0)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git.
from b5aaf27 Merge pull request #264 from junichi11/travis-script-for-checking-line-endings
add 622fc96 [NETBEANS-54] excluding specific files, e.g., licenses via Rat
add 797d379 Merge branch 'master' into netbeans-54-review-rat.exceptions
new 2a5265e [NETBEANS-54] Add ALv2 license header to VERSION.txt
new b5989e0 Merge branch 'pr271-followup'
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
apisupport.kit/release/VERSION.txt | 16 ++++++++++++++++
core.kit/release/VERSION.txt | 2 +-
java.kit/release/VERSION.txt | 16 ++++++++++++++++
javafx2.kit/release/VERSION.txt | 16 ++++++++++++++++
nbbuild/build.xml | 7 ++++---
o.apache.tools.ant.module/release/VERSION.txt | 16 ++++++++++++++++
profiler/release/VERSION.txt | 16 ++++++++++++++++
websvc.saas.kit/release/VERSION.txt | 16 ++++++++++++++++
8 files changed, 101 insertions(+), 4 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@netbeans.apache.org" <co...@netbeans.apache.org>'].
[incubator-netbeans] 02/02: Merge branch 'pr271-followup'
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit b5989e0f9702652a5a31ceb412eee1e23f04affc
Merge: b5aaf27 2a5265e
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Thu Nov 23 20:12:02 2017 +0100
Merge branch 'pr271-followup'
This closes #271
apisupport.kit/release/VERSION.txt | 16 ++++++++++++++++
core.kit/release/VERSION.txt | 2 +-
java.kit/release/VERSION.txt | 16 ++++++++++++++++
javafx2.kit/release/VERSION.txt | 16 ++++++++++++++++
nbbuild/build.xml | 7 ++++---
o.apache.tools.ant.module/release/VERSION.txt | 16 ++++++++++++++++
profiler/release/VERSION.txt | 16 ++++++++++++++++
websvc.saas.kit/release/VERSION.txt | 16 ++++++++++++++++
8 files changed, 101 insertions(+), 4 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.
[incubator-netbeans] 01/02: [NETBEANS-54] Add ALv2 license header
to VERSION.txt
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit 2a5265e4fd9ea92f2fb5b1445310b6e51de6866a
Author: Matthias Bläsing <mb...@doppel-helix.eu>
AuthorDate: Sun Nov 19 21:46:05 2017 +0100
[NETBEANS-54] Add ALv2 license header to VERSION.txt
---
apisupport.kit/release/VERSION.txt | 16 ++++++++++++++++
core.kit/release/VERSION.txt | 2 +-
java.kit/release/VERSION.txt | 16 ++++++++++++++++
javafx2.kit/release/VERSION.txt | 16 ++++++++++++++++
nbbuild/build.xml | 5 -----
o.apache.tools.ant.module/release/VERSION.txt | 16 ++++++++++++++++
profiler/release/VERSION.txt | 16 ++++++++++++++++
websvc.saas.kit/release/VERSION.txt | 16 ++++++++++++++++
8 files changed, 97 insertions(+), 6 deletions(-)
diff --git a/apisupport.kit/release/VERSION.txt b/apisupport.kit/release/VERSION.txt
index 20a6c24..e3b4eab 100644
--- a/apisupport.kit/release/VERSION.txt
+++ b/apisupport.kit/release/VERSION.txt
@@ -1,2 +1,18 @@
+# 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.
+#
# cluster incompatible release version
11
diff --git a/core.kit/release/VERSION.txt b/core.kit/release/VERSION.txt
index 949905c..c207cbe 100644
--- a/core.kit/release/VERSION.txt
+++ b/core.kit/release/VERSION.txt
@@ -13,6 +13,6 @@
# 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.
-
+#
# cluster incompatible release version
22
diff --git a/java.kit/release/VERSION.txt b/java.kit/release/VERSION.txt
index f792293..36a98b4 100644
--- a/java.kit/release/VERSION.txt
+++ b/java.kit/release/VERSION.txt
@@ -1,2 +1,18 @@
+# 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.
+#
# cluster incompatible release version
13
diff --git a/javafx2.kit/release/VERSION.txt b/javafx2.kit/release/VERSION.txt
index 20a6c24..e3b4eab 100644
--- a/javafx2.kit/release/VERSION.txt
+++ b/javafx2.kit/release/VERSION.txt
@@ -1,2 +1,18 @@
+# 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.
+#
# cluster incompatible release version
11
diff --git a/nbbuild/build.xml b/nbbuild/build.xml
index 1d7f742..e8d4de9 100644
--- a/nbbuild/build.xml
+++ b/nbbuild/build.xml
@@ -2097,12 +2097,10 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/vmo/gen/CommandLine.tokens" /> <!--generated by ANTLR-->
<exclude name="java.editor/src/org/netbeans/modules/java/editor/resources/JavaExample" /> <!--no degree of creativity-->
<exclude name="java.j2semodule/src/org/netbeans/modules/java/j2semodule/ui/resources/module-info.java.template" /> <!--template file-->
- <exclude name="java.kit/release/VERSION.txt" /> <!--generated file-->
<exclude name="java.platform.ui/src/org/netbeans/modules/java/platform/resources/templates/javaplatform.xml" /> <!--template file-->
<exclude name="java.project.ui/src/org/netbeans/modules/java/project/ui/resources/*.template" /> <!-- template files -->
<exclude name="java.source/test-excludes.txt" /> <!-- test context -->
<exclude name="java.source/src/org/netbeans/modules/**/*.template" /> <!-- template files -->
- <exclude name="javafx2.kit/release/VERSION.txt" /> <!--generated file-->
<exclude name="javafx2.project/src/org/netbeans/modules/javafx2/project/templates/**" /> <!--license would be visible when users edit the templates inside their IDE-->
<exclude name="javawebstart/AntTasks/build/**" /> <!-- generated build files -->
<exclude name="jellytools.platform/src/org/netbeans/jellytools/version_info" /> <!--does not natively support comments-->
@@ -2124,7 +2122,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="nbbuild/standard-nbm-license.txt" /> <!--license file-->
<exclude name="nbbuild/testuserdir/**" />
<exclude name="nbi/engine/nbproject/profiler-build-impl.xml" /> <!--generated, no degree of creativity -->
- <exclude name="o.apache.tools.ant.module/release/VERSION.txt" /> <!--generated file-->
<exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/CustomTask_java" /> <!-- user visible file template -->
<exclude name="o.apache.tools.ant.module/src/org/apache/tools/ant/module/resources/Project.xml_" /> <!-- user visible file template -->
<exclude name="o.n.bootstrap/readme/*.txt" /> <!--READMEs-->
@@ -2144,7 +2141,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="options.editor/src/org/netbeans/modules/options/colors/AllLanguagesExample" /> <!--no degree of creativitya-->
<exclude name="options.editor/src/org/netbeans/modules/options/colors/HighlightingExample" /> <!--no degree of creativitya-->
<exclude name="options.editor/src/org/netbeans/modules/options/indentation/indentationExample" /> <!--no degree of creativitya-->
- <exclude name="profiler/release/VERSION.txt" /> <!--generated file-->
<exclude name="projectui/src/org/netbeans/modules/project/ui/resources/*-license.txt" /> <!--licenses-->
<exclude name="projectui/src/org/netbeans/modules/project/ui/resources/license-default.txt" /> <!--licenses-->
<exclude name="projectuiapi/test/unit/src/org/netbeans/modules/project/uiapi/data/*.txt" /> <!--test data-->
@@ -2161,7 +2157,6 @@ It is possible to use -Ddebug.port=3234 -Ddebug.pause=y to start the system in d
<exclude name="websvc.saas.api/src/org/netbeans/modules/websvc/saas/oauth/*.template" /> <!--template files-->
<exclude name="websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/model/application.wadl" /> <!--test data-->
<exclude name="websvc.saas.api/test/unit/src/org/netbeans/modules/websvc/saas/util/rootGroup.xml" /> <!--test data-->
- <exclude name="websvc.saas.kit/release/VERSION.txt" /> <!--generated file-->
<exclude name="welcome/src/org/netbeans/modules/welcome/resources/rss-0_91.dtd" /> <!-- specifies a standard -->
<exclude name="xml.axi/test/unit/src/org/netbeans/modules/xml/axi/resources/**" /> <!-- test data -->
<exclude name="xml.lexer/test/unit/src/org/netbeans/api/xml/lexer/resources/*.dtd" /> <!-- test data -->
diff --git a/o.apache.tools.ant.module/release/VERSION.txt b/o.apache.tools.ant.module/release/VERSION.txt
index 7d68470..d31f70e 100644
--- a/o.apache.tools.ant.module/release/VERSION.txt
+++ b/o.apache.tools.ant.module/release/VERSION.txt
@@ -1,2 +1,18 @@
+# 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.
+#
# cluster incompatible release version
5
diff --git a/profiler/release/VERSION.txt b/profiler/release/VERSION.txt
index f792293..36a98b4 100644
--- a/profiler/release/VERSION.txt
+++ b/profiler/release/VERSION.txt
@@ -1,2 +1,18 @@
+# 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.
+#
# cluster incompatible release version
13
diff --git a/websvc.saas.kit/release/VERSION.txt b/websvc.saas.kit/release/VERSION.txt
index 20a6c24..e3b4eab 100644
--- a/websvc.saas.kit/release/VERSION.txt
+++ b/websvc.saas.kit/release/VERSION.txt
@@ -1,2 +1,18 @@
+# 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.
+#
# cluster incompatible release version
11
--
To stop receiving notification emails like this one, please contact
"commits@netbeans.apache.org" <co...@netbeans.apache.org>.