ATS-864: Switch from fabric8 to docker mvn plugin (#436)

* ATS-864: Switch from fabric8 to docker mvn plugin

* moved docker-maven-plugin config to execution

* Update to latest docker-maven-plugin

* remove unnecessary config

Co-authored-by: David Edwards <david.edwards@alfresco.com>
Co-authored-by: Marcello Teodori <151025+mteodori@users.noreply.github.com>
This commit is contained in:
Nebil Kisa 2022-02-23 18:48:19 +00:00 committed by GitHub
parent 8c6313ad7e
commit 4429ba2823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 513 additions and 732 deletions

View File

@ -14,9 +14,6 @@ updates:
timezone: Europe/London timezone: Europe/London
open-pull-requests-limit: 99 open-pull-requests-limit: 99
ignore: ignore:
- dependency-name: io.fabric8:fabric8-maven-plugin
versions:
- "> 4.4.0, < 4.5"
registries: registries:
- maven-alfresco-internal - maven-alfresco-internal
- package-ecosystem: docker - package-ecosystem: docker

View File

@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-transform-core-aio-boot</artifactId> <artifactId>alfresco-transform-core-aio-boot</artifactId>
<name>Alfresco Core All-In-One Transformer Spring Boot</name> <name>Alfresco Core All-In-One Transformer Spring Boot</name>
<packaging>jar</packaging>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
@ -104,43 +102,37 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>docker-it-setup</id> <id>docker-it-setup</id>
<!-- raises an ActiveMq container for the Integration Tests --> <!-- raises an ActiveMq container for the Integration Tests -->
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<executions>
<execution>
<id>integration-tests</id>
<goals>
<goal>start</goal>
<goal>stop</goal>
</goals>
<configuration> <configuration>
<images> <images>
<image> <image>
<alias>activemq</alias>
<name>alfresco/alfresco-activemq:5.16.1</name> <name>alfresco/alfresco-activemq:5.16.1</name>
<run> <run>
<hostname>activemq</hostname> <hostname>activemq</hostname>
@ -150,7 +142,7 @@
<port>61616:61616</port> <port>61616:61616</port>
</ports> </ports>
<wait> <wait>
<log>Apache ActiveMQ 5.16.1 .* started</log> <log>Apache ActiveMQ .* started</log>
<time>20000</time> <time>20000</time>
<kill>500</kill> <kill>500</kill>
<shutdown>100</shutdown> <shutdown>100</shutdown>
@ -161,9 +153,7 @@
</wait> </wait>
</run> </run>
</image> </image>
<image> <image>
<alias>aio</alias>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<run> <run>
<ports> <ports>
@ -187,6 +177,8 @@
</image> </image>
</images> </images>
</configuration> </configuration>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -198,20 +190,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image>
</images>
</configuration>
<executions> <executions>
<execution> <execution>
<id>build-image</id> <id>build-image</id>
@ -219,6 +198,19 @@
<goals> <goals>
<goal>build</goal> <goal>build</goal>
</goals> </goals>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<contextDir>${project.basedir}</contextDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image>
</images>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -232,7 +224,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration> <configuration>
<images> <images>
<!-- QuayIO image --> <!-- QuayIO image -->
@ -240,7 +232,7 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -250,7 +242,7 @@
<image> <image>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -260,16 +252,9 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>build-image</id>
<phase>package</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
<execution>
<id>push-image</id>
<phase>install</phase> <phase>install</phase>
<goals> <goals>
<goal>build</goal>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
</execution> </execution>
@ -285,15 +270,15 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration combine.self="override"> <configuration>
<images> <images>
<!-- QuayIO image --> <!-- QuayIO image -->
<image> <image>
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -303,7 +288,7 @@
<image> <image>
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -313,8 +298,6 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>build-push-image</id>
<phase>deploy</phase>
<goals> <goals>
<goal>build</goal> <goal>build</goal>
<goal>push</goal> <goal>push</goal>

View File

@ -3,7 +3,6 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-transform-core-aio</artifactId> <artifactId>alfresco-transform-core-aio</artifactId>
<name>Alfresco Core All-In-One Transformer</name> <name>Alfresco Core All-In-One Transformer</name>
<packaging>jar</packaging>
<parent> <parent>
<artifactId>alfresco-transform-core</artifactId> <artifactId>alfresco-transform-core</artifactId>
@ -56,21 +55,12 @@
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-transform-imagemagick-boot</artifactId> <artifactId>alfresco-transform-imagemagick-boot</artifactId>
<name>Alfresco ImageMagick Transformer Spring Boot</name> <name>Alfresco ImageMagick Transformer Spring Boot</name>
<packaging>jar</packaging>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
@ -66,30 +66,14 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -101,20 +85,29 @@
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>docker-it-setup</id> <id>docker-it-setup</id>
<!-- raises an ActiveMq container for the Integration Tests --> <!-- raises an ActiveMq container for the Integration Tests -->
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<executions>
<execution>
<id>integration-tests</id>
<goals>
<goal>start</goal>
<goal>stop</goal>
</goals>
<configuration> <configuration>
<images> <images>
<image> <image>
<alias>activemq</alias>
<name>alfresco/alfresco-activemq:5.16.1</name> <name>alfresco/alfresco-activemq:5.16.1</name>
<run> <run>
<hostname>activemq</hostname> <hostname>activemq</hostname>
@ -135,9 +128,7 @@
</wait> </wait>
</run> </run>
</image> </image>
<image> <image>
<alias>imagemagick</alias>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<run> <run>
<ports> <ports>
@ -161,6 +152,8 @@
</image> </image>
</images> </images>
</configuration> </configuration>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -172,20 +165,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image>
</images>
</configuration>
<executions> <executions>
<execution> <execution>
<id>build-image</id> <id>build-image</id>
@ -193,6 +173,19 @@
<goals> <goals>
<goal>build</goal> <goal>build</goal>
</goals> </goals>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<contextDir>${project.basedir}</contextDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image>
</images>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -206,7 +199,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration> <configuration>
<images> <images>
<!-- QuayIO image --> <!-- QuayIO image -->
@ -214,7 +207,7 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -224,7 +217,7 @@
<image> <image>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -234,16 +227,9 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>build-image</id>
<phase>package</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
<execution>
<id>push-image</id>
<phase>install</phase> <phase>install</phase>
<goals> <goals>
<goal>build</goal>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
</execution> </execution>
@ -259,15 +245,15 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration combine.self="override"> <configuration>
<images> <images>
<!-- QuayIO image --> <!-- QuayIO image -->
<image> <image>
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -277,7 +263,7 @@
<image> <image>
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -287,8 +273,6 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>build-push-image</id>
<phase>deploy</phase>
<goals> <goals>
<goal>build</goal> <goal>build</goal>
<goal>push</goal> <goal>push</goal>

View File

@ -3,7 +3,6 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-transform-imagemagick</artifactId> <artifactId>alfresco-transform-imagemagick</artifactId>
<name>Alfresco ImageMagick Transformer</name> <name>Alfresco ImageMagick Transformer</name>
<packaging>jar</packaging>
<parent> <parent>
<artifactId>alfresco-transform-core</artifactId> <artifactId>alfresco-transform-core</artifactId>
@ -18,7 +17,6 @@
<artifactId>alfresco-transformer-base</artifactId> <artifactId>alfresco-transformer-base</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
@ -27,14 +25,6 @@
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-transform-libreoffice-boot</artifactId> <artifactId>alfresco-transform-libreoffice-boot</artifactId>
<name>Alfresco LibreOffice Transformer Spring Boot </name> <name>Alfresco LibreOffice Transformer Spring Boot </name>
<packaging>jar</packaging>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
@ -74,30 +74,14 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -109,20 +93,29 @@
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>docker-it-setup</id> <id>docker-it-setup</id>
<!-- raises an ActiveMq container for the Integration Tests --> <!-- raises an ActiveMq container for the Integration Tests -->
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<executions>
<execution>
<id>integration-tests</id>
<goals>
<goal>start</goal>
<goal>stop</goal>
</goals>
<configuration> <configuration>
<images> <images>
<image> <image>
<alias>activemq</alias>
<name>alfresco/alfresco-activemq:5.16.1</name> <name>alfresco/alfresco-activemq:5.16.1</name>
<run> <run>
<hostname>activemq</hostname> <hostname>activemq</hostname>
@ -143,9 +136,7 @@
</wait> </wait>
</run> </run>
</image> </image>
<image> <image>
<alias>libreoffice</alias>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<run> <run>
<ports> <ports>
@ -169,6 +160,8 @@
</image> </image>
</images> </images>
</configuration> </configuration>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -180,20 +173,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image>
</images>
</configuration>
<executions> <executions>
<execution> <execution>
<id>build-image</id> <id>build-image</id>
@ -201,6 +181,19 @@
<goals> <goals>
<goal>build</goal> <goal>build</goal>
</goals> </goals>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<contextDir>${project.basedir}</contextDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image>
</images>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -214,7 +207,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration> <configuration>
<images> <images>
<!-- QuayIO image --> <!-- QuayIO image -->
@ -222,7 +215,7 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -232,7 +225,7 @@
<image> <image>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -242,16 +235,9 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>build-image</id>
<phase>package</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
<execution>
<id>push-image</id>
<phase>install</phase> <phase>install</phase>
<goals> <goals>
<goal>build</goal>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
</execution> </execution>
@ -267,15 +253,15 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration combine.self="override"> <configuration>
<images> <images>
<!-- QuayIO image --> <!-- QuayIO image -->
<image> <image>
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -285,7 +271,7 @@
<image> <image>
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -293,16 +279,6 @@
</image> </image>
</images> </images>
</configuration> </configuration>
<executions>
<execution>
<id>build-push-image</id>
<phase>deploy</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

View File

@ -3,7 +3,6 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-transform-libreoffice</artifactId> <artifactId>alfresco-transform-libreoffice</artifactId>
<name>Alfresco LibreOffice Transformer</name> <name>Alfresco LibreOffice Transformer</name>
<packaging>jar</packaging>
<parent> <parent>
<artifactId>alfresco-transform-core</artifactId> <artifactId>alfresco-transform-core</artifactId>
@ -18,12 +17,10 @@
<artifactId>alfresco-transformer-base</artifactId> <artifactId>alfresco-transformer-base</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dom4j</groupId> <groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId> <artifactId>dom4j</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-jodconverter-core</artifactId> <artifactId>alfresco-jodconverter-core</artifactId>
@ -44,15 +41,6 @@
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-transform-misc-boot</artifactId> <artifactId>alfresco-transform-misc-boot</artifactId>
<name>Alfresco Miscellaneous Transformer Spring Boot</name> <name>Alfresco Miscellaneous Transformer Spring Boot</name>
<packaging>jar</packaging>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
@ -64,30 +62,14 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -99,20 +81,29 @@
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>docker-it-setup</id> <id>docker-it-setup</id>
<!-- raises an ActiveMq container for the Integration Tests --> <!-- raises an ActiveMq container for the Integration Tests -->
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<executions>
<execution>
<id>integration-tests</id>
<goals>
<goal>start</goal>
<goal>stop</goal>
</goals>
<configuration> <configuration>
<images> <images>
<image> <image>
<alias>activemq</alias>
<name>alfresco/alfresco-activemq:5.16.1</name> <name>alfresco/alfresco-activemq:5.16.1</name>
<run> <run>
<hostname>activemq</hostname> <hostname>activemq</hostname>
@ -133,9 +124,7 @@
</wait> </wait>
</run> </run>
</image> </image>
<image> <image>
<alias>misc</alias>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<run> <run>
<ports> <ports>
@ -159,6 +148,8 @@
</image> </image>
</images> </images>
</configuration> </configuration>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -170,20 +161,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image>
</images>
</configuration>
<executions> <executions>
<execution> <execution>
<id>build-image</id> <id>build-image</id>
@ -191,6 +169,19 @@
<goals> <goals>
<goal>build</goal> <goal>build</goal>
</goals> </goals>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<contextDir>${project.basedir}</contextDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image>
</images>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -204,7 +195,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration> <configuration>
<images> <images>
<!-- QuayIO image --> <!-- QuayIO image -->
@ -212,7 +203,7 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -222,7 +213,7 @@
<image> <image>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -232,16 +223,9 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>build-image</id>
<phase>package</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
<execution>
<id>push-image</id>
<phase>install</phase> <phase>install</phase>
<goals> <goals>
<goal>build</goal>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
</execution> </execution>
@ -257,15 +241,15 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration combine.self="override"> <configuration>
<images> <images>
<!-- QuayIO image --> <!-- QuayIO image -->
<image> <image>
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -275,7 +259,7 @@
<image> <image>
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -283,16 +267,6 @@
</image> </image>
</images> </images>
</configuration> </configuration>
<executions>
<execution>
<id>build-push-image</id>
<phase>deploy</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

View File

@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-transform-misc</artifactId> <artifactId>alfresco-transform-misc</artifactId>
<name>Alfresco Miscellaneous Transformer</name> <name>Alfresco Miscellaneous Transformer</name>
<packaging>jar</packaging>
<parent> <parent>
<artifactId>alfresco-transform-core</artifactId> <artifactId>alfresco-transform-core</artifactId>
@ -83,14 +81,6 @@
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-transform-pdf-renderer-boot</artifactId> <artifactId>alfresco-transform-pdf-renderer-boot</artifactId>
<name>Alfresco Pdf Renderer Spring Boot</name> <name>Alfresco Pdf Renderer Spring Boot</name>
<packaging>jar</packaging>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
@ -64,30 +62,14 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -99,20 +81,29 @@
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>docker-it-setup</id> <id>docker-it-setup</id>
<!-- raises an ActiveMq container for the Integration Tests --> <!-- raises an ActiveMq container for the Integration Tests -->
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<executions>
<execution>
<id>integration-tests</id>
<goals>
<goal>start</goal>
<goal>stop</goal>
</goals>
<configuration> <configuration>
<images> <images>
<image> <image>
<alias>activemq</alias>
<name>alfresco/alfresco-activemq:5.16.1</name> <name>alfresco/alfresco-activemq:5.16.1</name>
<run> <run>
<hostname>activemq</hostname> <hostname>activemq</hostname>
@ -133,9 +124,7 @@
</wait> </wait>
</run> </run>
</image> </image>
<image> <image>
<alias>alfresco-pdf-renderer</alias>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<run> <run>
<ports> <ports>
@ -159,6 +148,8 @@
</image> </image>
</images> </images>
</configuration> </configuration>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -170,20 +161,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image>
</images>
</configuration>
<executions> <executions>
<execution> <execution>
<id>build-image</id> <id>build-image</id>
@ -191,6 +169,19 @@
<goals> <goals>
<goal>build</goal> <goal>build</goal>
</goals> </goals>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<contextDir>${project.basedir}</contextDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image>
</images>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -204,7 +195,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration> <configuration>
<images> <images>
<!-- QuayIO image --> <!-- QuayIO image -->
@ -212,7 +203,7 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -222,7 +213,7 @@
<image> <image>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -232,16 +223,9 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>build-image</id>
<phase>package</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
<execution>
<id>push-image</id>
<phase>install</phase> <phase>install</phase>
<goals> <goals>
<goal>build</goal>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
</execution> </execution>
@ -257,15 +241,15 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration combine.self="override"> <configuration>
<images> <images>
<!-- QuayIO image --> <!-- QuayIO image -->
<image> <image>
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -275,7 +259,7 @@
<image> <image>
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -285,8 +269,6 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>build-push-image</id>
<phase>deploy</phase>
<goals> <goals>
<goal>build</goal> <goal>build</goal>
<goal>push</goal> <goal>push</goal>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-transform-pdf-renderer</artifactId> <artifactId>alfresco-transform-pdf-renderer</artifactId>
<name>Alfresco Pdf Renderer Transformer</name> <name>Alfresco Pdf Renderer Transformer</name>
<packaging>jar</packaging>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
@ -25,14 +25,6 @@
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-transform-tika-boot</artifactId> <artifactId>alfresco-transform-tika-boot</artifactId>
<name>Alfresco Tika Transformer Spring Boot</name> <name>Alfresco Tika Transformer Spring Boot</name>
<packaging>jar</packaging>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
@ -146,21 +146,6 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
@ -169,7 +154,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
@ -181,20 +165,29 @@
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>docker-it-setup</id> <id>docker-it-setup</id>
<!-- raises an ActiveMq container for the Integration Tests --> <!-- raises an ActiveMq container for the Integration Tests -->
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<executions>
<execution>
<id>integration-tests</id>
<goals>
<goal>start</goal>
<goal>stop</goal>
</goals>
<configuration> <configuration>
<images> <images>
<image> <image>
<alias>activemq</alias>
<name>alfresco/alfresco-activemq:5.16.1</name> <name>alfresco/alfresco-activemq:5.16.1</name>
<run> <run>
<hostname>activemq</hostname> <hostname>activemq</hostname>
@ -215,9 +208,7 @@
</wait> </wait>
</run> </run>
</image> </image>
<image> <image>
<alias>tika</alias>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<run> <run>
<ports> <ports>
@ -241,6 +232,8 @@
</image> </image>
</images> </images>
</configuration> </configuration>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@ -252,20 +245,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image>
</images>
</configuration>
<executions> <executions>
<execution> <execution>
<id>build-image</id> <id>build-image</id>
@ -273,6 +253,19 @@
<goals> <goals>
<goal>build</goal> <goal>build</goal>
</goals> </goals>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<contextDir>${project.basedir}</contextDir>
<buildOptions>
<squash>true</squash>
</buildOptions>
</build>
</image>
</images>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@ -286,7 +279,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration> <configuration>
<images> <images>
<!-- QuayIO image --> <!-- QuayIO image -->
@ -294,7 +287,7 @@
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -304,7 +297,7 @@
<image> <image>
<name>${image.name}:${image.tag}</name> <name>${image.name}:${image.tag}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -314,16 +307,9 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>build-image</id>
<phase>package</phase>
<goals>
<goal>build</goal>
</goals>
</execution>
<execution>
<id>push-image</id>
<phase>install</phase> <phase>install</phase>
<goals> <goals>
<goal>build</goal>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
</execution> </execution>
@ -339,15 +325,15 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<configuration combine.self="override"> <configuration>
<images> <images>
<!-- QuayIO image --> <!-- QuayIO image -->
<image> <image>
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry> <registry>${image.registry}</registry>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -357,7 +343,7 @@
<image> <image>
<name>${image.name}:${project.version}</name> <name>${image.name}:${project.version}</name>
<build> <build>
<dockerFileDir>${project.basedir}/</dockerFileDir> <contextDir>${project.basedir}</contextDir>
<buildOptions> <buildOptions>
<squash>true</squash> <squash>true</squash>
</buildOptions> </buildOptions>
@ -367,8 +353,6 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>build-push-image</id>
<phase>deploy</phase>
<goals> <goals>
<goal>build</goal> <goal>build</goal>
<goal>push</goal> <goal>push</goal>

View File

@ -3,7 +3,6 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>alfresco-transform-tika</artifactId> <artifactId>alfresco-transform-tika</artifactId>
<name>Alfresco Tika Transformer</name> <name>Alfresco Tika Transformer</name>
<packaging>jar</packaging>
<parent> <parent>
<artifactId>alfresco-transform-core</artifactId> <artifactId>alfresco-transform-core</artifactId>
@ -117,14 +116,6 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>

View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<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> <modelVersion>4.0.0</modelVersion>
@ -5,7 +6,6 @@
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-transform-core</artifactId> <artifactId>alfresco-transform-core</artifactId>
<version>2.5.7-A4-SNAPSHOT</version> <version>2.5.7-A4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>alfresco-transformer-base</artifactId> <artifactId>alfresco-transformer-base</artifactId>
@ -80,7 +80,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.2.2</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>

45
pom.xml
View File

@ -10,6 +10,7 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.3</version> <version>2.6.3</version>
<relativePath/>
</parent> </parent>
<properties> <properties>
@ -34,7 +35,6 @@
<parent.core.deploy.skip>false</parent.core.deploy.skip> <parent.core.deploy.skip>false</parent.core.deploy.skip>
</properties> </properties>
<profiles> <profiles>
<profile> <profile>
<id>full-build</id> <id>full-build</id>
@ -113,6 +113,7 @@
</modules> </modules>
</profile> </profile>
</profiles> </profiles>
<scm> <scm>
<connection>scm:git:https://github.com/Alfresco/alfresco-transform-core.git</connection> <connection>scm:git:https://github.com/Alfresco/alfresco-transform-core.git</connection>
<developerConnection>scm:git:https://github.com/Alfresco/alfresco-transform-core.git</developerConnection> <developerConnection>scm:git:https://github.com/Alfresco/alfresco-transform-core.git</developerConnection>
@ -273,7 +274,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.3.2</version>
<configuration> <configuration>
<doclint>none</doclint> <doclint>none</doclint>
</configuration> </configuration>
@ -299,6 +299,7 @@
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version> <version>2.5.3</version>
<configuration> <configuration>
@ -379,15 +380,6 @@
<buildDirectory>${project.build.directory}</buildDirectory> <buildDirectory>${project.build.directory}</buildDirectory>
</systemPropertyVariables> </systemPropertyVariables>
</configuration> </configuration>
<executions>
<execution>
<id>default-test</id>
<goals>
<goal>test</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -396,42 +388,11 @@
<forkCount>1</forkCount> <forkCount>1</forkCount>
<reuseForks>true</reuseForks> <reuseForks>true</reuseForks>
</configuration> </configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>4.4.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<version>0.39.0</version> <version>0.39.0</version>
<extensions>true</extensions>
<executions>
<execution>
<id>before-integration-tests</id>
<phase>pre-integration-test</phase>
<goals>
<goal>stop</goal>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>after-integration-tests</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin> </plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>