Merge pull request eclipse#148 from keilw/master

Update copyright in a few more files missed
Emily-Jiang · Feb 7, 2017 · 43c22a8 · 43c22a8
2 parents b1e768d + 3a8e0e1
commit 43c22a8
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 212 deletions.
diff --git a/docs/pom.xml b/docs/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2016 Microprofile.io
+  ~ Copyright(c) 2016-2017 IBM, Red Hat, and others.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

diff --git a/pom.xml b/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2016 Microprofile.io
+  ~ Copyright(c) 2016-2017 IBM, Red Hat, and others.
   ~
   ~ 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
-  ~
+  ~      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.
@@ -30,8 +28,8 @@
     <url>https://github.com/microprofile/microprofile-conference</url>
     <inceptionYear>2016</inceptionYear>
     <organization>
-        <name>Microprofile.io</name>
-        <url>http://www.microprofile.io</url>
+        <name>Eclipse Foundation</name>
+        <url>http://www.eclipse.org</url>
     </organization>
 
     <licenses>

diff --git a/web-application/.gitignore b/web-application/.gitignore
@@ -0,0 +1 @@
+/.tern-project
diff --git a/web-application/LICENSE b/web-application/LICENSE
diff --git a/web-application/src/main/static/gulpfile.js b/web-application/src/main/static/gulpfile.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Microprofile.io
+ * Copyright(c) 2016-2017 IBM, Red Hat, and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/web-application/src/main/static/karma.conf.js b/web-application/src/main/static/karma.conf.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Microprofile.io
+ * Copyright(c) 2016-2017 IBM, Red Hat, and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/web-application/src/main/static/systemjs.config.js b/web-application/src/main/static/systemjs.config.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Microprofile.io
+ * Copyright(c) 2016-2017 IBM, Red Hat, and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/web-application/src/test/local/java/io/microprofile/showcase/web/EndpointServiceTest.java b/web-application/src/test/local/java/io/microprofile/showcase/web/EndpointServiceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Microprofile.io
+ * Copyright(c) 2016-2017 IBM, Red Hat, and others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.