Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

77126: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73447: ACE-1690: SOLR 4 - Index nodes with bulk fetch for metadata
         - Added more tests to MetadataTrackerTest. Formatted pom


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77980 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-07-23 15:36:48 +00:00
parent 800322d439
commit f15f90b3e9

View File

@@ -1,4 +1,5 @@
<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-solrclient</artifactId> <artifactId>alfresco-solrclient</artifactId>
<name>Alfresco Solr Client</name> <name>Alfresco Solr Client</name>
@@ -17,13 +18,13 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-core-asl</artifactId>
</dependency> </dependency>
<!-- provided dependencies --> <!-- provided dependencies -->
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
<version>2.4</version> <version>2.4</version>
@@ -53,11 +54,12 @@
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes>
<!-- Excluding this test, because it requires the keystore which is a part of SystemBuildTest. <!-- Excluding this test, because it requires the
TODO: Consider moving this test into that project or making it pass on its own. --> keystore which is a part of SystemBuildTest. TODO: Consider moving this test
<exclude>**/SOLRAPIClientTest.java</exclude> into that project or making it pass on its own. -->
</excludes> <exclude>**/SOLRAPIClientTest.java</exclude>
</excludes>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>