diff options
| -rw-r--r-- | deployment/pom.xml | 2 | ||||
| -rw-r--r-- | httpserver/Makefile | 2 | ||||
| -rw-r--r-- | httpserver/docker-compose.yml | 2 | ||||
| -rw-r--r-- | httpserver/pom.xml | 119 | ||||
| -rw-r--r-- | netconfsimulator/pom.xml | 4 | ||||
| -rw-r--r-- | pnfsimulator/integration/pom.xml | 4 | ||||
| -rw-r--r-- | pnfsimulator/pom.xml | 4 | ||||
| -rw-r--r-- | pom.xml | 3 | ||||
| -rw-r--r-- | sanitycheck/pnfsimulator-secured/certservice/docker-compose-pnfsim.yml | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
10 files changed, 132 insertions, 12 deletions
diff --git a/deployment/pom.xml b/deployment/pom.xml index dde82dd..4674ba1 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.integration.simulators.pnf-simulator</groupId> <artifactId>integration-pnf-simulator</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> </parent> <artifactId>onboarding-package</artifactId> <build> diff --git a/httpserver/Makefile b/httpserver/Makefile index 8b64af5..e3bae34 100644 --- a/httpserver/Makefile +++ b/httpserver/Makefile @@ -3,7 +3,7 @@ default: build-http-server: @echo "##### Build http server docker image #####" - docker build . -t http-server + docker build . -t onap/org.onap.integration.simulators.httpserver @echo "##### DONE #####" start-http-server: diff --git a/httpserver/docker-compose.yml b/httpserver/docker-compose.yml index c4479af..db1ee4b 100644 --- a/httpserver/docker-compose.yml +++ b/httpserver/docker-compose.yml @@ -2,7 +2,7 @@ version: "2.1" services: http-server: - image: http-server + image: onap/org.onap.integration.simulators.httpserver ports: - "7080:80" - "7443:443" diff --git a/httpserver/pom.xml b/httpserver/pom.xml new file mode 100644 index 0000000..a1f0bab --- /dev/null +++ b/httpserver/pom.xml @@ -0,0 +1,119 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + ============LICENSE_START======================================================= + Simulator + ================================================================================ + Copyright (C) 2020 Nokia. 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> + <groupId>org.onap.integration.simulators.pnf-simulator</groupId> + <artifactId>integration-pnf-simulator</artifactId> + <version>1.0.2-SNAPSHOT</version> + </parent> + + <artifactId>httpserver</artifactId> + <version>1.0.2-SNAPSHOT</version> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> + <docker.registry>nexus3.onap.org:10003</docker.registry> + <docker.image.tag>latest</docker.image.tag> + <dependency.directory.name>libs</dependency.directory.name> + <dependency.directory.location>${project.build.directory}/${dependency.directory.name}</dependency.directory.location> + <proxy>""</proxy> + </properties> + <profiles> + <profile> + <id>docker</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <os.detected.name>linux</os.detected.name> + <os.detected.arch>x86_64</os.detected.arch> + <os.detected.classifier>${os.detected.name}-${os.detected.arch}</os.detected.classifier> + </properties> + <build> + <plugins> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + <version>${docker-maven-plugin.version}</version> + <executions> + <execution> + <id>docker-build-image</id> + <phase>package</phase> + <goals> + <goal>build</goal> + </goals> + </execution> + <execution> + <id>docker-push-image</id> + <phase>deploy</phase> + <goals> + <goal>push</goal> + </goals> + </execution> + </executions> + <configuration> + <skipPush>${skipDockerPush}</skipPush> + <verbose>true</verbose> + <imagePullPolicy>IfNotPresent</imagePullPolicy> + <images> + <image> + <alias>${project.artifactId}</alias> + <name>${docker-image.namespace}/${docker-image.name.prefix}.${artifactId}</name> + <registry>${onap.nexus.dockerregistry.daily}</registry> + <build> + <dockerFileDir>${project.basedir}</dockerFileDir> + <tags> + <tag>${project.version}-STAGE-${maven.build.timestamp}Z</tag> + </tags> + </build> + </image> + </images> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <distributionManagement> + <repository> + <id>ecomp-releases</id> + <name>Integration simulators Release Repository</name> + <url>${nexusproxy}${releaseNexusPath}</url> + </repository> + <snapshotRepository> + <id>ecomp-snapshots</id> + <name>Integration simulators Snapshot Repository</name> + <url>${nexusproxy}${snapshotNexusPath}</url> + </snapshotRepository> + <site> + <id>ecomp-site</id> + <url>dav:${nexusproxy}${sitePath}</url> + </site> + </distributionManagement> + +</project> diff --git a/netconfsimulator/pom.xml b/netconfsimulator/pom.xml index 5502c69..420321a 100644 --- a/netconfsimulator/pom.xml +++ b/netconfsimulator/pom.xml @@ -27,11 +27,11 @@ <parent> <groupId>org.onap.integration.simulators.pnf-simulator</groupId> <artifactId>integration-pnf-simulator</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> </parent> <artifactId>netconfsimulator</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> diff --git a/pnfsimulator/integration/pom.xml b/pnfsimulator/integration/pom.xml index 7292849..d3a4161 100644 --- a/pnfsimulator/integration/pom.xml +++ b/pnfsimulator/integration/pom.xml @@ -27,12 +27,12 @@ <parent> <groupId>org.onap.integration.simulators.pnf-simulator</groupId> <artifactId>integration-pnf-simulator</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>pnf-simulator-integration</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> <name>pnf-simulator-integration</name> <repositories> diff --git a/pnfsimulator/pom.xml b/pnfsimulator/pom.xml index 2f5bab1..19563e2 100644 --- a/pnfsimulator/pom.xml +++ b/pnfsimulator/pom.xml @@ -27,11 +27,11 @@ <parent> <groupId>org.onap.integration.simulators.pnf-simulator</groupId> <artifactId>integration-pnf-simulator</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> </parent> <artifactId>pnfsimulator</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> <name>pnfsimulator</name> @@ -33,11 +33,12 @@ <groupId>org.onap.integration.simulators.pnf-simulator</groupId> <artifactId>integration-pnf-simulator</artifactId> - <version>1.0.1-SNAPSHOT</version> + <version>1.0.2-SNAPSHOT</version> <modules> <module>pnfsimulator</module> <module>netconfsimulator</module> <module>deployment</module> + <module>httpserver</module> </modules> <properties> diff --git a/sanitycheck/pnfsimulator-secured/certservice/docker-compose-pnfsim.yml b/sanitycheck/pnfsimulator-secured/certservice/docker-compose-pnfsim.yml index a46d29e..8e9c9de 100644 --- a/sanitycheck/pnfsimulator-secured/certservice/docker-compose-pnfsim.yml +++ b/sanitycheck/pnfsimulator-secured/certservice/docker-compose-pnfsim.yml @@ -36,7 +36,7 @@ services: ME_CONFIG_MONGODB_ADMINPASSWORD: zXcVbN123! http-server: - image: http-server + image: onap/org.onap.integration.simulators.httpserver ports: - "7080:80" - "7443:443" diff --git a/version.properties b/version.properties index 0f1f46a..c13587b 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=0 -patch=1 +patch=2 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |