Author: sannegrinovero Date: 2009-04-06 17:43:00 -0400 (Mon, 06 Apr 2009) New Revision: 16268 Modified: search/trunk/pom.xml Log: HSEARCH-348 (upgrading to Lucene 2.4.1) and align slf4j versions with hibernate core Modified: search/trunk/pom.xml =================================================================== --- search/trunk/pom.xml 2009-04-06 21:31:26 UTC (rev 16267) +++ search/trunk/pom.xml 2009-04-06 21:43:00 UTC (rev 16268) @@ -57,12 +57,12 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> - <version>3.5.0-SNAPSHOT</version> + <version>${hibernateVersion}</version> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-commons-annotations</artifactId> - <version>3.5.0-SNAPSHOT</version> + <version>${hibernateVersion}</version> </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -72,12 +72,12 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>2.4.0</version> + <version>${luceneVersion}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.4.2</version> + <version>${slf4jVersion}</version> </dependency> <dependency> <groupId>javax.transaction</groupId> @@ -109,7 +109,7 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.4.2</version> + <version>${slf4jVersion}</version> <scope>test</scope> </dependency> </dependencies> @@ -306,13 +306,13 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-annotations</artifactId> - <version>3.5.0-SNAPSHOT</version> + <version>${hibernateVersion}</version> <optional>true</optional> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> - <version>3.5.0-SNAPSHOT</version> + <version>${hibernateVersion}</version> <optional>true</optional> </dependency> <dependency> @@ -326,17 +326,39 @@ <artifactId>solr-core</artifactId> <version>1.3.0</version> <optional>true</optional> + <exclusions> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.solr</groupId> + <artifactId>solr-solrj</artifactId> + </exclusion> + <exclusion> + <groupId>woodstox</groupId> + <artifactId>wstx-asl</artifactId> + </exclusion> + <exclusion> + <groupId>net.java.dev.stax-utils</groupId> + <artifactId>stax-utils</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-snowball</artifactId> - <version>2.4.0</version> + <version>${luceneVersion}</version> <optional>true</optional> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers</artifactId> - <version>2.4.0</version> + <version>${luceneVersion}</version> <optional>true</optional> </dependency> <dependency> @@ -411,4 +433,11 @@ </build> </profile> </profiles> + + <properties> + <slf4jVersion>1.5.6</slf4jVersion> + <luceneVersion>2.4.1</luceneVersion> + <hibernateVersion>3.5.0-SNAPSHOT</hibernateVersion> + </properties> + </project>