diff options
| author |   Claudio David Gasparini <claudio.gasparini@pantheon.tech> | 2021-01-20 11:42:19 +0100 |
|---|---|---|
| committer | Claudio David Gasparini <claudio.gasparini@pantheon.tech> | 2021-01-22 10:45:51 +0100 |
| commit | f94db30218f59ce5110e890234440837027c22db (patch) | |
| tree | 2d09de0bae558f0f1b9f0b39b7428ec2f492708e | |
| parent | b17558915a61c1a2ee4385c69755589fec7c8c94 (diff) | |
Move jib plugin configuration from parent
and leave profile generating container under single module
responsible of such task
Issue-ID: CPS-22
Signed-off-by: Claudio David Gasparini <claudio.gasparini@pantheon.tech>
Change-Id: Iaf4b0d6ef8211aab0556288912a6a49bf4c98bfd
| -rwxr-xr-x | cps-parent/pom.xml | 51 | ||||
| -rwxr-xr-x | cps-rest/pom.xml | 41 |
2 files changed, 35 insertions, 57 deletions
diff --git a/cps-parent/pom.xml b/cps-parent/pom.xml index f427555aa1..c3b61541f6 100755 --- a/cps-parent/pom.xml +++ b/cps-parent/pom.xml @@ -59,57 +59,6 @@ </snapshotRepository> </distributionManagement> - <profiles> - <profile> - <id>docker</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>com.google.cloud.tools</groupId> - <artifactId>jib-maven-plugin</artifactId> - <version>${jib-maven-plugin.version}</version> - <configuration> - <container> - <mainClass>${app}</mainClass> - <creationTime>USE_CURRENT_TIMESTAMP</creationTime> - </container> - <from> - <image>${base.image}</image> - </from> - <to> - <image>${repository.name}</image> - <tags> - <tag>${tag.version}</tag> - </tags> - </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> - </profile> - </profiles> - <dependencyManagement> <dependencies> <dependency> diff --git a/cps-rest/pom.xml b/cps-rest/pom.xml index 128c56680b..49c3267dd9 100755 --- a/cps-rest/pom.xml +++ b/cps-rest/pom.xml @@ -1,6 +1,6 @@ <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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.cps</groupId>
@@ -98,10 +98,6 @@ <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>com.google.cloud.tools</groupId>
- <artifactId>jib-maven-plugin</artifactId>
- </plugin>
<!-- Swagger code generation. -->
<plugin>
<groupId>io.swagger.codegen.v3</groupId>
@@ -109,4 +105,37 @@ </plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>docker</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.cloud.tools</groupId>
+ <artifactId>jib-maven-plugin</artifactId>
+ <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>
+ </build>
+ </profile>
+ </profiles>
</project>
|