You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ju...@apache.org on 2018/08/29 23:21:43 UTC
[incubator-netbeans] branch master updated: [NETBEANS-1074] Module
Review javascript.karma (#749)
This is an automated email from the ASF dual-hosted git repository.
junichi11 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 6a5e347 [NETBEANS-1074] Module Review javascript.karma (#749)
6a5e347 is described below
commit 6a5e347fac2acf11211e9ef67e491cd84b0f4850
Author: Junichi Yamamoto <ju...@gmail.com>
AuthorDate: Thu Aug 30 08:21:40 2018 +0900
[NETBEANS-1074] Module Review javascript.karma (#749)
- karma.conf.js is a template file
- package.json does not support comments
- Fix values(email, license, url) of the package.json
---
javascript.karma/licenseinfo.xml | 36 ++++++++++++++++++++++
.../karma/karma-netbeans-reporter/package.json | 6 ++--
2 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/javascript.karma/licenseinfo.xml b/javascript.karma/licenseinfo.xml
new file mode 100644
index 0000000..a5d114e
--- /dev/null
+++ b/javascript.karma/licenseinfo.xml
@@ -0,0 +1,36 @@
+<?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.
+
+-->
+<licenseinfo>
+ <fileset>
+ <file>src/org/netbeans/modules/javascript/karma/ui/resources/karma.conf.js</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="TEMPLATE_MINIMAL_IP" />
+ </fileset>
+ <fileset>
+ <file>release/karma/karma-netbeans-reporter/package.json</file>
+ <file>src/org/netbeans/modules/javascript/karma/ui/resources/karma.png</file>
+ <file>src/org/netbeans/modules/javascript/karma/ui/resources/running.png</file>
+ <file>src/org/netbeans/modules/javascript/karma/ui/resources/waiting.png</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
+</licenseinfo>
diff --git a/javascript.karma/release/karma/karma-netbeans-reporter/package.json b/javascript.karma/release/karma/karma-netbeans-reporter/package.json
index b148d44..d85ae72 100644
--- a/javascript.karma/release/karma/karma-netbeans-reporter/package.json
+++ b/javascript.karma/release/karma/karma-netbeans-reporter/package.json
@@ -6,15 +6,15 @@
"main": "index.js",
"author": {
"name": "Tomas Mysik",
- "email": "tomas.mysik@oracle.com"
+ "email": "tmysik@apache.org"
},
"dependencies": {
},
"peerDependencies": {
"karma": ">=0.10"
},
- "license": "CDDL-GPL-2-CP",
+ "license": "Apache-2.0",
"bugs": {
- "url": "https://netbeans.org/community/issues.html"
+ "url": "https://issues.apache.org/jira/projects/NETBEANS/issues"
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists