diff --git a/.gitignore b/.gitignore index ff04b28c..67c83748 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,5 @@ hs_err_pid* alf_data /src/main/resources/alfresco-global.properties /src/main/resources/alfresco/extension/custom-log4j.properties + +libreoffice-dist-*-linux.gz diff --git a/_ci/build.sh b/_ci/build.sh index 21675ee3..285c1061 100644 --- a/_ci/build.sh +++ b/_ci/build.sh @@ -11,7 +11,7 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../" mvn -B -U \ clean install \ -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true \ - "-P${PROFILE}" + "-P${PROFILE},docker-it-setup" docker ps -a -q | xargs -r -l docker stop ; docker ps -a -q | xargs -r -l docker rm diff --git a/alfresco-docker-alfresco-pdf-renderer/pom.xml b/alfresco-docker-alfresco-pdf-renderer/pom.xml index af3d4872..bf2143ab 100644 --- a/alfresco-docker-alfresco-pdf-renderer/pom.xml +++ b/alfresco-docker-alfresco-pdf-renderer/pom.xml @@ -56,7 +56,6 @@ org.springframework.boot spring-boot-maven-plugin - ${dependency.spring-boot.version} @@ -69,6 +68,14 @@ org.codehaus.mojo license-maven-plugin + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + io.fabric8 fabric8-maven-plugin @@ -91,6 +98,19 @@ + + docker-it-setup + + + + + io.fabric8 + docker-maven-plugin + + + + + local diff --git a/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceTest.java b/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java similarity index 95% rename from alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceTest.java rename to alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java index d195c6a8..9447a04b 100644 --- a/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceTest.java +++ b/alfresco-docker-alfresco-pdf-renderer/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java @@ -42,7 +42,7 @@ import org.springframework.test.context.junit4.SpringRunner; */ @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class AlfrescoPdfRendererQueueTransformServiceTest extends AbstractQueueTransformServiceIT +public class AlfrescoPdfRendererQueueTransformServiceIT extends AbstractQueueTransformServiceIT { @Override protected TransformRequest buildRequest() diff --git a/alfresco-docker-imagemagick/pom.xml b/alfresco-docker-imagemagick/pom.xml index 7e776fd3..1a11fe0e 100644 --- a/alfresco-docker-imagemagick/pom.xml +++ b/alfresco-docker-imagemagick/pom.xml @@ -56,7 +56,6 @@ org.springframework.boot spring-boot-maven-plugin - ${dependency.spring-boot.version} @@ -69,6 +68,14 @@ org.codehaus.mojo license-maven-plugin + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + io.fabric8 fabric8-maven-plugin @@ -91,6 +98,19 @@ + + docker-it-setup + + + + + io.fabric8 + docker-maven-plugin + + + + + local diff --git a/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceTest.java b/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java similarity index 95% rename from alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceTest.java rename to alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java index 81739e7b..dcb03cd3 100644 --- a/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceTest.java +++ b/alfresco-docker-imagemagick/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java @@ -42,7 +42,7 @@ import org.springframework.test.context.junit4.SpringRunner; */ @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class ImageMagickQueueTransformServiceTest extends AbstractQueueTransformServiceIT +public class ImageMagickQueueTransformServiceIT extends AbstractQueueTransformServiceIT { @Override protected TransformRequest buildRequest() diff --git a/alfresco-docker-libreoffice/pom.xml b/alfresco-docker-libreoffice/pom.xml index 9c4180fb..176ebf47 100644 --- a/alfresco-docker-libreoffice/pom.xml +++ b/alfresco-docker-libreoffice/pom.xml @@ -64,7 +64,6 @@ org.springframework.boot spring-boot-maven-plugin - ${dependency.spring-boot.version} @@ -77,6 +76,14 @@ org.codehaus.mojo license-maven-plugin + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + io.fabric8 fabric8-maven-plugin @@ -99,6 +106,19 @@ + + docker-it-setup + + + + + io.fabric8 + docker-maven-plugin + + + + + local diff --git a/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceTest.java b/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java similarity index 95% rename from alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceTest.java rename to alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java index 6b676b36..45b153d8 100644 --- a/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceTest.java +++ b/alfresco-docker-libreoffice/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java @@ -41,7 +41,7 @@ import org.springframework.test.context.junit4.SpringRunner; */ @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class LibreOfficeQueueTransformServiceTest extends AbstractQueueTransformServiceIT +public class LibreOfficeQueueTransformServiceIT extends AbstractQueueTransformServiceIT { @Override protected TransformRequest buildRequest() diff --git a/alfresco-docker-tika/pom.xml b/alfresco-docker-tika/pom.xml index 3181d986..6bcd633e 100644 --- a/alfresco-docker-tika/pom.xml +++ b/alfresco-docker-tika/pom.xml @@ -128,7 +128,6 @@ org.springframework.boot spring-boot-maven-plugin - ${dependency.spring-boot.version} @@ -137,6 +136,14 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + org.codehaus.mojo license-maven-plugin @@ -163,6 +170,19 @@ + + docker-it-setup + + + + + io.fabric8 + docker-maven-plugin + + + + + local diff --git a/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceTest.java b/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java similarity index 96% rename from alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceTest.java rename to alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java index 7c804f0b..8515b054 100644 --- a/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceTest.java +++ b/alfresco-docker-tika/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java @@ -42,7 +42,7 @@ import org.springframework.test.context.junit4.SpringRunner; */ @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class TikaQueueTransformServiceTest extends AbstractQueueTransformServiceIT +public class TikaQueueTransformServiceIT extends AbstractQueueTransformServiceIT { @Override protected TransformRequest buildRequest() diff --git a/alfresco-transformer-base/pom.xml b/alfresco-transformer-base/pom.xml index 60ca4a4e..b2dca2b0 100644 --- a/alfresco-transformer-base/pom.xml +++ b/alfresco-transformer-base/pom.xml @@ -79,22 +79,6 @@ - - org.apache.activemq.tooling - maven-activemq-plugin - 5.7.0 - - - - true - - - run - - process-test-classes - - - diff --git a/pom.xml b/pom.xml index 4eb4135a..47ae55e7 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,6 @@ 1.8 latest 2.0.12 - 2.1.1.RELEASE 7.3 8.8 3.0.1.1 @@ -204,11 +203,101 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + 1 + true + + + + default-test + + test + + test + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + 1 + true + + + + + integration-test + verify + + + + io.fabric8 fabric8-maven-plugin 4.1.0 + + io.fabric8 + docker-maven-plugin + 0.26.1 + true + + 1.29 + Always + true + + + + activemq + alfresco/alfresco-activemq:5.15.6 + + activemq + + transform + activemq + + + 8161:8161 + 5672:5672 + 61616:61616 + + + Apache ActiveMQ 5.15.6 .* started + + 500 + 100 + + kill 1 + kill -9 1 + + + + + + + + + before-integration-tests + pre-integration-test + + + start + + + + after-integration-tests + post-integration-test + + stop + + + +