inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-2.4/RM-2947_FixChemistryDependency' into 'release/V2.4'

Browse Source 
Feature 2.4/rm 2947 fix chemistry dependency

Fix recent failing UI tests that have the message "java.lang.NoSuchMethodError:
org.apache.chemistry.opencmis.client.bindings.CmisBindingFactory.createCmisBrowserBinding"
This cherry picks the fix which I accidentally committed to master rather than release/V2.4.

See merge request !29
This commit is contained in:
Ana Bozianu
2016-02-09 08:26:08 +00:00
parent 7ab6f72c1d fbd032b753
commit d24ec3eaf6
1 changed files with 343 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

691
rm-automation/pom.xml
View File

@@ -1,348 +1,343 @@
<?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" <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"> 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-rm-automation</artifactId> <artifactId>alfresco-rm-automation</artifactId>
<name>Alfresco Records Management Automation</name> <name>Alfresco Records Management Automation</name>
<parent> <parent>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>alfresco-rm</artifactId> <artifactId>alfresco-rm</artifactId>
<version>2.4-SNAPSHOT</version> <version>2.4-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<selenium.version>2.45.0</selenium.version> <selenium.version>2.45.0</selenium.version>
<spring.version>4.0.5.RELEASE</spring.version> <spring.version>4.0.5.RELEASE</spring.version>
<maven.build.sourceVersion>1.8</maven.build.sourceVersion> <maven.build.sourceVersion>1.8</maven.build.sourceVersion>
<suiteXmlFile>testng.xml</suiteXmlFile> <suiteXmlFile>testng.xml</suiteXmlFile>
<skip.automationtests>true</skip.automationtests> <skip.automationtests>true</skip.automationtests>
</properties> </properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>add-test-source</id> <id>add-test-source</id>
<goals> <goals>
<goal>add-test-source</goal> <goal>add-test-source</goal>
</goals> </goals>
<configuration> <configuration>
<sources> <sources>
<source>src/unit-test/java</source> <source>src/unit-test/java</source>
</sources> </sources>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<redirectTestOutputToFile>false</redirectTestOutputToFile> <redirectTestOutputToFile>false</redirectTestOutputToFile>
<suiteXmlFiles> <suiteXmlFiles>
<suiteXmlFile>${project.build.testOutputDirectory}/${suiteXmlFile}</suiteXmlFile> <suiteXmlFile>${project.build.testOutputDirectory}/${suiteXmlFile}</suiteXmlFile>
</suiteXmlFiles> </suiteXmlFiles>
<skipTests>${skip.automationtests}</skipTests> <skipTests>${skip.automationtests}</skipTests>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-antrun-plugin</artifactId> <artifactId>maven-antrun-plugin</artifactId>
<executions> <executions>
<execution> <execution>
<id>default-cli</id> <id>default-cli</id>
<configuration> <configuration>
<target> <target>
<echo>Stopping Alfresco...</echo> <echo>Stopping Alfresco...</echo>
<exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true"> <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
<arg value="stop" /> <arg value="stop" />
</exec> </exec>
</target> </target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.alfresco.test</groupId> <groupId>org.alfresco.test</groupId>
<artifactId>dataprep</artifactId> <artifactId>dataprep</artifactId>
<version>1.4</version> <version>1.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco.test</groupId> <groupId>org.alfresco.test</groupId>
<artifactId>alfresco-testng</artifactId> <artifactId>alfresco-testng</artifactId>
<version>1.1</version> <version>1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco</groupId> <groupId>org.alfresco</groupId>
<artifactId>selenium-grid</artifactId> <artifactId>selenium-grid</artifactId>
<version>1.4</version> <version>1.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId> <artifactId>spring-beans</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId> <artifactId>spring-core</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId> <artifactId>spring-tx</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
<version>${spring.version}</version> <version>${spring.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
<artifactId>testng</artifactId> <artifactId>testng</artifactId>
<version>6.8.8</version> <version>6.8.8</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ru.yandex.qatools.htmlelements</groupId> <groupId>ru.yandex.qatools.htmlelements</groupId>
<artifactId>htmlelements-all</artifactId> <artifactId>htmlelements-all</artifactId>
<version>1.12</version> <version>1.12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ru.yandex.qatools.properties</groupId> <groupId>ru.yandex.qatools.properties</groupId>
<artifactId>properties-loader</artifactId> <artifactId>properties-loader</artifactId>
<version>1.5</version> <version>1.5</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.tomakehurst</groupId> <groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId> <artifactId>wiremock</artifactId>
<version>1.56</version> <version>1.56</version>
</dependency> </dependency>
<dependency> </dependencies>
<groupId>org.apache.chemistry.opencmis</groupId>
<artifactId>chemistry-opencmis-client-bindings</artifactId> <profiles>
<version>0.11.0</version> <profile>
</dependency> <id>install-alfresco</id>
</dependencies> <build>
<plugins>
<profiles> <plugin>
<profile> <artifactId>maven-antrun-plugin</artifactId>
<id>install-alfresco</id> <executions>
<build> <execution>
<plugins> <id>fetch-installer</id>
<plugin> <phase>generate-test-resources</phase>
<artifactId>maven-antrun-plugin</artifactId> <goals>
<executions> <goal>run</goal>
<execution> </goals>
<id>fetch-installer</id> <configuration>
<phase>generate-test-resources</phase> <target>
<goals> <echo>Recreating database...</echo>
<goal>run</goal> <sql driver="org.postgresql.Driver" url="jdbc:postgresql:template1" userid="alfresco" password="alfresco" autocommit="true">drop database if exists alfresco; create database alfresco</sql>
</goals> <echo>Downloading Alfresco installer...</echo>
<configuration> <sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="installerPath" command="ls -rt ${installer.path} | tail -1 | tr ' ' '?' " />
<target> <scp remoteFile="tomcat@pbam01.alfresco.com:${installerPath}" localTofile="target/alf-installer.bin" keyfile="${user.home}/.ssh/id_rsa" />
<echo>Recreating database...</echo> <chmod file="target/alf-installer.bin" perm="a+x" verbose="true" />
<sql driver="org.postgresql.Driver" url="jdbc:postgresql:template1" userid="alfresco" password="alfresco" autocommit="true">drop database if exists alfresco; create database alfresco</sql> <echo>Installing Alfresco...</echo>
<echo>Downloading Alfresco installer...</echo> <exec executable="${basedir}/target/alf-installer.bin" dir="target" failonerror="true">
<sshexec username="tomcat" host="pbam01.alfresco.com" keyfile="${user.home}/.ssh/id_rsa" outputproperty="installerPath" command="ls -rt ${installer.path} | tail -1 | tr ' ' '?' " /> <arg line="--mode unattended --alfresco_admin_password admin --disable-components postgres,alfrescowcmqs --jdbc_username alfresco --jdbc_password alfresco --prefix ${basedir}/target/alf-installation" />
<scp remoteFile="tomcat@pbam01.alfresco.com:${installerPath}" localTofile="target/alf-installer.bin" keyfile="${user.home}/.ssh/id_rsa" /> </exec>
<chmod file="target/alf-installer.bin" perm="a+x" verbose="true" /> </target>
<echo>Installing Alfresco...</echo> </configuration>
<exec executable="${basedir}/target/alf-installer.bin" dir="target" failonerror="true"> </execution>
<arg line="--mode unattended --alfresco_admin_password admin --disable-components postgres,alfrescowcmqs --jdbc_username alfresco --jdbc_password alfresco --prefix ${basedir}/target/alf-installation" /> </executions>
</exec> <dependencies>
</target> <dependency>
</configuration> <groupId>org.apache.ant</groupId>
</execution> <artifactId>ant-jsch</artifactId>
</executions> <version>1.8.2</version>
<dependencies> </dependency>
<dependency> <dependency>
<groupId>org.apache.ant</groupId> <groupId>postgresql</groupId>
<artifactId>ant-jsch</artifactId> <artifactId>postgresql</artifactId>
<version>1.8.2</version> <version>9.1-901-1.jdbc4</version>
</dependency> </dependency>
<dependency> </dependencies>
<groupId>postgresql</groupId> </plugin>
<artifactId>postgresql</artifactId> <plugin>
<version>9.1-901-1.jdbc4</version> <artifactId>maven-dependency-plugin</artifactId>
</dependency> <executions>
</dependencies> <execution>
</plugin> <id>fetch-amps</id>
<plugin> <phase>process-test-resources</phase>
<artifactId>maven-dependency-plugin</artifactId> <goals>
<executions> <goal>copy</goal>
<execution> </goals>
<id>fetch-amps</id> <configuration>
<phase>process-test-resources</phase> <artifactItems>
<goals> <artifactItem>
<goal>copy</goal> <groupId>org.alfresco</groupId>
</goals> <artifactId>alfresco-rm-community-share</artifactId>
<configuration> <version>${project.version}</version>
<artifactItems> <type>amp</type>
<artifactItem> </artifactItem>
<groupId>org.alfresco</groupId> <artifactItem>
<artifactId>alfresco-rm-community-share</artifactId> <groupId>org.alfresco</groupId>
<version>${project.version}</version> <artifactId>alfresco-rm-enterprise-share</artifactId>
<type>amp</type> <version>${project.version}</version>
</artifactItem> <type>amp</type>
<artifactItem> </artifactItem>
<groupId>org.alfresco</groupId> <artifactItem>
<artifactId>alfresco-rm-enterprise-share</artifactId> <groupId>org.alfresco</groupId>
<version>${project.version}</version> <artifactId>alfresco-rm-community-repo</artifactId>
<type>amp</type> <version>${project.version}</version>
</artifactItem> <type>amp</type>
<artifactItem> </artifactItem>
<groupId>org.alfresco</groupId> <artifactItem>
<artifactId>alfresco-rm-community-repo</artifactId> <groupId>org.alfresco</groupId>
<version>${project.version}</version> <artifactId>alfresco-rm-enterprise-repo</artifactId>
<type>amp</type> <version>${project.version}</version>
</artifactItem> <type>amp</type>
<artifactItem> </artifactItem>
<groupId>org.alfresco</groupId> </artifactItems>
<artifactId>alfresco-rm-enterprise-repo</artifactId> <outputDirectory>${project.build.directory}/amps</outputDirectory>
<version>${project.version}</version> <useBaseVersion>true</useBaseVersion>
<type>amp</type> </configuration>
</artifactItem> </execution>
</artifactItems> </executions>
<outputDirectory>${project.build.directory}/amps</outputDirectory> </plugin>
<useBaseVersion>true</useBaseVersion> <plugin>
</configuration> <groupId>org.alfresco.maven.plugin</groupId>
</execution> <artifactId>alfresco-maven-plugin</artifactId>
</executions> <extensions>true</extensions>
</plugin> <executions>
<plugin> <execution>
<groupId>org.alfresco.maven.plugin</groupId> <id>install-community-repo-amp</id>
<artifactId>alfresco-maven-plugin</artifactId> <goals>
<extensions>true</extensions> <goal>install</goal>
<executions> </goals>
<execution> <phase>process-test-resources</phase>
<id>install-community-repo-amp</id> <configuration>
<goals> <backup>true</backup>
<goal>install</goal> <ampLocation>${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp</ampLocation>
</goals> <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
<phase>process-test-resources</phase> </configuration>
<configuration> </execution>
<backup>true</backup> <execution>
<ampLocation>${project.build.directory}/amps/alfresco-rm-community-repo-${project.version}.amp</ampLocation> <id>install-enterprise-repo-amp</id>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation> <goals>
</configuration> <goal>install</goal>
</execution> </goals>
<execution> <phase>process-test-resources</phase>
<id>install-enterprise-repo-amp</id> <configuration>
<goals> <backup>true</backup>
<goal>install</goal> <ampLocation>${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp</ampLocation>
</goals> <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation>
<phase>process-test-resources</phase> </configuration>
<configuration> </execution>
<backup>true</backup> <execution>
<ampLocation>${project.build.directory}/amps/alfresco-rm-enterprise-repo-${project.version}.amp</ampLocation> <id>install-community-share-amp</id>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/alfresco.war</warLocation> <goals>
</configuration> <goal>install</goal>
</execution> </goals>
<execution> <phase>process-test-resources</phase>
<id>install-community-share-amp</id> <configuration>
<goals> <backup>true</backup>
<goal>install</goal> <ampLocation>${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp</ampLocation>
</goals> <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation>
<phase>process-test-resources</phase> </configuration>
<configuration> </execution>
<backup>true</backup> <execution>
<ampLocation>${project.build.directory}/amps/alfresco-rm-community-share-${project.version}.amp</ampLocation> <id>install-enterprise-share-amp</id>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation> <goals>
</configuration> <goal>install</goal>
</execution> </goals>
<execution> <phase>process-test-resources</phase>
<id>install-enterprise-share-amp</id> <configuration>
<goals> <backup>true</backup>
<goal>install</goal> <ampLocation>${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp</ampLocation>
</goals> <warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation>
<phase>process-test-resources</phase> </configuration>
<configuration> </execution>
<backup>true</backup> </executions>
<ampLocation>${project.build.directory}/amps/alfresco-rm-enterprise-share-${project.version}.amp</ampLocation> </plugin>
<warLocation>${project.build.directory}/alf-installation/tomcat/webapps/share.war</warLocation> </plugins>
</configuration> </build>
</execution> </profile>
</executions> <profile>
</plugin> <id>run-alfresco</id>
</plugins> <build>
</build> <plugins>
</profile> <plugin>
<profile> <groupId>org.jacoco</groupId>
<id>run-alfresco</id> <artifactId>jacoco-maven-plugin</artifactId>
<build> <version>0.7.5.201505241946</version>
<plugins> <executions>
<plugin> <execution>
<groupId>org.jacoco</groupId> <id>prepare-jacoco</id>
<artifactId>jacoco-maven-plugin</artifactId> <goals>
<version>0.7.5.201505241946</version> <goal>prepare-agent</goal>
<executions> </goals>
<execution> </execution>
<id>prepare-jacoco</id> </executions>
<goals> <configuration>
<goal>prepare-agent</goal> <includes>
</goals> <include>org.alfresco.*</include>
</execution> </includes>
</executions> </configuration>
<configuration> </plugin>
<includes> <plugin>
<include>org.alfresco.*</include> <artifactId>maven-antrun-plugin</artifactId>
</includes> <executions>
</configuration> <execution>
</plugin> <id>start-alfresco</id>
<plugin> <phase>process-test-classes</phase>
<artifactId>maven-antrun-plugin</artifactId> <goals>
<executions> <goal>run</goal>
<execution> </goals>
<id>start-alfresco</id> <configuration>
<phase>process-test-classes</phase> <target>
<goals> <echo>Starting Alfresco...</echo>
<goal>run</goal> <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
</goals> <arg value="start" />
<configuration> <env key="CATALINA_OPTS" value="${argLine}" />
<target> </exec>
<echo>Starting Alfresco...</echo> <sleep minutes="5" />
<exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true"> </target>
<arg value="start" /> </configuration>
<env key="CATALINA_OPTS" value="${argLine}" /> </execution>
</exec> <execution>
<sleep minutes="5" /> <id>stop-alfresco</id>
</target> <phase>post-integration-test</phase>
</configuration> <goals>
</execution> <goal>run</goal>
<execution> </goals>
<id>stop-alfresco</id> <configuration>
<phase>post-integration-test</phase> <target>
<goals> <echo>Stopping Alfresco...</echo>
<goal>run</goal> <exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true">
</goals> <arg value="stop" />
<configuration> </exec>
<target> </target>
<echo>Stopping Alfresco...</echo> </configuration>
<exec executable="${basedir}/target/alf-installation/alfresco.sh" dir="target/alf-installation" failonerror="true"> </execution>
<arg value="stop" /> </executions>
</exec> </plugin>
</target> </plugins>
</configuration> </build>
</execution> </profile>
</executions> </profiles>
</plugin> </project>
</plugins>
</build>
</profile>
</profiles>
</project>