From b9adb397ab0b4ede4121cef12f44b580cb3bb399 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 8 Feb 2016 15:33:41 +0000 Subject: [PATCH 1/2] Convert rm-automation pom file to have windows line endings. --- rm-automation/pom.xml | 696 +++++++++++++++++++++--------------------- 1 file changed, 348 insertions(+), 348 deletions(-) diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index c147fcf099..daaff6fd60 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -1,348 +1,348 @@ - - - - 4.0.0 - alfresco-rm-automation - Alfresco Records Management Automation - - - org.alfresco - alfresco-rm - 2.4-SNAPSHOT - - - - 2.45.0 - 4.0.5.RELEASE - 1.8 - testng.xml - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-test-source - - add-test-source - - - - src/unit-test/java - - - - - - - maven-surefire-plugin - - false - - ${project.build.testOutputDirectory}/${suiteXmlFile} - - ${skip.automationtests} - - - - maven-antrun-plugin - - - default-cli - - - Stopping Alfresco... - - - - - - - - - - - - - - org.alfresco.test - dataprep - 1.4 - - - org.alfresco.test - alfresco-testng - 1.1 - - - org.alfresco - selenium-grid - 1.4 - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - test - - - org.springframework - spring-test - ${spring.version} - test - - - org.testng - testng - 6.8.8 - - - ru.yandex.qatools.htmlelements - htmlelements-all - 1.12 - - - ru.yandex.qatools.properties - properties-loader - 1.5 - test - - - com.github.tomakehurst - wiremock - 1.56 - - - org.apache.chemistry.opencmis - chemistry-opencmis-client-bindings - 0.11.0 - - - - - - install-alfresco - - - - maven-antrun-plugin - - - fetch-installer - generate-test-resources - - run - - - - Recreating database... - drop database if exists alfresco; create database alfresco - Downloading Alfresco installer... - - - - Installing Alfresco... - - - - - - - - - - org.apache.ant - ant-jsch - 1.8.2 - - - postgresql - postgresql - 9.1-901-1.jdbc4 - - - - - maven-dependency-plugin - - - fetch-amps - process-test-resources - - copy - - - - - org.alfresco - alfresco-rm-community-share - ${project.version} - amp - - - org.alfresco - alfresco-rm-enterprise-share - ${project.version} - amp - - - org.alfresco - alfresco-rm-community-repo - ${project.version} - amp - - - org.alfresco - alfresco-rm-enterprise-repo - ${project.version} - amp - - - ${project.build.directory}/amps - true - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - true - - - install-community-repo-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war - - - - install-enterprise-repo-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war - - - - install-community-share-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/share.war - - - - install-enterprise-share-amp - - install - - process-test-resources - - true - ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp - ${project.build.directory}/alf-installation/tomcat/webapps/share.war - - - - - - - - - run-alfresco - - - - org.jacoco - jacoco-maven-plugin - 0.7.5.201505241946 - - - prepare-jacoco - - prepare-agent - - - - - - org.alfresco.* - - - - - maven-antrun-plugin - - - start-alfresco - process-test-classes - - run - - - - Starting Alfresco... - - - - - - - - - - stop-alfresco - post-integration-test - - run - - - - Stopping Alfresco... - - - - - - - - - - - - - + + + + 4.0.0 + alfresco-rm-automation + Alfresco Records Management Automation + + + org.alfresco + alfresco-rm + 2.4-SNAPSHOT + + + + 2.45.0 + 4.0.5.RELEASE + 1.8 + testng.xml + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-test-source + + add-test-source + + + + src/unit-test/java + + + + + + + maven-surefire-plugin + + false + + ${project.build.testOutputDirectory}/${suiteXmlFile} + + ${skip.automationtests} + + + + maven-antrun-plugin + + + default-cli + + + Stopping Alfresco... + + + + + + + + + + + + + + org.alfresco.test + dataprep + 1.4 + + + org.alfresco.test + alfresco-testng + 1.1 + + + org.alfresco + selenium-grid + 1.4 + + + org.springframework + spring-beans + ${spring.version} + + + org.springframework + spring-core + ${spring.version} + + + org.springframework + spring-context + ${spring.version} + + + org.springframework + spring-tx + ${spring.version} + test + + + org.springframework + spring-test + ${spring.version} + test + + + org.testng + testng + 6.8.8 + + + ru.yandex.qatools.htmlelements + htmlelements-all + 1.12 + + + ru.yandex.qatools.properties + properties-loader + 1.5 + test + + + com.github.tomakehurst + wiremock + 1.56 + + + org.apache.chemistry.opencmis + chemistry-opencmis-client-bindings + 0.11.0 + + + + + + install-alfresco + + + + maven-antrun-plugin + + + fetch-installer + generate-test-resources + + run + + + + Recreating database... + drop database if exists alfresco; create database alfresco + Downloading Alfresco installer... + + + + Installing Alfresco... + + + + + + + + + + org.apache.ant + ant-jsch + 1.8.2 + + + postgresql + postgresql + 9.1-901-1.jdbc4 + + + + + maven-dependency-plugin + + + fetch-amps + process-test-resources + + copy + + + + + org.alfresco + alfresco-rm-community-share + ${project.version} + amp + + + org.alfresco + alfresco-rm-enterprise-share + ${project.version} + amp + + + org.alfresco + alfresco-rm-community-repo + ${project.version} + amp + + + org.alfresco + alfresco-rm-enterprise-repo + ${project.version} + amp + + + ${project.build.directory}/amps + true + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + true + + + install-community-repo-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war + + + + install-enterprise-repo-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war + + + + install-community-share-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/share.war + + + + install-enterprise-share-amp + + install + + process-test-resources + + true + ${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp + ${project.build.directory}/alf-installation/tomcat/webapps/share.war + + + + + + + + + run-alfresco + + + + org.jacoco + jacoco-maven-plugin + 0.7.5.201505241946 + + + prepare-jacoco + + prepare-agent + + + + + + org.alfresco.* + + + + + maven-antrun-plugin + + + start-alfresco + process-test-classes + + run + + + + Starting Alfresco... + + + + + + + + + + stop-alfresco + post-integration-test + + run + + + + Stopping Alfresco... + + + + + + + + + + + + + From fbd032b753d0b4ee4971d66ce07f3b525d5fb293 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 8 Feb 2016 14:47:10 +0000 Subject: [PATCH 2/2] RM-2947 Remove unnecessary chemistry dependency. This dependency is provided by the dataprep librarywhich also provides the implementation. Both should be version 0.10.0 or 0.11.0, but we were taking 0.10.0 of one and 0.11.0 of the other. This should fix the NoSuchMethodErrors we were seeing. (cherry picked from commit 9d510a46c9db392a8abe0158f530afe6f7a1984a) --- rm-automation/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml index daaff6fd60..6a00b13c76 100644 --- a/rm-automation/pom.xml +++ b/rm-automation/pom.xml @@ -132,11 +132,6 @@ wiremock 1.56 - - org.apache.chemistry.opencmis - chemistry-opencmis-client-bindings - 0.11.0 -