diff options
| author |   ARUL NAMBI <arul.nambi@amdocs.com> | 2017-07-31 13:27:48 -0400 |
|---|---|---|
| committer | ARUL NAMBI <arul.nambi@amdocs.com> | 2017-07-31 13:34:41 -0400 |
| commit | 9314715013b024f8194b0a72e56809afe18a746d (patch) | |
| tree | 69615af1c902e13497dbf6d8b19d203bbfface9b | |
| parent | d04bcaf35d18842b470260aa7b31998f78851340 (diff) | |
Changing the license and trademark
Issue-ID: AAI-85
Change-Id: I8b597ba450b8af12290031cbf6eadacf072f630c
Signed-off-by: ARUL NAMBI <arul.nambi@amdocs.com>
14 files changed, 122 insertions, 148 deletions
diff --git a/License.txt b/License.txt index 1ec51b5..09cff85 100644 --- a/License.txt +++ b/License.txt @@ -1,14 +1,15 @@ ============LICENSE_START======================================================= -Common Logging Service +org.onap.aai ================================================================================ -Copyright © 2017 AT&T Intellectual Property. +Copyright © 2017 AT&T Intellectual Property. All rights reserved. Copyright © 2017 Amdocs -All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. -You may obtain a copy of the License at -http://www.apache.org/licenses/LICENSE-2.0 +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. @@ -16,5 +17,4 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= -ECOMP and OpenECOMP are trademarks -and service marks of AT&T Intellectual Property.
\ No newline at end of file +ECOMP is a trademark and service mark of AT&T Intellectual Property.
\ No newline at end of file diff --git a/eelf-logging/src/main/java/org/openecomp/cl/eelf/AaiLoggerAdapter.java b/eelf-logging/src/main/java/org/openecomp/cl/eelf/AaiLoggerAdapter.java index f573ab4..28bf1aa 100644 --- a/eelf-logging/src/main/java/org/openecomp/cl/eelf/AaiLoggerAdapter.java +++ b/eelf-logging/src/main/java/org/openecomp/cl/eelf/AaiLoggerAdapter.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 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, * 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. */ - package org.openecomp.cl.eelf; import com.att.eelf.configuration.EELFLogger; diff --git a/eelf-logging/src/main/java/org/openecomp/cl/eelf/AuditLogLine.java b/eelf-logging/src/main/java/org/openecomp/cl/eelf/AuditLogLine.java index b01437d..c1bfb19 100644 --- a/eelf-logging/src/main/java/org/openecomp/cl/eelf/AuditLogLine.java +++ b/eelf-logging/src/main/java/org/openecomp/cl/eelf/AuditLogLine.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 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, * 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. */ - package org.openecomp.cl.eelf; import org.openecomp.cl.api.LogLine; diff --git a/eelf-logging/src/main/java/org/openecomp/cl/eelf/ErrorLogLine.java b/eelf-logging/src/main/java/org/openecomp/cl/eelf/ErrorLogLine.java index ba26dca..00ddbc0 100644 --- a/eelf-logging/src/main/java/org/openecomp/cl/eelf/ErrorLogLine.java +++ b/eelf-logging/src/main/java/org/openecomp/cl/eelf/ErrorLogLine.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 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, * 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. */ - package org.openecomp.cl.eelf; import org.openecomp.cl.api.LogLine; diff --git a/eelf-logging/src/main/java/org/openecomp/cl/eelf/LogMessageEnum.java b/eelf-logging/src/main/java/org/openecomp/cl/eelf/LogMessageEnum.java index 7d35c6c..f6d99cb 100644 --- a/eelf-logging/src/main/java/org/openecomp/cl/eelf/LogMessageEnum.java +++ b/eelf-logging/src/main/java/org/openecomp/cl/eelf/LogMessageEnum.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 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, * 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. */ - package org.openecomp.cl.eelf; import com.att.eelf.i18n.EELFResolvableErrorEnum; diff --git a/eelf-logging/src/main/java/org/openecomp/cl/eelf/LoggerFactory.java b/eelf-logging/src/main/java/org/openecomp/cl/eelf/LoggerFactory.java index d695238..b0a7c3b 100644 --- a/eelf-logging/src/main/java/org/openecomp/cl/eelf/LoggerFactory.java +++ b/eelf-logging/src/main/java/org/openecomp/cl/eelf/LoggerFactory.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 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, * 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. */ - package org.openecomp.cl.eelf; import com.att.eelf.configuration.EELFManager; diff --git a/eelf-logging/src/main/java/org/openecomp/cl/eelf/MetricsLogLine.java b/eelf-logging/src/main/java/org/openecomp/cl/eelf/MetricsLogLine.java index 0ed6b91..454fb15 100644 --- a/eelf-logging/src/main/java/org/openecomp/cl/eelf/MetricsLogLine.java +++ b/eelf-logging/src/main/java/org/openecomp/cl/eelf/MetricsLogLine.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 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, * 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. */ - package org.openecomp.cl.eelf; import org.openecomp.cl.api.LogLine; diff --git a/logging-api/src/main/java/org/openecomp/cl/api/LogFields.java b/logging-api/src/main/java/org/openecomp/cl/api/LogFields.java index c4ec7cb..677aa2c 100644 --- a/logging-api/src/main/java/org/openecomp/cl/api/LogFields.java +++ b/logging-api/src/main/java/org/openecomp/cl/api/LogFields.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 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, * 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. */ - package org.openecomp.cl.api; import java.util.HashMap; diff --git a/logging-api/src/main/java/org/openecomp/cl/api/LogLine.java b/logging-api/src/main/java/org/openecomp/cl/api/LogLine.java index 6d0435f..f63d421 100644 --- a/logging-api/src/main/java/org/openecomp/cl/api/LogLine.java +++ b/logging-api/src/main/java/org/openecomp/cl/api/LogLine.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 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, * 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. */ - package org.openecomp.cl.api; import org.openecomp.cl.mdc.MdcContext; diff --git a/logging-api/src/main/java/org/openecomp/cl/api/Logger.java b/logging-api/src/main/java/org/openecomp/cl/api/Logger.java index e2c47f0..50efe49 100644 --- a/logging-api/src/main/java/org/openecomp/cl/api/Logger.java +++ b/logging-api/src/main/java/org/openecomp/cl/api/Logger.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 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, * 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. */ - package org.openecomp.cl.api; import org.openecomp.cl.mdc.MdcOverride; diff --git a/logging-api/src/main/java/org/openecomp/cl/api/LoggerFactoryInterface.java b/logging-api/src/main/java/org/openecomp/cl/api/LoggerFactoryInterface.java index 62b098d..502aa19 100644 --- a/logging-api/src/main/java/org/openecomp/cl/api/LoggerFactoryInterface.java +++ b/logging-api/src/main/java/org/openecomp/cl/api/LoggerFactoryInterface.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 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, * 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. */ - package org.openecomp.cl.api; /** diff --git a/logging-api/src/main/java/org/openecomp/cl/mdc/MdcContext.java b/logging-api/src/main/java/org/openecomp/cl/mdc/MdcContext.java index a36556d..285ca9b 100644 --- a/logging-api/src/main/java/org/openecomp/cl/mdc/MdcContext.java +++ b/logging-api/src/main/java/org/openecomp/cl/mdc/MdcContext.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 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, * 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. */ - package org.openecomp.cl.mdc; import org.slf4j.MDC; diff --git a/logging-api/src/main/java/org/openecomp/cl/mdc/MdcOverride.java b/logging-api/src/main/java/org/openecomp/cl/mdc/MdcOverride.java index 6031b1c..cc5e131 100644 --- a/logging-api/src/main/java/org/openecomp/cl/mdc/MdcOverride.java +++ b/logging-api/src/main/java/org/openecomp/cl/mdc/MdcOverride.java @@ -1,24 +1,25 @@ -/*- +/** * ============LICENSE_START======================================================= - * Common Logging Library + * org.onap.aai * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017 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, * 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. */ - package org.openecomp.cl.mdc; import java.util.HashMap; @@ -1,14 +1,3 @@ -<!-- ============LICENSE_START======================================================= - Common Logging Library ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ - Licensed under the Apache License, Version 2.0 (the "License"); you may not - use this file except in compliance with the License. You may obtain a copy - of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required - by applicable law or agreed to in writing, software distributed under the - License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS - OF ANY KIND, either express or implied. See the License for the specific - language governing permissions and limitations under the License. ============LICENSE_END========================================================= --> - <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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -91,48 +80,21 @@ <!-- license plugin --> <plugin> - <groupId>org.codehaus.mojo</groupId> + <groupId>com.mycila</groupId> <artifactId>license-maven-plugin</artifactId> - <version>1.10</version> + <version>3.0</version> <configuration> - <addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage> - <verbose>true</verbose> - <excludes> - <exclude>**.json</exclude> - </excludes> - <processStartTag>============LICENSE_START=======================================================</processStartTag> - <processEndTag>============LICENSE_END=========================================================</processEndTag> - <sectionDelimiter>================================================================================</sectionDelimiter> - <licenseName>apache_v2</licenseName> - <inceptionYear>2017</inceptionYear> - <organizationName>AT&T Intellectual Property. All rights - reserved.</organizationName> - <projectName>Common Logging Library</projectName> - <canUpdateCopyright>true</canUpdateCopyright> - <canUpdateDescription>true</canUpdateDescription> - <canUpdateLicense>true</canUpdateLicense> - <emptyLineAfterHeader>true</emptyLineAfterHeader> - <roots> - <root>.</root> - </roots> - <extraExtensions> - <md>java</md> - <txt>java</txt> - </extraExtensions> + <header>License.txt</header> + <includes> + <include>src/main/java/**</include> + </includes> </configuration> <executions> <execution> - <id>first</id> <goals> - <goal>update-file-header</goal> + <goal>format</goal> </goals> <phase>process-sources</phase> - <configuration> - <licenseName>apache_v2</licenseName> - <excludes> - <exclude>*.json</exclude> - </excludes> - </configuration> </execution> </executions> </plugin> |