inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Applied code review changes

Browse Source
This commit is contained in:
cagache
2018-06-20 15:32:17 +03:00
parent 701705a7ce
commit 91a64d6eb8
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@@ -328,6 +328,7 @@
</build>
</profile>
<!--Docker profiles-->
<!-- Profile used only to build docker images-->
<profile>
<id>buildDockerImage</id>
<build>
@@ -336,7 +337,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>${dependency.fabric8.version}</version>
<version>${fabric8.maven.version}</version>
<configuration>
<images>
<image>
@@ -362,6 +363,7 @@
</build>
</profile>
<!-- Profile used to build docker images with given tag and push them to the given image registry (quay.io) -->
<profile>
<id>internal</id>
<build>
@@ -370,7 +372,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>${dependency.fabric8.version}</version>
<version>${fabric8.maven.version}</version>
<configuration>
<images>
<image>
@@ -398,6 +400,8 @@
</build>
</profile>
<!-- Profile used to build and push docker images with latest tag to the given image registry (quay.io) and
hub.docker -->
<profile>
<id>master</id>
<build>
@@ -406,7 +410,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>${dependency.fabric8.version}</version>
<version>${fabric8.maven.version}</version>
<configuration>
<images>
<image>
@@ -440,6 +444,8 @@
</build>
</profile>
<!-- Profile used to build and push docker images with project.version tag to the given image registry (quay.io) and
hub.docker -->
<profile>
<id>release</id>
<build>
@@ -448,7 +454,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>${dependency.fabric8.version}</version>
<version>${fabric8.maven.version}</version>
<configuration>
<images>
<image>
@@ -509,7 +515,7 @@
<maven.resources.version>2.7</maven.resources.version>
<maven.tomcat.port>8080</maven.tomcat.port>
<fabric8.version>0.25.0</fabric8.version>
<fabric8.docker.version>0.25.0</fabric8.docker.version>
<mockito.version>1.10.19</mockito.version>
<postgresql.version>42.2.1</postgresql.version>
<postgresql.port>5432</postgresql.port>
@@ -536,7 +542,7 @@
<app.properties.test.include>**</app.properties.test.include>
<app.properties.test.folder>src/test/properties/local</app.properties.test.folder>
<dependency.fabric8.version>3.5.37</dependency.fabric8.version>
<fabric8.maven.version>3.5.37</fabric8.maven.version>
<image.name>imageNameNotSet</image.name>
<image.tag>latest</image.tag>
<image.registry>quay.io</image.registry>

2
rm-community/rm-community-repo/pom.xml
View File

@@ -130,7 +130,7 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${fabric8.version}</version>
<version>${fabric8.docker.version}</version>
<configuration>
<images>
<image>