diff options
Diffstat (limited to 'models-sim/packages')
5 files changed, 67 insertions, 7 deletions
diff --git a/models-sim/packages/models-simulator-docker/pom.xml b/models-sim/packages/models-simulator-docker/pom.xml index c6f4717c0..b9c181fc5 100644 --- a/models-sim/packages/models-simulator-docker/pom.xml +++ b/models-sim/packages/models-simulator-docker/pom.xml @@ -1,6 +1,7 @@ <!-- ============LICENSE_START======================================================= Copyright (C) 2020 Bell Canada. + Modifications Copyright (C) 2020 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. @@ -23,8 +24,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.policy.models.sim</groupId> - <artifactId>policy-models-sim</artifactId> - <version>2.3.2-SNAPSHOT</version> + <artifactId>models-sim-packages</artifactId> + <version>2.3.5-SNAPSHOT</version> </parent> <artifactId>models-simulator-docker</artifactId> @@ -43,6 +44,8 @@ <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry> <docker.push.registry>nexus3.onap.org:10003</docker.push.registry> <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format> + <!-- There is no code in this sub-module, only holds interfaces. So skip sonar. --> + <sonar.skip>true</sonar.skip> </properties> <build> @@ -166,7 +169,7 @@ <dependency> <groupId>org.onap.policy.models.sim</groupId> <artifactId>models-simulator-tarball</artifactId> - <version>2.3.2-SNAPSHOT</version> + <version>${project.version}</version> <classifier>tarball</classifier> <type>tar.gz</type> </dependency> diff --git a/models-sim/packages/models-simulator-tarball/pom.xml b/models-sim/packages/models-simulator-tarball/pom.xml index 9fb1fb5fd..c8c20880d 100644 --- a/models-sim/packages/models-simulator-tarball/pom.xml +++ b/models-sim/packages/models-simulator-tarball/pom.xml @@ -3,6 +3,7 @@ ONAP ================================================================================ Copyright (C) 2020 Bell Canada. + Modifications Copyright (C) 2020 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. @@ -26,8 +27,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.policy.models.sim</groupId> - <artifactId>policy-models-sim</artifactId> - <version>2.3.2-SNAPSHOT</version> + <artifactId>models-sim-packages</artifactId> + <version>2.3.5-SNAPSHOT</version> </parent> <artifactId>models-simulator-tarball</artifactId> @@ -35,11 +36,16 @@ <name>${project.artifactId}</name> <description>A module that runs all "simulators", including DMaaP.</description> + <properties> + <!-- There is no code in this sub-module, only holds interfaces. So skip sonar. --> + <sonar.skip>true</sonar.skip> + </properties> + <dependencies> <dependency> <groupId>org.onap.policy.models.sim</groupId> <artifactId>policy-models-simulators</artifactId> - <version>2.3.2-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> diff --git a/models-sim/packages/models-simulator-tarball/src/main/assembly.xml b/models-sim/packages/models-simulator-tarball/src/main/assembly.xml index 9a2fd65df..47395e122 100644 --- a/models-sim/packages/models-simulator-tarball/src/main/assembly.xml +++ b/models-sim/packages/models-simulator-tarball/src/main/assembly.xml @@ -46,5 +46,14 @@ <outputDirectory>etc${file.separator}ssl</outputDirectory> <lineEnding>keep</lineEnding> </fileSet> + <fileSet> + <directory>${project.basedir}/src/main/resources/etc + </directory> + <includes> + <include>*.xml</include> + </includes> + <outputDirectory>etc</outputDirectory> + <lineEnding>unix</lineEnding> + </fileSet> </fileSets> </assembly> diff --git a/models-sim/packages/models-simulator-tarball/src/main/resources/etc/logback.xml b/models-sim/packages/models-simulator-tarball/src/main/resources/etc/logback.xml new file mode 100644 index 000000000..131b0fe33 --- /dev/null +++ b/models-sim/packages/models-simulator-tarball/src/main/resources/etc/logback.xml @@ -0,0 +1,42 @@ +<!-- + ============LICENSE_START======================================================= + Copyright (C) 2020 AT&T Intellectual Property. + ================================================================================ + 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. + + SPDX-License-Identifier: Apache-2.0 + ============LICENSE_END========================================================= +--> + +<configuration scan="true" scanPeriod="30 seconds" debug="false"> + + <!-- + This is only used for testing and only a snapshot docker image is generated, + thus it is not necessary for the messages to following the ONAP standard. + Therefore, keeping it short so it's easier to wade through the output. + + Also sending all output to stdout instead of to a log file; it can be viewed + via "docker logs" or captured by kubernetes. + --> + + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <Pattern>%d %level %msg%n</Pattern> + </encoder> + </appender> + + <root level="INFO"> + <appender-ref ref="STDOUT" /> + </root> + +</configuration> diff --git a/models-sim/packages/pom.xml b/models-sim/packages/pom.xml index 14922559d..ceabde62e 100644 --- a/models-sim/packages/pom.xml +++ b/models-sim/packages/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.policy.models.sim</groupId> <artifactId>policy-models-sim</artifactId> - <version>2.3.2-SNAPSHOT</version> + <version>2.3.5-SNAPSHOT</version> </parent> <artifactId>models-sim-packages</artifactId> |