diff options
183 files changed, 673 insertions, 578 deletions
diff --git a/champ-lib/License.txt b/champ-lib/License.txt index 469f362..41ce15f 100644 --- a/champ-lib/License.txt +++ b/champ-lib/License.txt @@ -1,8 +1,8 @@ ============LICENSE_START========================================== org.onap.aai =================================================================== -Copyright © 2017 AT&T Intellectual Property. All rights reserved. -Copyright © 2017 Amdocs +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs =================================================================== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,6 +16,5 @@ 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. diff --git a/champ-lib/champ-core/License.txt b/champ-lib/champ-core/License.txt index 469f362..41ce15f 100644 --- a/champ-lib/champ-core/License.txt +++ b/champ-lib/champ-core/License.txt @@ -1,8 +1,8 @@ ============LICENSE_START========================================== org.onap.aai =================================================================== -Copyright © 2017 AT&T Intellectual Property. All rights reserved. -Copyright © 2017 Amdocs +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs =================================================================== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,6 +16,5 @@ 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. diff --git a/champ-lib/champ-core/pom.xml b/champ-lib/champ-core/pom.xml index b52f408..840fc61 100644 --- a/champ-lib/champ-core/pom.xml +++ b/champ-lib/champ-core/pom.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="UTF-8"?> +<!-- +============LICENSE_START======================================================= +org.onap.aai +================================================================================ +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs +================================================================================ +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========================================================= +--> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -30,7 +50,7 @@ <version>${event.client.version}</version> </dependency> <!-- Event Bus Library - END --> - + <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy</artifactId> @@ -85,6 +105,14 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <!-- + <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> <version>3.0</version> @@ -114,6 +142,7 @@ </execution> </executions> </plugin> + --> </plugins> </build> </project> diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampAPI.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampAPI.java index 719306f..845e2e3 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampAPI.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampAPI.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampCapabilities.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampCapabilities.java index b0c62cb..4c4513c 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampCapabilities.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampCapabilities.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampGraph.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampGraph.java index 74c1cf8..8164b41 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampGraph.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampGraph.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampTransaction.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampTransaction.java index 5dab092..0de027d 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampTransaction.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ChampTransaction.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/FormatMapper.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/FormatMapper.java index 6d4db09..75542fa 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/FormatMapper.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/FormatMapper.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/Formatter.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/Formatter.java index a6292f3..e85b672 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/Formatter.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/Formatter.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/NoOpTinkerPopTransaction.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/NoOpTinkerPopTransaction.java index 208b2d1..22a3f9b 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/NoOpTinkerPopTransaction.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/NoOpTinkerPopTransaction.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/event/AbstractLoggingChampGraph.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/event/AbstractLoggingChampGraph.java index 79a7f3c..07647d2 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/event/AbstractLoggingChampGraph.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/event/AbstractLoggingChampGraph.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.event; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/event/ChampEvent.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/event/ChampEvent.java index 46f1b61..3fd57a3 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/event/ChampEvent.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/event/ChampEvent.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.event; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampIndexNotExistsException.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampIndexNotExistsException.java index e969ce5..8d92f69 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampIndexNotExistsException.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampIndexNotExistsException.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.exceptions; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampMarshallingException.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampMarshallingException.java index 09ede7a..448f2fc 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampMarshallingException.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampMarshallingException.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.exceptions; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampObjectNotExistsException.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampObjectNotExistsException.java index cd63401..5635afa 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampObjectNotExistsException.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampObjectNotExistsException.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.exceptions; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampRelationshipNotExistsException.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampRelationshipNotExistsException.java index 4cdde58..8ed8af7 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampRelationshipNotExistsException.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampRelationshipNotExistsException.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.exceptions; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampSchemaViolationException.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampSchemaViolationException.java index b234bc4..31e37e2 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampSchemaViolationException.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampSchemaViolationException.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.exceptions; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampTransactionException.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampTransactionException.java index 17251b2..f868643 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampTransactionException.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampTransactionException.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.exceptions; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampUnmarshallingException.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampUnmarshallingException.java index b8383d8..474d2a0 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampUnmarshallingException.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/exceptions/ChampUnmarshallingException.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.exceptions; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/AbstractTinkerpopChampGraph.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/AbstractTinkerpopChampGraph.java index 9a45e91..f910b3c 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/AbstractTinkerpopChampGraph.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/AbstractTinkerpopChampGraph.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.graph.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/AbstractValidatingChampGraph.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/AbstractValidatingChampGraph.java index 4568bc3..3cfa12b 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/AbstractValidatingChampGraph.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/AbstractValidatingChampGraph.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.graph.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/ChampAPIImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/ChampAPIImpl.java index 607ba78..5a8b79e 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/ChampAPIImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/ChampAPIImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.graph.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/InMemoryChampGraphImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/InMemoryChampGraphImpl.java index 5773505..f9bc19c 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/InMemoryChampGraphImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/InMemoryChampGraphImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.graph.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/TinkerpopTransaction.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/TinkerpopTransaction.java index 6ffeab7..5db9cba 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/TinkerpopTransaction.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/TinkerpopTransaction.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.graph.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/Exporter.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/Exporter.java index ddea9ec..d5b9453 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/Exporter.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/Exporter.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.ie; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/GraphMLImporterExporter.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/GraphMLImporterExporter.java index 71292ce..a41f159 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/GraphMLImporterExporter.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/GraphMLImporterExporter.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.ie; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/Importer.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/Importer.java index 4fc22ba..6ceb20d 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/Importer.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/ie/Importer.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.ie; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampCardinality.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampCardinality.java index b1e72f7..e904c0a 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampCardinality.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampCardinality.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampConnectionConstraint.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampConnectionConstraint.java index af44857..c460a78 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampConnectionConstraint.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampConnectionConstraint.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampConnectionMultiplicity.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampConnectionMultiplicity.java index d2742fe..623010c 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampConnectionMultiplicity.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampConnectionMultiplicity.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampElement.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampElement.java index 4e938f5..38e6003 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampElement.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampElement.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampField.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampField.java index 92c3ea0..de05e4b 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampField.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampField.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampObject.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampObject.java index b4e7311..8463e64 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampObject.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampObject.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampObjectConstraint.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampObjectConstraint.java index 1a91c7a..c999e7c 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampObjectConstraint.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampObjectConstraint.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampObjectIndex.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampObjectIndex.java index c16844c..489e26d 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampObjectIndex.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampObjectIndex.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampPartition.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampPartition.java index 0292694..6dc0728 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampPartition.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampPartition.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampPropertyConstraint.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampPropertyConstraint.java index 6008d36..4db5f01 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampPropertyConstraint.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampPropertyConstraint.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationship.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationship.java index 2d7f033..6083d52 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationship.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationship.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationshipConstraint.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationshipConstraint.java index b571205..b8e8eef 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationshipConstraint.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationshipConstraint.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationshipIndex.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationshipIndex.java index 03310ba..763f649 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationshipIndex.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampRelationshipIndex.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampSchema.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampSchema.java index 81b97bd..b91b5da 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampSchema.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/ChampSchema.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/BuildStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/BuildStep.java index 6619b90..266ac1f 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/BuildStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/BuildStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/KeyStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/KeyStep.java index 0be4ac3..5100b49 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/KeyStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/KeyStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/PropertiesStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/PropertiesStep.java index bac8878..c4589ac 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/PropertiesStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/PropertiesStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/CreateObjectIndexable.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/CreateObjectIndexable.java index ccace48..f2a9c48 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/CreateObjectIndexable.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/CreateObjectIndexable.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.index; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/CreateRelationshipIndexable.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/CreateRelationshipIndexable.java index e40a86a..e73899b 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/CreateRelationshipIndexable.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/CreateRelationshipIndexable.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.index; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/ObjectIndexFieldStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/ObjectIndexFieldStep.java index 869cdd6..39ae589 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/ObjectIndexFieldStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/ObjectIndexFieldStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.index; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/ObjectIndexTypeStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/ObjectIndexTypeStep.java index fc8db8a..36c8fd5 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/ObjectIndexTypeStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/ObjectIndexTypeStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.index; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/RelationshipIndexFieldStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/RelationshipIndexFieldStep.java index babd59e..0c60daa 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/RelationshipIndexFieldStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/RelationshipIndexFieldStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.index; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/RelationshipIndexTypeStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/RelationshipIndexTypeStep.java index 094f872..77af17f 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/RelationshipIndexTypeStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/RelationshipIndexTypeStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.index; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/impl/CreateObjectIndexableImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/impl/CreateObjectIndexableImpl.java index 1e0eb1b..796fa1b 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/impl/CreateObjectIndexableImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/impl/CreateObjectIndexableImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.index.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/impl/CreateRelationshipIndexableImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/impl/CreateRelationshipIndexableImpl.java index 40d105e..7d31922 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/impl/CreateRelationshipIndexableImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/index/impl/CreateRelationshipIndexableImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.index.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/CreateChampObjectable.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/CreateChampObjectable.java index b062a09..7aaf19b 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/CreateChampObjectable.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/CreateChampObjectable.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.object; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/ObjectBuildOrPropertiesStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/ObjectBuildOrPropertiesStep.java index d982b81..63a02b8 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/ObjectBuildOrPropertiesStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/ObjectBuildOrPropertiesStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.object; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/ObjectBuildOrPropertiesStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/ObjectBuildOrPropertiesStepImpl.java index 7938346..b8517d5 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/ObjectBuildOrPropertiesStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/ObjectBuildOrPropertiesStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.object; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/ObjectKeyStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/ObjectKeyStepImpl.java index d05c84d..9596682 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/ObjectKeyStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/ObjectKeyStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.object; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/impl/CreateChampObjectableImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/impl/CreateChampObjectableImpl.java index 242c4c8..04b8d93 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/impl/CreateChampObjectableImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/object/impl/CreateChampObjectableImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.object.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/partition/CreateChampPartitionable.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/partition/CreateChampPartitionable.java index e65ca4f..57ed5f1 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/partition/CreateChampPartitionable.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/partition/CreateChampPartitionable.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.partition; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/partition/impl/CreateChampPartionableImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/partition/impl/CreateChampPartionableImpl.java index cfd284e..d21d27d 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/partition/impl/CreateChampPartionableImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/partition/impl/CreateChampPartionableImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.partition.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/CreateChampRelationshipable.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/CreateChampRelationshipable.java index bb89c21..e170d16 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/CreateChampRelationshipable.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/CreateChampRelationshipable.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/RelationshipBuildOrPropertiesStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/RelationshipBuildOrPropertiesStep.java index 44ee875..e32e014 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/RelationshipBuildOrPropertiesStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/RelationshipBuildOrPropertiesStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceBuildOrPropertiesStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceBuildOrPropertiesStep.java index 5e02fa6..2dad057 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceBuildOrPropertiesStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceBuildOrPropertiesStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceFromStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceFromStep.java index 18f1da6..4a1aa0d 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceFromStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceFromStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceKeyStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceKeyStep.java index 8e475e8..6dcf0c9 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceKeyStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceKeyStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceStep.java index 843cf4f..cad405b 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceTypeOrFromStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceTypeOrFromStep.java index 5ae8550..ed58f4f 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceTypeOrFromStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceTypeOrFromStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceTypeStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceTypeStep.java index bff8902..bf114c6 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceTypeStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/SourceTypeStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetBuildOrPropertiesStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetBuildOrPropertiesStep.java index 1a8ec49..a904083 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetBuildOrPropertiesStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetBuildOrPropertiesStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetFromStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetFromStep.java index cd1551c..7cd7672 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetFromStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetFromStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetKeyStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetKeyStep.java index a834edc..907f278 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetKeyStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetKeyStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetStep.java index 372d298..2b598a8 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetTypeOrFromStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetTypeOrFromStep.java index 1631d88..fdd32e9 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetTypeOrFromStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetTypeOrFromStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetTypeStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetTypeStep.java index 32f4f3d..7e21ca0 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetTypeStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/TargetTypeStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/ChampRelationshipKeyStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/ChampRelationshipKeyStepImpl.java index ebc194e..a972ace 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/ChampRelationshipKeyStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/ChampRelationshipKeyStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/CreateChampRelationshipableImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/CreateChampRelationshipableImpl.java index caf1763..0378427 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/CreateChampRelationshipableImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/CreateChampRelationshipableImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/RelationshipBuildOrPropertiesStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/RelationshipBuildOrPropertiesStepImpl.java index 74d0ffb..486f5a1 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/RelationshipBuildOrPropertiesStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/RelationshipBuildOrPropertiesStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceBuildOrPropertiesStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceBuildOrPropertiesStepImpl.java index 70d1deb..d509ab0 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceBuildOrPropertiesStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceBuildOrPropertiesStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceKeyStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceKeyStepImpl.java index d1a6184..c992644 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceKeyStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceKeyStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceStepImpl.java index 492264f..a21e3c0 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceTypeOrFromStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceTypeOrFromStepImpl.java index 6ba248f..dc46c38 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceTypeOrFromStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/SourceTypeOrFromStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetBuildOrPropertiesStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetBuildOrPropertiesStepImpl.java index 1407703..ad49322 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetBuildOrPropertiesStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetBuildOrPropertiesStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetKeyStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetKeyStepImpl.java index 36e49a6..758cb9a 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetKeyStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetKeyStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetStepImpl.java index 0721fca..0f3f41f 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetTypeOrFromStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetTypeOrFromStepImpl.java index 22d1d1d..4c837a6 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetTypeOrFromStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/relationship/impl/TargetTypeOrFromStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.relationship.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/CreateChampSchemable.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/CreateChampSchemable.java index 2e1b6d9..074f000 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/CreateChampSchemable.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/CreateChampSchemable.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintBuildStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintBuildStep.java index 57daae8..1853af4 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintBuildStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintBuildStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintFieldStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintFieldStep.java index 06fd723..c9b2a02 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintFieldStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintFieldStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintFieldTypeStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintFieldTypeStep.java index f17608e..8bed37f 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintFieldTypeStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintFieldTypeStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintPropertyStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintPropertyStep.java index 039e4d0..1965d89 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintPropertyStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintPropertyStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintRequiredOptionalStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintRequiredOptionalStep.java index 03353b5..71a0dfe 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintRequiredOptionalStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintRequiredOptionalStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintSubStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintSubStep.java index eb9973f..6e929cc 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintSubStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintSubStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintTypeStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintTypeStep.java index 9ac2f1d..fb6d3db 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintTypeStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/ObjectConstraintTypeStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintBuildStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintBuildStep.java index 669b829..d6666b2 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintBuildStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintBuildStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintFieldStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintFieldStep.java index 17a4bc6..cd8fea8 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintFieldStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintFieldStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintFieldTypeStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintFieldTypeStep.java index 42b6edf..4c4c4a5 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintFieldTypeStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintFieldTypeStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintMultiplicityStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintMultiplicityStep.java index 9b09a6c..7374dee 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintMultiplicityStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintMultiplicityStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintPropertyOptionalsStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintPropertyOptionalsStep.java index 372c53f..afb570e 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintPropertyOptionalsStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintPropertyOptionalsStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintRequiredOptionalStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintRequiredOptionalStep.java index e8fb941..abcf7d3 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintRequiredOptionalStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintRequiredOptionalStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintSourceStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintSourceStep.java index 0e7f62f..f402433 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintSourceStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintSourceStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintSubStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintSubStep.java index f27b2a4..d3c0531 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintSubStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintSubStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintTargetStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintTargetStep.java index b9ec7a2..6659cf5 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintTargetStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintTargetStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintTypeStep.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintTypeStep.java index f7a7c3f..b292193 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintTypeStep.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/RelationshipConstraintTypeStep.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/CreateChampSchemableImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/CreateChampSchemableImpl.java index 217b55d..eef7b7d 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/CreateChampSchemableImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/CreateChampSchemableImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintBuildStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintBuildStepImpl.java index 8933555..5c24221 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintBuildStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintBuildStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintFieldStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintFieldStepImpl.java index f149769..5193ea4 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintFieldStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintFieldStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintPropertyStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintPropertyStepImpl.java index c16d311..209e8e6 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintPropertyStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintPropertyStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintSubStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintSubStepImpl.java index 5cb13f3..dcb330c 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintSubStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/ObjectConstraintSubStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintBuildStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintBuildStepImpl.java index 906dd4e..b155b5e 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintBuildStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintBuildStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintPropertyOptionalsStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintPropertyOptionalsStepImpl.java index ba39d61..ad7863f 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintPropertyOptionalsStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintPropertyOptionalsStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintRequiredOptionalStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintRequiredOptionalStepImpl.java index 8a760d1..e9d3c6b 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintRequiredOptionalStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintRequiredOptionalStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintSubStepImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintSubStepImpl.java index 6df9cff..3fb74b5 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintSubStepImpl.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/model/fluent/schema/impl/RelationshipConstraintSubStepImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.model.fluent.schema.impl; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/schema/AlwaysValidChampSchemaEnforcer.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/schema/AlwaysValidChampSchemaEnforcer.java index 6aa62a4..76b7c9e 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/schema/AlwaysValidChampSchemaEnforcer.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/schema/AlwaysValidChampSchemaEnforcer.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/schema/ChampSchemaEnforcer.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/schema/ChampSchemaEnforcer.java index 5113aa2..9d3c9b4 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/schema/ChampSchemaEnforcer.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/schema/ChampSchemaEnforcer.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/schema/DefaultChampSchemaEnforcer.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/schema/DefaultChampSchemaEnforcer.java index 308244e..6dc8134 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/schema/DefaultChampSchemaEnforcer.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/schema/DefaultChampSchemaEnforcer.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.schema; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/transform/Champformer.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/transform/Champformer.java index e07ac14..1575812 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/transform/Champformer.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/transform/Champformer.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.transform; diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/transform/TinkerpopChampformer.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/transform/TinkerpopChampformer.java index 8552cc6..a459201 100644 --- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/transform/TinkerpopChampformer.java +++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/transform/TinkerpopChampformer.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.transform; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/concurrency/ConcurrencyTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/concurrency/ConcurrencyTest.java index 9f9be02..692c829 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/concurrency/ConcurrencyTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/concurrency/ConcurrencyTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.concurrency; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/BaseChampAPITest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/BaseChampAPITest.java index 229e920..fe3f519 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/BaseChampAPITest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/BaseChampAPITest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.core; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampAPITest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampAPITest.java index f033b30..68a8d23 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampAPITest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampAPITest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.core; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampElementTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampElementTest.java index 9eb5dfe..39771c3 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampElementTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampElementTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.core; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampFieldTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampFieldTest.java index 4975739..4214fe2 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampFieldTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampFieldTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.core; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampObjectIndexTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampObjectIndexTest.java index bb2c65e..d007ee4 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampObjectIndexTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampObjectIndexTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.core; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampObjectTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampObjectTest.java index 3ef8f8c..f6886c1 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampObjectTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampObjectTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.core; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampPartitionTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampPartitionTest.java index 1aafebe..c133b2a 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampPartitionTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampPartitionTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.core; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampPropertyConstraintTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampPropertyConstraintTest.java index c82e055..0209e37 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampPropertyConstraintTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampPropertyConstraintTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.core; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampRelationshipIndexTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampRelationshipIndexTest.java index 5b8c715..f174f3e 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampRelationshipIndexTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampRelationshipIndexTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.core; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampRelationshipTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampRelationshipTest.java index 3f17466..549f7f4 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampRelationshipTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampRelationshipTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.core; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampSchemaTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampSchemaTest.java index ba62628..dab1bdc 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampSchemaTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampSchemaTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.core; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampTransactionTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampTransactionTest.java index 30f033c..b558707 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampTransactionTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/core/ChampTransactionTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.core; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/event/AbstractLoggingChampGraphTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/event/AbstractLoggingChampGraphTest.java index 1f7451a..208d357 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/event/AbstractLoggingChampGraphTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/event/AbstractLoggingChampGraphTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.event; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/exceptions/ChampExceptionTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/exceptions/ChampExceptionTest.java index f7a32f7..c59ea05 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/exceptions/ChampExceptionTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/exceptions/ChampExceptionTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.exceptions; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/ie/ExportTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/ie/ExportTest.java index bda6122..033d527 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/ie/ExportTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/ie/ExportTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.ie; diff --git a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/ie/ImportTest.java b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/ie/ImportTest.java index 67fdb19..858c377 100644 --- a/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/ie/ImportTest.java +++ b/champ-lib/champ-core/src/test/java/org/onap/aai/champcore/ie/ImportTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champcore.ie; diff --git a/champ-lib/champ-core/src/test/resources/logback.xml b/champ-lib/champ-core/src/test/resources/logback.xml index 72cd644..ca1e184 100644 --- a/champ-lib/champ-core/src/test/resources/logback.xml +++ b/champ-lib/champ-core/src/test/resources/logback.xml @@ -4,8 +4,8 @@ ============LICENSE_START========================================== org.onap.aai =================================================================== - Copyright © 2017 AT&T Intellectual Property. All rights reserved. - Copyright © 2017 Amdocs + Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + Copyright © 2017-2018 Amdocs =================================================================== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ 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. --> <configuration> diff --git a/champ-lib/champ-janus/License.txt b/champ-lib/champ-janus/License.txt index 469f362..41ce15f 100644 --- a/champ-lib/champ-janus/License.txt +++ b/champ-lib/champ-janus/License.txt @@ -1,8 +1,8 @@ ============LICENSE_START========================================== org.onap.aai =================================================================== -Copyright © 2017 AT&T Intellectual Property. All rights reserved. -Copyright © 2017 Amdocs +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs =================================================================== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,6 +16,5 @@ 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. diff --git a/champ-lib/champ-janus/pom.xml b/champ-lib/champ-janus/pom.xml index 15c65e5..1a0475d 100644 --- a/champ-lib/champ-janus/pom.xml +++ b/champ-lib/champ-janus/pom.xml @@ -1,4 +1,24 @@ -<?xml version="1.0" encoding="UTF-8"?> +<!-- +============LICENSE_START======================================================= +org.onap.aai +================================================================================ +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs +================================================================================ +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========================================================= +--> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -154,6 +174,14 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <!-- + <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> <version>3.0</version> @@ -183,6 +211,7 @@ </execution> </executions> </plugin> + --> </plugins> </build> </project> diff --git a/champ-lib/champ-janus/src/main/java/org/onap/aai/champjanus/graph/impl/GraphSON.java b/champ-lib/champ-janus/src/main/java/org/onap/aai/champjanus/graph/impl/GraphSON.java index 9e849b8..20b993c 100644 --- a/champ-lib/champ-janus/src/main/java/org/onap/aai/champjanus/graph/impl/GraphSON.java +++ b/champ-lib/champ-janus/src/main/java/org/onap/aai/champjanus/graph/impl/GraphSON.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champjanus.graph.impl; diff --git a/champ-lib/champ-janus/src/main/java/org/onap/aai/champjanus/graph/impl/JanusChampGraphImpl.java b/champ-lib/champ-janus/src/main/java/org/onap/aai/champjanus/graph/impl/JanusChampGraphImpl.java index 9ede7df..2ae4ea4 100644 --- a/champ-lib/champ-janus/src/main/java/org/onap/aai/champjanus/graph/impl/JanusChampGraphImpl.java +++ b/champ-lib/champ-janus/src/main/java/org/onap/aai/champjanus/graph/impl/JanusChampGraphImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champjanus.graph.impl; diff --git a/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/concurrency/ConcurrencyTest.java b/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/concurrency/ConcurrencyTest.java index 68e1a1a..602eaf5 100644 --- a/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/concurrency/ConcurrencyTest.java +++ b/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/concurrency/ConcurrencyTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champjanus.concurrency; diff --git a/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampAPITest.java b/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampAPITest.java index 4fd9e4a..9ffb91d 100644 --- a/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampAPITest.java +++ b/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampAPITest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champjanus.core; diff --git a/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampObjectIndexTest.java b/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampObjectIndexTest.java index bd031ef..e8d3dd7 100644 --- a/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampObjectIndexTest.java +++ b/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampObjectIndexTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champjanus.core; diff --git a/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampRelationshipIndexTest.java b/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampRelationshipIndexTest.java index bbfb585..b2bfc75 100644 --- a/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampRelationshipIndexTest.java +++ b/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampRelationshipIndexTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champjanus.core; diff --git a/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampSchemaTest.java b/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampSchemaTest.java index 96ffb25..16ce1ac 100644 --- a/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampSchemaTest.java +++ b/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/ChampSchemaTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champjanus.core; diff --git a/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/JanusChampSetupTest.java b/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/JanusChampSetupTest.java index 3cca54d..852dd38 100644 --- a/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/JanusChampSetupTest.java +++ b/champ-lib/champ-janus/src/test/java/org/onap/aai/champjanus/core/JanusChampSetupTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champjanus.core; diff --git a/champ-lib/champ-titan/License.txt b/champ-lib/champ-titan/License.txt index 469f362..41ce15f 100644 --- a/champ-lib/champ-titan/License.txt +++ b/champ-lib/champ-titan/License.txt @@ -1,8 +1,8 @@ ============LICENSE_START========================================== org.onap.aai =================================================================== -Copyright © 2017 AT&T Intellectual Property. All rights reserved. -Copyright © 2017 Amdocs +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs =================================================================== Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,6 +16,5 @@ 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. diff --git a/champ-lib/champ-titan/pom.xml b/champ-lib/champ-titan/pom.xml index 72d5039..ffff015 100644 --- a/champ-lib/champ-titan/pom.xml +++ b/champ-lib/champ-titan/pom.xml @@ -1,4 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> +<!-- +============LICENSE_START======================================================= +org.onap.aai +================================================================================ +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs +================================================================================ +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========================================================= +--> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -154,6 +173,14 @@ </executions> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <!-- + <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> <version>3.0</version> @@ -183,6 +210,7 @@ </execution> </executions> </plugin> + --> </plugins> </build> </project> diff --git a/champ-lib/champ-titan/src/main/java/org/onap/aai/champtitan/graph/impl/GraphSON.java b/champ-lib/champ-titan/src/main/java/org/onap/aai/champtitan/graph/impl/GraphSON.java index e36bd53..e6946bb 100644 --- a/champ-lib/champ-titan/src/main/java/org/onap/aai/champtitan/graph/impl/GraphSON.java +++ b/champ-lib/champ-titan/src/main/java/org/onap/aai/champtitan/graph/impl/GraphSON.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champtitan.graph.impl; diff --git a/champ-lib/champ-titan/src/main/java/org/onap/aai/champtitan/graph/impl/TitanChampGraphImpl.java b/champ-lib/champ-titan/src/main/java/org/onap/aai/champtitan/graph/impl/TitanChampGraphImpl.java index 56434be..d72d69d 100644 --- a/champ-lib/champ-titan/src/main/java/org/onap/aai/champtitan/graph/impl/TitanChampGraphImpl.java +++ b/champ-lib/champ-titan/src/main/java/org/onap/aai/champtitan/graph/impl/TitanChampGraphImpl.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champtitan.graph.impl; diff --git a/champ-lib/champ-titan/src/main/java/org/onap/aai/champtitan/perf/ChampAPIPerformanceTest.java b/champ-lib/champ-titan/src/main/java/org/onap/aai/champtitan/perf/ChampAPIPerformanceTest.java index 37ea4ff..cb9ad91 100644 --- a/champ-lib/champ-titan/src/main/java/org/onap/aai/champtitan/perf/ChampAPIPerformanceTest.java +++ b/champ-lib/champ-titan/src/main/java/org/onap/aai/champtitan/perf/ChampAPIPerformanceTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champtitan.perf; diff --git a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/concurrency/ConcurrencyTest.java b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/concurrency/ConcurrencyTest.java index 9e08f55..f337fc1 100644 --- a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/concurrency/ConcurrencyTest.java +++ b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/concurrency/ConcurrencyTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champtitan.concurrency; diff --git a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampAPITest.java b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampAPITest.java index 8d4bc57..a258717 100644 --- a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampAPITest.java +++ b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampAPITest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champtitan.core; diff --git a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampObjectIndexTest.java b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampObjectIndexTest.java index bd9295f..8c37731 100644 --- a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampObjectIndexTest.java +++ b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampObjectIndexTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champtitan.core; diff --git a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampRelationshipIndexTest.java b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampRelationshipIndexTest.java index e515101..da660e6 100644 --- a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampRelationshipIndexTest.java +++ b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampRelationshipIndexTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champtitan.core; diff --git a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampSchemaTest.java b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampSchemaTest.java index ac29fc8..3e7295f 100644 --- a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampSchemaTest.java +++ b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampSchemaTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champtitan.core; diff --git a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampTransactionTest.java b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampTransactionTest.java index aafc053..a3985c4 100644 --- a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampTransactionTest.java +++ b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/ChampTransactionTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champtitan.core; diff --git a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/TitanChampSetupTest.java b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/TitanChampSetupTest.java index bca61ec..865caff 100644 --- a/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/TitanChampSetupTest.java +++ b/champ-lib/champ-titan/src/test/java/org/onap/aai/champtitan/core/TitanChampSetupTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champtitan.core; diff --git a/champ-lib/pom.xml b/champ-lib/pom.xml index 5e441e0..43fa296 100644 --- a/champ-lib/pom.xml +++ b/champ-lib/pom.xml @@ -1,3 +1,23 @@ +<!-- +============LICENSE_START======================================================= +org.onap.aai +================================================================================ +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs +================================================================================ +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========================================================= +--> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -7,6 +27,12 @@ <packaging>pom</packaging> <version>1.2.0-SNAPSHOT</version> + <parent> + <groupId>org.onap.aai</groupId> + <artifactId>champ</artifactId> + <version>1.2.0-SNAPSHOT</version> + </parent> + <modules> <module>champ-core</module> <module>champ-titan</module> @@ -29,21 +55,21 @@ <dependencyManagement> <dependencies> - <dependency> - <groupId>org.onap.aai.event-client</groupId> - <artifactId>event-client-api</artifactId> - <version>${event.client.version}</version> - </dependency> - <dependency> - <groupId>org.onap.aai.event-client</groupId> - <artifactId>event-client-dmaap</artifactId> - <version>${event.client.version}</version> - </dependency> - <dependency> - <groupId>org.onap.aai.event-client</groupId> - <artifactId>event-client-kafka</artifactId> - <version>${event.client.version}</version> - </dependency> + <dependency> + <groupId>org.onap.aai.event-client</groupId> + <artifactId>event-client-api</artifactId> + <version>${event.client.version}</version> + </dependency> + <dependency> + <groupId>org.onap.aai.event-client</groupId> + <artifactId>event-client-dmaap</artifactId> + <version>${event.client.version}</version> + </dependency> + <dependency> + <groupId>org.onap.aai.event-client</groupId> + <artifactId>event-client-kafka</artifactId> + <version>${event.client.version}</version> + </dependency> </dependencies> </dependencyManagement> @@ -246,6 +272,14 @@ </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <!-- + <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> <version>3.0</version> @@ -275,6 +309,7 @@ </execution> </executions> </plugin> + --> </plugins> </build> </project> diff --git a/champ-service-deps-janus/pom.xml b/champ-service-deps-janus/pom.xml index e01cbd0..8c99d0a 100644 --- a/champ-service-deps-janus/pom.xml +++ b/champ-service-deps-janus/pom.xml @@ -1,3 +1,23 @@ +<!-- +============LICENSE_START======================================================= +org.onap.aai +================================================================================ +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs +================================================================================ +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========================================================= +--> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -7,6 +27,12 @@ <packaging>pom</packaging> <version>1.2.0-SNAPSHOT</version> + <parent> + <groupId>org.onap.aai</groupId> + <artifactId>champ</artifactId> + <version>1.2.0-SNAPSHOT</version> + </parent> + <dependencies> <dependency> <groupId>org.onap.aai</groupId> @@ -77,7 +103,7 @@ <goal>copy-dependencies</goal> </goals> <configuration> - <outputDirectory>../champ-service/target/graph-deps/janus-deps</outputDirectory> + <outputDirectory>target/graph-deps/janus-deps</outputDirectory> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>false</overWriteSnapshots> <overWriteIfNewer>true</overWriteIfNewer> @@ -85,6 +111,13 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> </project>
\ No newline at end of file diff --git a/champ-service-deps-titan/pom.xml b/champ-service-deps-titan/pom.xml index 3f6165b..0aebf37 100644 --- a/champ-service-deps-titan/pom.xml +++ b/champ-service-deps-titan/pom.xml @@ -1,3 +1,23 @@ +<!-- +============LICENSE_START======================================================= +org.onap.aai +================================================================================ +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs +================================================================================ +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========================================================= +--> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -6,7 +26,13 @@ <artifactId>champ-service-deps-titan</artifactId> <packaging>pom</packaging> <version>1.2.0-SNAPSHOT</version> - + + <parent> + <groupId>org.onap.aai</groupId> + <artifactId>champ</artifactId> + <version>1.2.0-SNAPSHOT</version> + </parent> + <dependencies> <dependency> <groupId>org.onap.aai</groupId> @@ -75,7 +101,7 @@ <goal>copy-dependencies</goal> </goals> <configuration> - <outputDirectory>../champ-service/target/graph-deps/titan-deps</outputDirectory> + <outputDirectory>target/graph-deps/titan-deps</outputDirectory> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>false</overWriteSnapshots> <overWriteIfNewer>true</overWriteIfNewer> @@ -83,6 +109,13 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> </plugins> </build> </project>
\ No newline at end of file diff --git a/champ-service/License.txt b/champ-service/License.txt index 469f362..714bbd4 100644 --- a/champ-service/License.txt +++ b/champ-service/License.txt @@ -1,14 +1,14 @@ ============LICENSE_START========================================== org.onap.aai =================================================================== -Copyright © 2017 AT&T Intellectual Property. All rights reserved. -Copyright © 2017 Amdocs +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs =================================================================== 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, @@ -16,6 +16,6 @@ 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. + diff --git a/champ-service/pom.xml b/champ-service/pom.xml index c5c90f4..b0dbf46 100644 --- a/champ-service/pom.xml +++ b/champ-service/pom.xml @@ -1,4 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> +<!-- +============LICENSE_START======================================================= +org.onap.aai +================================================================================ +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs +================================================================================ +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========================================================= +--> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -13,6 +32,7 @@ <groupId>org.onap.aai</groupId> <artifactId>champ-service</artifactId> <version>1.2.0-SNAPSHOT</version> + <name>champ</name> <properties> <runAjscHome>${basedir}/target/swm/package/nix/dist_files${distFilesRoot}</runAjscHome> @@ -30,6 +50,9 @@ <common.logging.groupid>org.onap.aai.logging-service</common.logging.groupid> <common.logging.version>1.2.2</common.logging.version> <org.apache.httpcomponents.httpclient.version>4.5.2</org.apache.httpcomponents.httpclient.version> + + <docker.location>${basedir}/target</docker.location> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> </properties> <dependencies> @@ -39,13 +62,13 @@ <version>1.18.6</version> </dependency> - <!-- AJSC Dependencies --> <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> <version>1.6.1</version> <scope>provided</scope> </dependency> + <dependency> <groupId>com.att.aft</groupId> <artifactId>dme2</artifactId> @@ -53,7 +76,6 @@ <scope>provided</scope> </dependency> - <!--Adding this dependency explicit.--> <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> @@ -102,7 +124,6 @@ <version>${org.apache.httpcomponents.httpclient.version}</version> </dependency> - <!-- Champ graph database library. --> <dependency> <groupId>org.onap.aai</groupId> <artifactId>champ-core</artifactId> @@ -117,6 +138,19 @@ </dependency> </dependencies> + <distributionManagement> + <repository> + <id>ecomp-releases</id> + <name>ECOMP Release Repository</name> + <url>${onap.nexus.url}/content/repositories/releases/</url> + </repository> + <snapshotRepository> + <id>ecomp-snapshots</id> + <name>ECOMP Snapshot Repository</name> + <url>${onap.nexus.url}/content/repositories/snapshots/</url> + </snapshotRepository> + </distributionManagement> + <build> <finalName>${project.artifactId}</finalName> <plugins> @@ -145,12 +179,25 @@ <resource> <directory>${basedir}/src/main/bin/</directory> </resource> + <resource> + <directory>../champ-service-deps-janus/target/</directory> + </resource> + <resource> + <directory>../champ-service-deps-titan/target/</directory> + </resource> </resources> </configuration> </execution> </executions> </plugin> - + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <!-- <plugin> <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> @@ -170,7 +217,7 @@ </execution> </executions> </plugin> - + --> <plugin> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId> @@ -178,7 +225,7 @@ <configuration> <verbose>true</verbose> <serverId>docker-hub</serverId> - <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName> + <imageName>${docker.push.registry}/onap/${project.name}</imageName> <dockerDirectory>${docker.location}</dockerDirectory> <imageTags> <imageTag>latest</imageTag> @@ -186,7 +233,6 @@ <forceTags>true</forceTags> </configuration> </plugin> - <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> diff --git a/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java b/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java index 577dbc9..b75ba53 100644 --- a/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java +++ b/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ; diff --git a/champ-service/src/main/java/org/onap/champ/async/ChampAsyncRequestProcessor.java b/champ-service/src/main/java/org/onap/champ/async/ChampAsyncRequestProcessor.java index ed25f8c..610cac9 100644 --- a/champ-service/src/main/java/org/onap/champ/async/ChampAsyncRequestProcessor.java +++ b/champ-service/src/main/java/org/onap/champ/async/ChampAsyncRequestProcessor.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.async; diff --git a/champ-service/src/main/java/org/onap/champ/async/ChampAsyncResponsePublisher.java b/champ-service/src/main/java/org/onap/champ/async/ChampAsyncResponsePublisher.java index 515ed9e..a9560b0 100644 --- a/champ-service/src/main/java/org/onap/champ/async/ChampAsyncResponsePublisher.java +++ b/champ-service/src/main/java/org/onap/champ/async/ChampAsyncResponsePublisher.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.async; diff --git a/champ-service/src/main/java/org/onap/champ/entity/ChampObjectDeserializer.java b/champ-service/src/main/java/org/onap/champ/entity/ChampObjectDeserializer.java index cee7763..00e1d1b 100644 --- a/champ-service/src/main/java/org/onap/champ/entity/ChampObjectDeserializer.java +++ b/champ-service/src/main/java/org/onap/champ/entity/ChampObjectDeserializer.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.entity; diff --git a/champ-service/src/main/java/org/onap/champ/entity/ChampObjectSerializer.java b/champ-service/src/main/java/org/onap/champ/entity/ChampObjectSerializer.java index c43b6bf..9c578e0 100644 --- a/champ-service/src/main/java/org/onap/champ/entity/ChampObjectSerializer.java +++ b/champ-service/src/main/java/org/onap/champ/entity/ChampObjectSerializer.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.entity; diff --git a/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipDeserializer.java b/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipDeserializer.java index 63b9e0c..f47aa24 100644 --- a/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipDeserializer.java +++ b/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipDeserializer.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.entity; diff --git a/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipSerializer.java b/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipSerializer.java index 5d21aa5..e1db596 100644 --- a/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipSerializer.java +++ b/champ-service/src/main/java/org/onap/champ/entity/ChampRelationshipSerializer.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.entity; diff --git a/champ-service/src/main/java/org/onap/champ/event/GraphEvent.java b/champ-service/src/main/java/org/onap/champ/event/GraphEvent.java index be199a2..cf2f11d 100644 --- a/champ-service/src/main/java/org/onap/champ/event/GraphEvent.java +++ b/champ-service/src/main/java/org/onap/champ/event/GraphEvent.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.event; diff --git a/champ-service/src/main/java/org/onap/champ/event/GraphEventEdge.java b/champ-service/src/main/java/org/onap/champ/event/GraphEventEdge.java index 13809c1..d6b737f 100644 --- a/champ-service/src/main/java/org/onap/champ/event/GraphEventEdge.java +++ b/champ-service/src/main/java/org/onap/champ/event/GraphEventEdge.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.event; diff --git a/champ-service/src/main/java/org/onap/champ/event/GraphEventVertex.java b/champ-service/src/main/java/org/onap/champ/event/GraphEventVertex.java index b738dc0..cc4f493 100644 --- a/champ-service/src/main/java/org/onap/champ/event/GraphEventVertex.java +++ b/champ-service/src/main/java/org/onap/champ/event/GraphEventVertex.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.event; diff --git a/champ-service/src/main/java/org/onap/champ/exception/ChampServiceException.java b/champ-service/src/main/java/org/onap/champ/exception/ChampServiceException.java index c861bfe..c39bdb1 100644 --- a/champ-service/src/main/java/org/onap/champ/exception/ChampServiceException.java +++ b/champ-service/src/main/java/org/onap/champ/exception/ChampServiceException.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.exception; diff --git a/champ-service/src/main/java/org/onap/champ/service/ChampDataService.java b/champ-service/src/main/java/org/onap/champ/service/ChampDataService.java index b9b758b..8432a8d 100644 --- a/champ-service/src/main/java/org/onap/champ/service/ChampDataService.java +++ b/champ-service/src/main/java/org/onap/champ/service/ChampDataService.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.service; diff --git a/champ-service/src/main/java/org/onap/champ/service/ChampThreadFactory.java b/champ-service/src/main/java/org/onap/champ/service/ChampThreadFactory.java index 1e4a0b2..4194a9f 100644 --- a/champ-service/src/main/java/org/onap/champ/service/ChampThreadFactory.java +++ b/champ-service/src/main/java/org/onap/champ/service/ChampThreadFactory.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.service; diff --git a/champ-service/src/main/java/org/onap/champ/service/ChampTransactionCache.java b/champ-service/src/main/java/org/onap/champ/service/ChampTransactionCache.java index 897ee97..9dc7233 100644 --- a/champ-service/src/main/java/org/onap/champ/service/ChampTransactionCache.java +++ b/champ-service/src/main/java/org/onap/champ/service/ChampTransactionCache.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,9 +17,7 @@ * 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. */ - package org.onap.champ.service; import java.util.concurrent.TimeUnit; diff --git a/champ-service/src/main/java/org/onap/champ/service/ChampUUIDService.java b/champ-service/src/main/java/org/onap/champ/service/ChampUUIDService.java index b1354c5..0001610 100644 --- a/champ-service/src/main/java/org/onap/champ/service/ChampUUIDService.java +++ b/champ-service/src/main/java/org/onap/champ/service/ChampUUIDService.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.service; diff --git a/champ-service/src/main/java/org/onap/champ/service/EchoService.java b/champ-service/src/main/java/org/onap/champ/service/EchoService.java index c8236b1..d30cc5f 100644 --- a/champ-service/src/main/java/org/onap/champ/service/EchoService.java +++ b/champ-service/src/main/java/org/onap/champ/service/EchoService.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.service; diff --git a/champ-service/src/main/java/org/onap/champ/service/logging/ChampMsgs.java b/champ-service/src/main/java/org/onap/champ/service/logging/ChampMsgs.java index 2ddbff4..89ec994 100644 --- a/champ-service/src/main/java/org/onap/champ/service/logging/ChampMsgs.java +++ b/champ-service/src/main/java/org/onap/champ/service/logging/ChampMsgs.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.service.logging; diff --git a/champ-service/src/main/java/org/onap/champ/service/logging/LoggingUtil.java b/champ-service/src/main/java/org/onap/champ/service/logging/LoggingUtil.java index 0f7f2d0..9463f2c 100644 --- a/champ-service/src/main/java/org/onap/champ/service/logging/LoggingUtil.java +++ b/champ-service/src/main/java/org/onap/champ/service/logging/LoggingUtil.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.service.logging; diff --git a/champ-service/src/main/java/org/onap/champ/util/ChampProperties.java b/champ-service/src/main/java/org/onap/champ/util/ChampProperties.java index f2fd6a2..ef9f534 100644 --- a/champ-service/src/main/java/org/onap/champ/util/ChampProperties.java +++ b/champ-service/src/main/java/org/onap/champ/util/ChampProperties.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.util; diff --git a/champ-service/src/main/java/org/onap/champ/util/ChampServiceConstants.java b/champ-service/src/main/java/org/onap/champ/util/ChampServiceConstants.java index 92d3350..9c9ac12 100644 --- a/champ-service/src/main/java/org/onap/champ/util/ChampServiceConstants.java +++ b/champ-service/src/main/java/org/onap/champ/util/ChampServiceConstants.java @@ -2,14 +2,14 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * 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, @@ -17,7 +17,6 @@ * 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. */ package org.onap.champ.util; @@ -1,3 +1,23 @@ +<!-- +============LICENSE_START======================================================= +org.onap.aai +================================================================================ +Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright © 2017-2018 Amdocs +================================================================================ +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========================================================= +--> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -8,11 +28,28 @@ <packaging>pom</packaging> <version>1.2.0-SNAPSHOT</version> + <properties> + <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> + </properties> + <modules> <module>champ-lib</module> - <module>champ-service</module> <module>champ-service-deps-janus</module> <module>champ-service-deps-titan</module> + <module>champ-service</module> </modules> + <distributionManagement> + <repository> + <id>ecomp-releases</id> + <name>ECOMP Release Repository</name> + <url>${onap.nexus.url}/content/repositories/releases/</url> + </repository> + <snapshotRepository> + <id>ecomp-snapshots</id> + <name>ECOMP Snapshot Repository</name> + <url>${onap.nexus.url}/content/repositories/snapshots/</url> + </snapshotRepository> + </distributionManagement> + </project>
\ No newline at end of file diff --git a/src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java b/src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java index 312a6e4..16fc00b 100644 --- a/src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java +++ b/src/main/java/org/onap/aai/champ/event/AbstractLoggingChampGraph.java @@ -2,8 +2,8 @@ * ============LICENSE_START========================================== * org.onap.aai * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. - * Copyright © 2017 Amdocs + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * =================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ * 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. */ package org.onap.aai.champ.event; |