diff options
author | Piotr Bochenski <piotr.bochenski@nokia.com> | 2018-08-31 11:49:21 +0200 |
---|---|---|
committer | Piotr Bochenski <piotr.bochenski@nokia.com> | 2018-08-31 12:11:46 +0200 |
commit | 3c2766d8a64d21f402b5234e33419a8aed14d7ea (patch) | |
tree | 66e26cdf9dad86b8787806a1d7914c1d21b06ae0 /prh-commons | |
parent | 6fd8c7770fbea30ad2ec6e3f7645b8baab5a49a1 (diff) |
Refactor Docker image building process
Align Docker image building process to VES project.
Also refactor all Maven configurations.
Change-Id: I3856bb75f41247f5ce7f17fb813aa2ab692e4def
Issue-ID: DCAEGEN2-737
Signed-off-by: Piotr Bochenski <piotr.bochenski@nokia.com>
Diffstat (limited to 'prh-commons')
-rw-r--r-- | prh-commons/pom.xml | 37 | ||||
-rw-r--r-- | prh-commons/src/test/resources/logback-test.xml | 21 |
2 files changed, 46 insertions, 12 deletions
diff --git a/prh-commons/pom.xml b/prh-commons/pom.xml index 41b0a331..94cd2459 100644 --- a/prh-commons/pom.xml +++ b/prh-commons/pom.xml @@ -1,23 +1,38 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://maven.apache.org/POM/4.0.0" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<!-- + ~ ============LICENSE_START======================================================= + ~ PNF-REGISTRATION-HANDLER + ~ ================================================================================ + ~ Copyright (C) 2018 NOKIA 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/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>prh</artifactId> <groupId>org.onap.dcaegen2.services</groupId> + <artifactId>prh</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <artifactId>prh-commons</artifactId> <groupId>org.onap.dcaegen2.services.prh</groupId> - <version>1.0.0-SNAPSHOT</version> + <artifactId>prh-commons</artifactId> <packaging>jar</packaging> - <properties> - <main.basedir>${project.parent.basedir}</main.basedir> - </properties> <dependencies> <dependency> <groupId>org.immutables</groupId> @@ -36,7 +51,6 @@ <artifactId>commons-lang3</artifactId> </dependency> - <!-- TEST DEPENDENCIES--> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-api</artifactId> @@ -53,7 +67,6 @@ <scope>test</scope> </dependency> - <!-- LOGGING DEPENDENCIES--> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> @@ -67,4 +80,4 @@ <artifactId>log4j-over-slf4j</artifactId> </dependency> </dependencies> -</project>
\ No newline at end of file +</project> diff --git a/prh-commons/src/test/resources/logback-test.xml b/prh-commons/src/test/resources/logback-test.xml new file mode 100644 index 00000000..c1f00665 --- /dev/null +++ b/prh-commons/src/test/resources/logback-test.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ~ ===============================LICENSE_START====================================== + ~ Copyright © 2017 AT&T Intellectual Property. All rights reserved. + ~ ================================================================================ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + ~ ============================LICENSE_END=========================================== + --> +<configuration> + <root level="OFF"/> +</configuration> |