Merge pull request #2 from callums/master

cal-smith · GitHub Enterprise · commit 011a0f4f4308 · 2018-08-08T11:07:03.000-04:00
update license
diff --git a/gulpfile.js b/gulpfile.js
@@ -34,12 +34,19 @@ const licenseTemplate = `/*!
  *
  * Neutrino v@PACKAGE_VERSION@ | @FILE_NAME@
  *
- * Licensed Materials - Property of IBM
+ * Copyright 2014, @THIS_YEAR@ IBM
  *
- * © Copyright IBM Corporation 2014, @THIS_YEAR@
- * U.S. Government Users Restricted Rights: Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
+ * Licensed 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.
  */
 \n
 `;
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "type": "git",
     "url": "git@github.ibm.com:peretz/next.git"
   },
-  "license": "SEE LICENSE IN LICENSE",
+  "license": "Apache-2",
   "author": "IBM",
   "peerDependencies": {
     "@angular/animations": "^6.1.0",

Original file line number	Diff line number	Diff line change
@@ -34,12 +34,19 @@ const licenseTemplate = `/*!
`34`	`34`	`*`
`35`	`35`	`* Neutrino v@PACKAGE_VERSION@ \| @FILE_NAME@`
`36`	`36`	`*`
`37`		`- * Licensed Materials - Property of IBM`
	`37`	`+ * Copyright 2014, @THIS_YEAR@ IBM`
`38`	`38`	`*`
`39`		`- * © Copyright IBM Corporation 2014, @THIS_YEAR@`
`40`		`- * U.S. Government Users Restricted Rights: Use, duplication or disclosure`
`41`		`- * restricted by GSA ADP Schedule Contract with IBM Corp.`
	`39`	`+ * Licensed under the Apache License, Version 2.0 (the "License");`
	`40`	`+ * you may not use this file except in compliance with the License.`
	`41`	`+ * You may obtain a copy of the License at`
`42`	`42`	`*`
	`43`	`+ * http://www.apache.org/licenses/LICENSE-2.0`
	`44`	`+`
	`45`	`+ * Unless required by applicable law or agreed to in writing, software`
	`46`	`+ * distributed under the License is distributed on an "AS IS" BASIS,`
	`47`	`+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.`
	`48`	`+ * See the License for the specific language governing permissions and`
	`49`	`+ * limitations under the License.`
`43`	`50`	`*/`
`44`	`51`	`\n`
`45`	`52`	`;