diff options
| author |   Lusheng Ji <lji@research.att.com> | 2017-08-29 14:25:51 +0000 |
|---|---|---|
| committer |   Vijay <vv770d@att.com> | 2017-09-07 18:04:53 +0000 |
| commit | 3b9a0eb4dad201fe60c4792a450ef36d00b44093 (patch) | |
| tree | d945df199d513e9758d0e6096dec7a6feb9cf3d7 | |
| parent | 64dd2f365ce28e8254ba8fa4407dc5d7f192dacf (diff) | |
Update .gitreview LICENSE.txt
Fix build error
Issue-Id: DCAEGEN2-86
Change-Id: Iba1f2e3f5c5674c3b6911d8b489493a6fb5d8427
Signed-off-by: Lusheng Ji <lji@research.att.com>
Signed-off-by: Vijay <vv770d@att.com>
| -rw-r--r-- | .gitreview | 4 | ||||
| -rw-r--r-- | LICENSE.txt | 60 | ||||
| -rw-r--r-- | pom.xml | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dcae/commonFunction/EventProcessor.java | 1 |
4 files changed, 46 insertions, 23 deletions
diff --git a/.gitreview b/.gitreview new file mode 100644 index 00000000..174c1101 --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=gerrit.onap.org +port=29418 +project=dcaegen2/collectors/ves.git diff --git a/LICENSE.txt b/LICENSE.txt index ae12da20..69d5fc1d 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,22 +1,40 @@ /* - * ============LICENSE_START========================================== - * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * 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. - * ============LICENSE_END============================================ - * - * ECOMP and OpenECOMP are trademarks - * and service marks of AT&T Intellectual Property. - * - */ +* ============LICENSE_START========================================== +* =================================================================== +* Copyright © 2017 AT&T Intellectual Property. All rights reserved. +* =================================================================== +* +* Unless otherwise specified, all software contained herein is licensed +* under the Apache License, Version 2.0 (the “License”); +* you may not use this software 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. +* +* +* +* Unless otherwise specified, all documentation contained herein is licensed +* under the Creative Commons License, Attribution 4.0 Intl. (the “License”); +* you may not use this documentation except in compliance with the License. +* You may obtain a copy of the License at +* +* https://creativecommons.org/licenses/by/4.0/ +* +* Unless required by applicable law or agreed to in writing, documentation +* 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. +* +* ============LICENSE_END============================================ +* +* ECOMP is a trademark and service mark of AT&T Intellectual Property. +* +*/ + @@ -87,14 +87,16 @@ <dependency> <groupId>com.att.nsa</groupId> <artifactId>nsaServerLibrary</artifactId> - <version>1.0.13</version> + <version>1.0.10</version> </dependency> +<!-- <dependency> <groupId>com.att.nsa</groupId> <artifactId>saToolkit</artifactId> <version>1.1.3</version> </dependency> +--> <dependency> <groupId>org.slf4j</groupId> diff --git a/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java b/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java index 4cdba066..1b912cf4 100644 --- a/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java +++ b/src/main/java/org/onap/dcae/commonFunction/EventProcessor.java @@ -124,7 +124,6 @@ public class EventProcessor implements Runnable { /* "event": { "commonEventHeader": { - . "internalHeaderFields": { "collectorTimeStamp": "Fri, 04 21 2017 04:11:52 GMT" }, |