diff options
| author |   sourabh_sourabh <sourabh.sourabh@est.tech> | 2024-11-13 16:48:46 +0000 |
|---|---|---|
| committer | sourabh_sourabh <sourabh.sourabh@est.tech> | 2024-11-13 16:48:46 +0000 |
| commit | 6c877ba9d5e1dfde569593ed88652b93b10ba4a6 (patch) | |
| tree | beed9e518388e08a9011741f5c1d23884a83e9c0 /dmi-stub | |
| parent | 62abb22f7c495892afc45d72b8994112ebf1dfb5 (diff) | |
Fix for cps-ncmp-dmi-plugin-maven-merge-master job
Issue-ID: CPS-2496
Change-Id: I66f3a215188eed6dd7c83a52ce831d97f9c0db46
Signed-off-by: sourabh_sourabh <sourabh.sourabh@est.tech>
Diffstat (limited to 'dmi-stub')
| -rw-r--r-- | dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml | 72 | ||||
| -rw-r--r-- | dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml | 5 |
2 files changed, 2 insertions, 75 deletions
diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml b/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml index 3d7ccf6b..4da597ba 100644 --- a/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml +++ b/dmi-stub/dmi-plugin-demo-and-csit-stub-app/pom.xml @@ -27,76 +27,6 @@ <artifactId>dmi-plugin-demo-and-csit-stub-app</artifactId> - <properties> - <app>org.onap.cps.ncmp.dmi.rest.stub.DmiDemoApplication</app> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - <base.image>${docker.pull.registry}/onap/integration-java17:12.0.0</base.image> - <image.tag>${project.version}-${maven.build.timestamp}</image.tag> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>com.google.cloud.tools</groupId> - <artifactId>jib-maven-plugin</artifactId> - <configuration> - <container> - <mainClass>${app}</mainClass> - <creationTime>USE_CURRENT_TIMESTAMP</creationTime> - </container> - <from> - <image>${base.image}</image> - </from> - <to> - <tags> - <tag>latest</tag> - </tags> - <image>${docker.push.registry}/onap/${image.name}:${image.tag}</image> - </to> - </configuration> - <executions> - <execution> - <phase>package</phase> - <id>build</id> - <goals> - <goal>dockerBuild</goal> - </goals> - </execution> - <execution> - <phase>deploy</phase> - <id>buildAndPush</id> - <goals> - <goal>build</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> - </build> - - <profiles> - <profile> - <id>docker</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <image.name>dmi-plugin-demo-and-csit-stub</image.name> - </properties> - <build> - <plugins> - <plugin> - <groupId>com.google.cloud.tools</groupId> - <artifactId>jib-maven-plugin</artifactId> - <version>3.3.2</version> - </plugin> - </plugins> - </build> - </profile> - </profiles> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> @@ -127,7 +57,5 @@ </exclusion> </exclusions> </dependency> - - </dependencies> </project>
\ No newline at end of file diff --git a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml b/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml index 3bb8324b..5e2886e5 100644 --- a/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml +++ b/dmi-stub/dmi-plugin-demo-and-csit-stub-service/pom.xml @@ -24,9 +24,8 @@ <artifactId>dmi-plugin-demo-and-csit-stub</artifactId> <version>1.6.0-SNAPSHOT</version> </parent> - <artifactId>dmi-plugin-demo-and-csit-stub-service</artifactId> - + <artifactId>dmi-plugin-demo-and-csit-stub-service</artifactId> <dependencies> <dependency> @@ -136,6 +135,7 @@ <plugin> <groupId>org.codehaus.gmavenplus</groupId> <artifactId>gmavenplus-plugin</artifactId> + <version>4.0.1</version> <executions> <execution> <goals> @@ -160,5 +160,4 @@ </plugins> </build> - </project>
\ No newline at end of file |