This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch v2.1
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/v2.1 by this push:
new 3f640cb DLAB-000 updated notice and licence files
3f640cb is described below
commit 3f640cbf6ff25b0e2a9c89d1ebd2f899f2a564f8
Author: bhliva <[email protected]>
AuthorDate: Wed Feb 27 15:21:54 2019 +0200
DLAB-000 updated notice and licence files
---
LICENSE | 50 +++++++++++++++++--
NOTICE | 58 +---------------------
.../com/epam/dlab/mongo/ResourceItemListTest.java | 35 ++++++-------
3 files changed, 65 insertions(+), 78 deletions(-)
diff --git a/LICENSE b/LICENSE
index 2561c5b..83162ee 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,5 @@
- Apache License
+
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -178,7 +179,7 @@
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "{}"
+ boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
@@ -186,8 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
-
- Copyright (c) 2016, EPAM SYSTEMS INC
+ Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -199,4 +199,44 @@
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.
\ No newline at end of file
+ limitations under the License.
+
+
+
+Dlab Subcomponents:
+
+Dlab project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+========================================================================
+MIT licenses
+========================================================================
+
+The following components are provided under the MIT License. See project link
for details.
+
+(MIT License) Mockito (https://github.com/mockito/mockito)
+(MIT License) SLF4J (http://www.slf4j.org/)
+
+========================================================================
+Apache 2.0 licenses
+========================================================================
+
+The following components are provided under the Apache 2.0 License. See
project link for details.
+
+(Apache 2.0 License) MongoDB Java Driver - org.mongodb:mongo-java-driver
(http://mongodb.github.io/mongo-java-driver/3.2/driver)
+(Apache 2.0 License) Dropwizard (https://github.com/dropwizard/dropwizard)
+(Apache 2.0 License) Dropwizard Template Config
(https://github.com/tkrille/dropwizard-template-config)
+(Apache 2.0 License) directory server
(https://github.com/apache/directory-server)
+(Apache 2.0 License) jackson (https://github.com/FasterXML/jackson)
+(Apache 2.0 License) aws java sdk (https://github.com/aws/aws-sdk-java)
+(Apache 2.0 License) boto3 (https://github.com/boto/boto3)
+
+========================================================================
+PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 licenses
+========================================================================
+
+The following components are provided under the PYTHON SOFTWARE FOUNDATION
LICENSE VERSION 2 License. See project link for details.
+
+(PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2) jython
(https://github.com/jythontools/jython)
\ No newline at end of file
diff --git a/NOTICE b/NOTICE
index 5dca626..8458c9f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,59 +1,5 @@
-Apache DLab
+Apache DLab (incubating)
Copyright 2018-2019 The Apache Software Foundation
This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-=======================================================================
-Dlab Subcomponents:
-
-Dlab project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
-
-========================================================================
-MIT licenses
-========================================================================
-
-The following components are provided under the MIT License. See project link
for details.
-
-(MIT License) angular2-app (https://www.npmjs.com/package/angular2-app)
-(MIT License) angular2-seed (https://www.npmjs.com/package/angular2-seed)
-(MIT License) angular2-seed-advanced
(https://www.npmjs.org/package/angular2-seed-advanced)
-(MIT License) angular2-seed-n3UX
(https://www.npmjs.com/package/angular2-seed-n3UX)
-(MIT License) http-status-enum (https://www.npmjs.com/package/http-status-enum)
-(MIT License) Mockito (https://github.com/mockito/mockito)
-(MIT License) ng2-translate (https://www.npmjs.com/package/ng2-translate)
-(MIT License) SLF4J (http://www.slf4j.org/)
-
-========================================================================
-Apache 2.0 licenses
-========================================================================
-
-The following components are provided under the Apache 2.0 License. See
project link for details.
-
-(Apache 2.0 License) MongoDB Java Driver - org.mongodb:mongo-java-driver
(http://mongodb.github.io/mongo-java-driver/3.2/driver)
-(Apache 2.0 License) Dropwizard (https://github.com/dropwizard/dropwizard)
-(Apache 2.0 License) Dropwizard Template Config
(https://github.com/tkrille/dropwizard-template-config)
-(Apache 2.0 License) directory server
(https://github.com/apache/directory-server)
-(Apache 2.0 License) jackson (https://github.com/FasterXML/jackson)
-(Apache 2.0 License) aws java sdk (https://github.com/aws/aws-sdk-java)
-(Apache 2.0 License) boto3 (https://github.com/boto/boto3)
-
-========================================================================
-CCDL licenses
-========================================================================
-
-The following components are provided under the CCDL License. See project link
for details.
-
-(CCDL 1.1) Jersey (https://github.com/jersey/jersey)
-
-
-========================================================================
-PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 licenses
-========================================================================
-
-The following components are provided under the PYTHON SOFTWARE FOUNDATION
LICENSE VERSION 2 License. See project link for details.
-
-(PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2) jython
(https://github.com/jythontools/jython)
\ No newline at end of file
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git
a/services/billing-aws/src/test/java/com/epam/dlab/mongo/ResourceItemListTest.java
b/services/billing-aws/src/test/java/com/epam/dlab/mongo/ResourceItemListTest.java
index af7f5ca..28769bd 100644
---
a/services/billing-aws/src/test/java/com/epam/dlab/mongo/ResourceItemListTest.java
+++
b/services/billing-aws/src/test/java/com/epam/dlab/mongo/ResourceItemListTest.java
@@ -1,20 +1,21 @@
-/***************************************************************************
-
-Copyright (c) 2016, EPAM SYSTEMS INC
-
-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.
-
-****************************************************************************/
+/*
+ * 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 com.epam.dlab.mongo;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
