Compare commits

...

9 Commits

Author SHA1 Message Date
alfresco-build
ba713e90bf [maven-release-plugin] prepare release acs-community-packaging-6.0.4-testRC5 2018-03-19 15:46:13 +00:00
alfresco-build
2eec1f3325 [maven-release-plugin] prepare for next development iteration 2018-03-19 14:41:11 +00:00
alfresco-build
3c7b265a4f [maven-release-plugin] prepare release acs-community-packaging-6.0.4-testRC4 2018-03-19 14:41:02 +00:00
alfresco-build
a378d6e2df [maven-release-plugin] prepare for next development iteration 2018-03-19 14:19:21 +00:00
alfresco-build
b6eb0441b6 [maven-release-plugin] prepare release acs-community-packaging-6.0.4-testRC3 2018-03-19 14:19:15 +00:00
Alexandru-Eusebiu Epure
ab1ca261c6 REPO-3342: changed project version from 6.0.5-SNAPSHOT to 6.0.4-SNAPSHOT
Refactor fabric8 maven plugin and the 3 profiles.
2018-03-19 15:49:42 +02:00
alfresco-build
9bffff4b13 [maven-release-plugin] prepare for next development iteration 2018-03-16 14:17:34 +00:00
alfresco-build
3f9055894a [maven-release-plugin] prepare release acs-community-packaging-6.0.4-testRC2 2018-03-16 14:17:28 +00:00
Alexandru-Eusebiu Epure
e83e8bdb25 REPO-3342: changed release stage repository from /releases to /internal-releases 2018-03-16 15:06:09 +02:00
8 changed files with 72 additions and 64 deletions

View File

@@ -1,5 +1,4 @@
<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/maven-v4_0_0.xsd">
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-content-services-community-full-distribution</artifactId>
<name>Alfresco Content Services Community Full Distribution zip</name>
@@ -8,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>6.0.4-SNAPSHOT</version>
<version>6.0.4-testRC5</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -7,8 +7,8 @@ FROM quay.io/alfresco/alfresco-base-tomcat:0.1.0
ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.0/alfresco-pdf-renderer-1.0-linux.tgz
ENV LIBREOFFICE_RPM_URL=http://download.documentfoundation.org/libreoffice/stable/5.4.5/rpm/x86_64/LibreOffice_5.4.5_Linux_x86-64_rpm.tar.gz
ENV IMAGEMAGICK_RPM_URL=https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-7.0.7-26.x86_64.rpm
ENV IMAGEMAGICK_LIB_RPM_URL=https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs-7.0.7-26.x86_64.rpm
ENV IMAGEMAGICK_RPM_URL=https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-7.0.7-27.x86_64.rpm
ENV IMAGEMAGICK_LIB_RPM_URL=https://www.imagemagick.org/download/linux/CentOS/x86_64/ImageMagick-libs-7.0.7-27.x86_64.rpm
RUN wget $ALFRESCO_PDF_RENDERER_LIB_RPM_URL && \
tar xf alfresco-pdf-renderer-*-linux.tgz -C /usr/bin && \

View File

@@ -1,5 +1,4 @@
<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">
<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>
<artifactId>content-services-community-docker-alfresco</artifactId>
<name>ACS Community Docker Image Builder for Alfresco Community</name>
@@ -8,10 +7,16 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>6.0.4-SNAPSHOT</version>
<version>6.0.4-testRC5</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
<image.name>alfresco/alfresco-content-services-community</image.name>
<image.registry>quay.io</image.registry>
<public.image.registry>registry.hub.docker.com</public.image.registry>
</properties>
<dependencies>
<dependency>
<groupId>org.alfresco</groupId>
@@ -162,7 +167,7 @@
</execution>
</executions>
</plugin>
<!--
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
@@ -170,29 +175,15 @@
<configuration>
<images>
<image>
<name>alfresco/alfresco-content-services</name>
<registry>quay.io</registry>
<name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<tags>
<tag>${project.version}</tag>
</tags>
</build>
</image>
</images>
</configuration>
<executions>
<execution>
<phase>deploy</phase>
<id>buildAndPush</id>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
-->
</plugins>
</build>
@@ -205,23 +196,10 @@
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>${dependency.fabric8.version}</version>
<configuration>
<images>
<image>
<name>alfresco/alfresco-content-services-community</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<tags>
<tag>local</tag>
</tags>
</build>
</image>
</images>
</configuration>
<executions>
<execution>
<id>build-image</id>
<phase>install</phase>
<id>build</id>
<goals>
<goal>build</goal>
</goals>
@@ -231,29 +209,19 @@
</plugins>
</build>
</profile>
<profile>
<id>dockerImages</id>
<id>internal</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>${dependency.fabric8.version}</version>
<configuration>
<images>
<image>
<name>alfresco/alfresco-content-services-community:${bamboo.tag.name}</name>
<registry>quay.io</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
<executions>
<execution>
<id>build-push-image</id>
<phase>install</phase>
<id>buildAndPush</id>
<goals>
<goal>build</goal>
<goal>push</goal>
@@ -264,6 +232,49 @@
</plugins>
</build>
</profile>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>${dependency.fabric8.version}</version>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
<image>
<name>${image.name}:${image.tag}</name>
<registry>${public.image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
<executions>
<execution>
<id>build-push-image</id>
<phase>install</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

View File

@@ -1,5 +1,4 @@
<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">
<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>
<artifactId>content-services-community-docker-share</artifactId>
<name>ACS Community Docker image builder for Share</name>
@@ -8,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>6.0.4-SNAPSHOT</version>
<version>6.0.4-testRC5</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>acs-community-packaging</artifactId>
<name>Alfresco Content Services Community Packaging</name>
<version>6.0.4-SNAPSHOT</version>
<version>6.0.4-testRC5</version>
<packaging>pom</packaging>
<parent>
@@ -46,13 +46,13 @@
<connection>scm:git:git@github.com:Alfresco/acs-community-packaging.git</connection>
<developerConnection>scm:git:git@github.com:Alfresco/acs-community-packaging.git</developerConnection>
<url>https://github.com/Alfresco/acs-community-packaging</url>
<tag>HEAD</tag>
<tag>acs-community-packaging-6.0.4-testRC5</tag>
</scm>
<distributionManagement>
<repository>
<id>alfresco-internal</id>
<url>https://artifacts.alfresco.com/nexus/content/repositories/releases</url>
<url>https://artifacts.alfresco.com/nexus/content/repositories/internal-releases</url>
</repository>
<snapshotRepository>
<id>alfresco-internal-snapshots</id>
@@ -63,7 +63,7 @@
<properties>
<!-- Set to "Community Early Access" to add to the version.edition property in version.properties -->
<version.edition>Community</version.edition>
<bamboo.tag.name></bamboo.tag.name>
<image.tag>local</image.tag>
<dependency.alfresco-core.version>7.0</dependency.alfresco-core.version>
<dependency.alfresco-data-model.version>8.0</dependency.alfresco-data-model.version>

View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>6.0.4-SNAPSHOT</version>
<version>6.0.4-testRC5</version>
<relativePath>../pom.xml</relativePath>
</parent>
<packaging>pom</packaging>

View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>6.0.4-SNAPSHOT</version>
<version>6.0.4-testRC5</version>
<relativePath>../pom.xml</relativePath>
</parent>

View File

@@ -1,5 +1,4 @@
<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/maven-v4_0_0.xsd">
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-content-services-community-distribution</artifactId>
<name>Alfresco Content Services Community zip (WAR Installation)</name>
@@ -8,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>acs-community-packaging</artifactId>
<version>6.0.4-SNAPSHOT</version>
<version>6.0.4-testRC5</version>
<relativePath>../pom.xml</relativePath>
</parent>