From 356f408528807f4822fa8faf9c00010227921a22 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Thu, 16 Nov 2017 12:07:52 +0000 Subject: [PATCH 01/29] REPO-3043 Use new tomcat base image (#8) --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 40dfaebe84..d117a97a3c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM tomcat:8.5.20-jre8-alpine +FROM quay.io/alfresco/alfresco-base-tomcat:0.1.0 RUN mkdir -p /usr/local/tomcat/shared/classes From a56e4e6785cf40be402aeff6918f81222721f128 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Fri, 17 Nov 2017 17:05:16 +0000 Subject: [PATCH 02/29] REPO-3044 Add LibreOffice config in Docker image --- docker/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index d117a97a3c..8f63bd7f5e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,3 +9,8 @@ COPY target/connector/* /usr/local/tomcat/lib/ RUN sed -i "s/shared.loader=/shared.loader=\${catalina.base}\/shared\/classes/" /usr/local/tomcat/conf/catalina.properties +RUN echo -e '\n\ +ooo.enabled=false\n\ +jodconverter.officeHome=/opt/libreoffice5.4/\n\ +jodconverter.enabled=true\n\ +' >> /usr/local/tomcat/shared/classes/alfresco-global.properties \ No newline at end of file From 4f9378d609b19e3b533fc2885b6ceb1dc42f6a8f Mon Sep 17 00:00:00 2001 From: Andrei Rebegea Date: Mon, 20 Nov 2017 10:30:30 +0200 Subject: [PATCH 03/29] REPO-3044: adding imageMagick paths properties --- docker/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 8f63bd7f5e..c725cdb0b5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -13,4 +13,8 @@ RUN echo -e '\n\ ooo.enabled=false\n\ jodconverter.officeHome=/opt/libreoffice5.4/\n\ jodconverter.enabled=true\n\ +img.root=/usr/lib64/ImageMagick-7.0.7\n\ +img.coders=/usr/lib64/ImageMagick-7.0.7/modules-Q16HDRI/coders\n\ +img.config=/usr/lib64/ImageMagick-7.0.7/config-Q16HDRI\n\ +img.exe=/usr/bin/convert\n\ ' >> /usr/local/tomcat/shared/classes/alfresco-global.properties \ No newline at end of file From e1a7e1358f4a084e8ff79bd3ea1a873754470dbf Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 20 Nov 2017 09:46:02 +0000 Subject: [PATCH 04/29] REPO-3044: added alfresco-pdf-rendere path --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index c725cdb0b5..6a05719acd 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -10,6 +10,7 @@ COPY target/connector/* /usr/local/tomcat/lib/ RUN sed -i "s/shared.loader=/shared.loader=\${catalina.base}\/shared\/classes/" /usr/local/tomcat/conf/catalina.properties RUN echo -e '\n\ +alfresco-pdf-renderer.exe=/usr/bin/alfresco-pdf-renderer\n\ ooo.enabled=false\n\ jodconverter.officeHome=/opt/libreoffice5.4/\n\ jodconverter.enabled=true\n\ From bcfedb6cc5d4f1e9107705e15a63b64727a7ad71 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Mon, 20 Nov 2017 10:16:17 +0000 Subject: [PATCH 05/29] REPO-3046 Add MMT and ROOT war to docker image --- docker/Dockerfile | 6 +++++- docker/pom.xml | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6a05719acd..eae69aeaf2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,11 +1,15 @@ FROM quay.io/alfresco/alfresco-base-tomcat:0.1.0 -RUN mkdir -p /usr/local/tomcat/shared/classes +RUN mkdir -p /usr/local/tomcat/shared/classes && \ + mkdir /usr/local/tomcat/alfresco-mmt RUN touch /usr/local/tomcat/shared/classes/alfresco-global.properties COPY target/war /usr/local/tomcat/webapps COPY target/connector/* /usr/local/tomcat/lib/ +COPY target/alfresco-mmt/* /usr/local/tomcat/alfresco-mmt/ +RUN rm -rf /usr/local/tomcat/webapps/ROOT +COPY target/server-root/* /usr/local/tomcat/webapps RUN sed -i "s/shared.loader=/shared.loader=\${catalina.base}\/shared\/classes/" /usr/local/tomcat/conf/catalina.properties diff --git a/docker/pom.xml b/docker/pom.xml index 2b7c6fa0f6..e1f48af927 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -18,6 +18,12 @@ ${project.version} war + + org.alfresco + alfresco-server-root + ${dependency.alfresco-server-root.version} + war + mysql mysql-connector-java @@ -33,6 +39,11 @@ postgresql ${dependency.postgresql.version} + + org.alfresco + alfresco-mmt + ${dependency.alfresco-mmt.version} + @@ -92,6 +103,22 @@ false ${project.build.directory}/connector + + org.alfresco + alfresco-mmt + ${dependency.alfresco-mmt.version} + jar + false + ${project.build.directory}/alfresco-mmt + + + org.alfresco + alfresco-server-root + ${dependency.alfresco-server-root.version} + war + false + ${project.build.directory}/server-root + From 0beae55709e581c6e14591335f8404a0826c758e Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Mon, 20 Nov 2017 11:01:33 +0000 Subject: [PATCH 06/29] REPO-3046 Change the base image to alfresco-base-repository --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index eae69aeaf2..d26f0d3864 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/alfresco/alfresco-base-tomcat:0.1.0 +FROM quay.io/alfresco/alfresco-base-repository:0.1.1 RUN mkdir -p /usr/local/tomcat/shared/classes && \ mkdir /usr/local/tomcat/alfresco-mmt From fc958d9ecb65b7ee2efb842a1351542d823e5e4e Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Mon, 20 Nov 2017 11:36:19 +0000 Subject: [PATCH 07/29] REPO-3046 Rename the root war for Docker image --- docker/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/pom.xml b/docker/pom.xml index e1f48af927..e7d975837c 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -118,6 +118,7 @@ war false ${project.build.directory}/server-root + ROOT.war From cd65fbc92e0c0d6163e6e044e31966a37a92dc18 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 20 Nov 2017 11:41:58 +0000 Subject: [PATCH 08/29] REPO-3044: Adding alfresco-pdf-rendere and ooo.direct values to A-G.P --- docker/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index d26f0d3864..600998b6e9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,9 +15,12 @@ RUN sed -i "s/shared.loader=/shared.loader=\${catalina.base}\/shared\/classes/" RUN echo -e '\n\ alfresco-pdf-renderer.exe=/usr/bin/alfresco-pdf-renderer\n\ -ooo.enabled=false\n\ -jodconverter.officeHome=/opt/libreoffice5.4/\n\ -jodconverter.enabled=true\n\ +\n\ +ooo.enabled=true\n\ +ooo.port=8100 +ooo.exe=/opt/libreoffice5.4/program/soffice.bin\n\ +jodconverter.enabled=false\n\ +\n\ img.root=/usr/lib64/ImageMagick-7.0.7\n\ img.coders=/usr/lib64/ImageMagick-7.0.7/modules-Q16HDRI/coders\n\ img.config=/usr/lib64/ImageMagick-7.0.7/config-Q16HDRI\n\ From 865ebe00712d738a894075b0917ca8e93f731a61 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 20 Nov 2017 11:57:11 +0000 Subject: [PATCH 09/29] REPO-3044: Adding alfresco-pdf-rendere and ooo.direct values to A-G.P --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 600998b6e9..8162421514 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,7 +17,7 @@ RUN echo -e '\n\ alfresco-pdf-renderer.exe=/usr/bin/alfresco-pdf-renderer\n\ \n\ ooo.enabled=true\n\ -ooo.port=8100 +ooo.port=8100\n\ ooo.exe=/opt/libreoffice5.4/program/soffice.bin\n\ jodconverter.enabled=false\n\ \n\ From 08314fa39090f3f6e6fc9fa577b3a3e2b5d86acc Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 20 Nov 2017 14:12:32 +0000 Subject: [PATCH 10/29] REPO-3044: Add alfresco-pdf-renderer.root value --- docker/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 8162421514..41e4c6bbcc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,8 @@ COPY target/server-root/* /usr/local/tomcat/webapps RUN sed -i "s/shared.loader=/shared.loader=\${catalina.base}\/shared\/classes/" /usr/local/tomcat/conf/catalina.properties RUN echo -e '\n\ -alfresco-pdf-renderer.exe=/usr/bin/alfresco-pdf-renderer\n\ +alfresco-pdf-renderer.root=/usr/bin/\n\ +alfresco-pdf-renderer.exe=${alfresco-pdf-renderer.root}/alfresco-pdf-renderer\n\ \n\ ooo.enabled=true\n\ ooo.port=8100\n\ From c7ac038df5de525b2a117d4e5497583de81cc09d Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Fri, 24 Nov 2017 10:51:47 +0000 Subject: [PATCH 11/29] Remove all drivers except PostgreSQL from Docker image --- docker/pom.xml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/docker/pom.xml b/docker/pom.xml index e7d975837c..0416d42246 100644 --- a/docker/pom.xml +++ b/docker/pom.xml @@ -24,16 +24,6 @@ ${dependency.alfresco-server-root.version} war - - mysql - mysql-connector-java - ${dependency.mysql.version} - - - org.mariadb.jdbc - mariadb-java-client - ${dependency.mariadb.version} - org.postgresql postgresql @@ -81,20 +71,6 @@ - - mysql - mysql-connector-java - jar - false - ${project.build.directory}/connector - - - org.mariadb.jdbc - mariadb-java-client - ${dependency.mariadb.version} - false - ${project.build.directory}/connector - org.postgresql postgresql From 2942f3169c70ee6cc8391b329f80ed5db1f44dff Mon Sep 17 00:00:00 2001 From: alandavis Date: Mon, 27 Nov 2017 17:52:09 +0000 Subject: [PATCH 12/29] Feature/repo 2908 jod (#9) REPO-2910 Replace ooo.direct code with jodconverter code --- docker/Dockerfile | 7 +++---- pom.xml | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 41e4c6bbcc..464817b431 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,10 +17,9 @@ RUN echo -e '\n\ alfresco-pdf-renderer.root=/usr/bin/\n\ alfresco-pdf-renderer.exe=${alfresco-pdf-renderer.root}/alfresco-pdf-renderer\n\ \n\ -ooo.enabled=true\n\ -ooo.port=8100\n\ -ooo.exe=/opt/libreoffice5.4/program/soffice.bin\n\ -jodconverter.enabled=false\n\ +jodconverter.enabled=true\n\ +jodconverter.portNumbers=8100\n\ +jodconverter.officeHome=/opt/libreoffice5.4/\n\ \n\ img.root=/usr/lib64/ImageMagick-7.0.7\n\ img.coders=/usr/lib64/ImageMagick-7.0.7/modules-Q16HDRI/coders\n\ diff --git a/pom.xml b/pom.xml index 38c5d6d74e..79b0c48191 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,8 @@ Community - 6.10 - 6.6 + 6.12 + 6.7 2.2 6.15 6.22 From 35763eedd9e45ee44bf98fe0947911271d6d741f Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 28 Nov 2017 12:39:40 +0000 Subject: [PATCH 13/29] REPO-2910 Replace ooo.direct code with jodconverter code Pickup alfresco-repository 6.13 so that thumbnails work in community. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79b0c48191..b7063c3099 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ Community - 6.12 + 6.13 6.7 2.2 6.15 From f81b6c9fe8c1509977c6289d0eedf7aa2f406821 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Wed, 6 Dec 2017 17:53:38 +0000 Subject: [PATCH 14/29] Update alfresco-repository to 6.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b7063c3099..7d08842148 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ Community - 6.13 + 6.14 6.7 2.2 6.15 From 67772956f52dfc6a8adf7509a7d6f78ba718d2d6 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Mon, 11 Dec 2017 15:02:11 +0000 Subject: [PATCH 15/29] REPO-3061 Move images to quay.io, add compose file for TAS tests --- docker/.dockerignore | 1 + docker/test/.env | 1 + docker/test/docker-compose.yml | 43 ++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 docker/.dockerignore create mode 100644 docker/test/.env create mode 100644 docker/test/docker-compose.yml diff --git a/docker/.dockerignore b/docker/.dockerignore new file mode 100644 index 0000000000..30d74d2584 --- /dev/null +++ b/docker/.dockerignore @@ -0,0 +1 @@ +test \ No newline at end of file diff --git a/docker/test/.env b/docker/test/.env new file mode 100644 index 0000000000..2256ab425e --- /dev/null +++ b/docker/test/.env @@ -0,0 +1 @@ +ALFRESCO_TAG=latest \ No newline at end of file diff --git a/docker/test/docker-compose.yml b/docker/test/docker-compose.yml new file mode 100644 index 0000000000..0397fd0fdd --- /dev/null +++ b/docker/test/docker-compose.yml @@ -0,0 +1,43 @@ +version: "3" + +services: + alfresco: + image: quay.io/alfresco/alfresco-content-services-community:${ALFRESCO_TAG} + environment: + JAVA_OPTS : " + -Ddb.driver=org.postgresql.Driver + -Ddb.username=alfresco + -Ddb.password=alfresco + -Ddb.url=jdbc:postgresql://postgres:5432/alfresco + -Dsolr.host=solr6 + -Dsolr.port=8983 + -Dsolr.secureComms=none + -Dsolr.base.url=/solr + -Dindex.subsystem.name=solr6 + -Dalfresco.restApi.basicAuthScheme=true + " + ports: + - 8080:8080 + + postgres: + image: docker.io/library/postgres:9.4.12 + environment: + - POSTGRES_PASSWORD=alfresco + - POSTGRES_USER=alfresco + - POSTGRES_DB=alfresco + ports: + - 5432:5432 + + solr6: + image: quay.io/alfresco/search-services:1.2.0-SNAPSHOT + environment: + #Solr needs to know how to register itself with Alfresco + - SOLR_ALFRESCO_HOST=alfresco + - SOLR_ALFRESCO_PORT=8080 + #Alfresco needs to know how to call solr + - SOLR_SOLR_HOST=solr6 + - SOLR_SOLR_PORT=8983 + #Create the default alfresco and archive cores + - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive + ports: + - 8083:8983 #Browser port \ No newline at end of file From 6dc9def7711dcc789df9e4bec837b366fc9024c7 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 12 Dec 2017 11:27:22 +0000 Subject: [PATCH 16/29] REPO-3097 Update jackson to 2.8.10 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7d08842148..099813873c 100644 --- a/pom.xml +++ b/pom.xml @@ -286,17 +286,17 @@ com.fasterxml.jackson.core jackson-core - 2.8.3 + 2.8.10 com.fasterxml.jackson.core jackson-databind - 2.8.3 + 2.8.10 com.fasterxml.jackson.core jackson-annotations - 2.8.3 + 2.8.10 org.codehaus.jackson From c7782377f478cac2983f9d15e5a18cfdf5a45213 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 12 Dec 2017 12:58:56 +0000 Subject: [PATCH 17/29] REPO-3097 Update data-model to 6.24 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 099813873c..673cd7ebee 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 6.7 2.2 6.15 - 6.22 + 6.24 6.0 1.0 6.3 From 6b14251303a330e6b450b193cfe70f5735ba8b45 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 12 Dec 2017 12:59:57 +0000 Subject: [PATCH 18/29] REPO-3097 Remove old jackson library --- pom.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pom.xml b/pom.xml index 673cd7ebee..c2647bc8c9 100644 --- a/pom.xml +++ b/pom.xml @@ -298,16 +298,6 @@ jackson-annotations 2.8.10 - - org.codehaus.jackson - jackson-core-asl - 1.9.13 - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - From 5d513b0e2e62f97495c24c1563603b4a07e6ff11 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 12 Dec 2017 13:23:50 +0000 Subject: [PATCH 19/29] REPO-3097 Update repository to 6.15 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c2647bc8c9..8156617c75 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ Community - 6.14 + 6.15 6.7 2.2 6.15 From 877f36dc6cb9d3bcccee23771e4ac78213dca4a4 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Thu, 14 Dec 2017 13:22:41 +0000 Subject: [PATCH 20/29] Update repository 6.16, remote-api 6.8, data-model 6.25 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8156617c75..e51bfb48cf 100644 --- a/pom.xml +++ b/pom.xml @@ -40,11 +40,11 @@ Community - 6.15 - 6.7 + 6.16 + 6.8 2.2 6.15 - 6.24 + 6.25 6.0 1.0 6.3 From 128816198907a5c50c3a9e1657f16aa2b0ae1db3 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Thu, 14 Dec 2017 18:46:08 +0000 Subject: [PATCH 21/29] Update data-model 7.0, remote-api 6.9 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e51bfb48cf..12d84c239a 100644 --- a/pom.xml +++ b/pom.xml @@ -41,10 +41,10 @@ Community 6.16 - 6.8 + 6.9 2.2 6.15 - 6.25 + 7.0 6.0 1.0 6.3 From 46fd3fd3b19215186690fd06980384a9deda797b Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Mon, 18 Dec 2017 13:51:05 +0000 Subject: [PATCH 22/29] REPO-3131 Update cxf libs to 3.0.12 --- pom.xml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 12d84c239a..6d5be1ef72 100644 --- a/pom.xml +++ b/pom.xml @@ -298,7 +298,22 @@ jackson-annotations 2.8.10 - + + + org.apache.cxf + cxf-rt-frontend-jaxws + 3.0.12 + + + org.apache.cxf + cxf-rt-transports-http + 3.0.12 + + + org.apache.cxf + cxf-rt-ws-policy + 3.0.12 + junit From 334afb5acb06668306f125122e45f9d08eceb66a Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Mon, 18 Dec 2017 17:00:07 +0000 Subject: [PATCH 23/29] REPO-3133 Update commons-email to 1.5 --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 6d5be1ef72..2e6872c4b1 100644 --- a/pom.xml +++ b/pom.xml @@ -314,6 +314,12 @@ cxf-rt-ws-policy 3.0.12 + + + org.apache.commons + commons-email + 1.5 + junit From 2eeb4fd05a916defce8f3557049249251616ec26 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 19 Dec 2017 15:32:34 +0000 Subject: [PATCH 24/29] REPO-3144 Upgrade commons-codec 1.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e6872c4b1..1480aa595f 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ commons-codec commons-codec - 1.10 + 1.11 commons-collections From 1e916a19a1e78f83698fa53ad9637c1c929783f8 Mon Sep 17 00:00:00 2001 From: Andrei Forascu Date: Thu, 21 Dec 2017 16:55:42 +0200 Subject: [PATCH 25/29] Update repository 6.17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1480aa595f..c24dc7906a 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ Community - 6.16 + 6.17 6.9 2.2 6.15 From 83d0028a7e66222fcafce2c670087e8f48276a26 Mon Sep 17 00:00:00 2001 From: CodrinChirica Date: Tue, 23 Jan 2018 14:05:07 +0200 Subject: [PATCH 26/29] Update remote-api to 6.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c24dc7906a..4c615f54a0 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ Community 6.17 - 6.9 + 6.12 2.2 6.15 7.0 From aadd77dd812b66ac538adb6b65a5cd0461aa33f9 Mon Sep 17 00:00:00 2001 From: Raluca Munteanu Date: Mon, 29 Jan 2018 11:57:01 +0200 Subject: [PATCH 27/29] Update repository to 6.21 and remote-api to 6.13 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4c615f54a0..616beae661 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,8 @@ Community - 6.17 - 6.12 + 6.21 + 6.13 2.2 6.15 7.0 From 81efe08188f89097beddabba98646b115002ac08 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Mon, 29 Jan 2018 16:43:51 +0000 Subject: [PATCH 28/29] Revert "Update repository to 6.21 and remote-api to 6.13" This reverts commit aadd77dd812b66ac538adb6b65a5cd0461aa33f9. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 616beae661..4c615f54a0 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,8 @@ Community - 6.21 - 6.13 + 6.17 + 6.12 2.2 6.15 7.0 From d9c612738f83c283582c043fbcda4f0ed8fb663f Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Mon, 29 Jan 2018 16:44:09 +0000 Subject: [PATCH 29/29] Revert "Update remote-api to 6.12" This reverts commit 83d0028a7e66222fcafce2c670087e8f48276a26. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c615f54a0..c24dc7906a 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ Community 6.17 - 6.12 + 6.9 2.2 6.15 7.0