Author: hardy.ferentschik Date: 2010-10-13 09:19:30 -0400 (Wed, 13 Oct 2010) New Revision: 20824 Modified: search/trunk/hibernate-search-analyzers/pom.xml search/trunk/hibernate-search/pom.xml search/trunk/hibernate-search/src/main/assembly/dist.xml Log: HSEARCH-593 Fixed dependency scopes. Dependencies of hibernate-search-analyzers are now optional. Updated dist assembly and split the lib directory into three sub-directories: required, optional and provided Modified: search/trunk/hibernate-search/pom.xml =================================================================== --- search/trunk/hibernate-search/pom.xml 2010-10-13 11:46:15 UTC (rev 20823) +++ search/trunk/hibernate-search/pom.xml 2010-10-13 13:19:30 UTC (rev 20824) @@ -42,6 +42,10 @@ <dependencies> <dependency> <groupId>org.hibernate</groupId> + <artifactId>hibernate-search-analyzers</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> <dependency> @@ -53,10 +57,6 @@ <artifactId>lucene-core</artifactId> </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-search-analyzers</artifactId> - </dependency> - <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers</artifactId> </dependency> @@ -81,6 +81,26 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-snowball</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-collation</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-entitymanager</artifactId> <scope>test</scope> Modified: search/trunk/hibernate-search/src/main/assembly/dist.xml =================================================================== --- search/trunk/hibernate-search/src/main/assembly/dist.xml 2010-10-13 11:46:15 UTC (rev 20823) +++ search/trunk/hibernate-search/src/main/assembly/dist.xml 2010-10-13 13:19:30 UTC (rev 20824) @@ -9,7 +9,7 @@ <dependencySets> <dependencySet> <useProjectArtifact>false</useProjectArtifact> - <outputDirectory>/dist/lib</outputDirectory> + <outputDirectory>/dist/lib/required</outputDirectory> <scope>runtime</scope> <excludes> <exclude>jgroups:jgroups</exclude> @@ -25,7 +25,24 @@ </includes> </dependencySet> + <!-- + Need to manually put the optional analyzer dependencies into their place. + The maven-assembly-plugin does not have any options to handle <optional/> dependencies + They are added as test dependencies in the pom. + --> <dependencySet> + <outputDirectory>/dist/lib/optional</outputDirectory> + <scope>test</scope> + <includes> + <include>org.apache.lucene:lucene-snowball</include> + <include>org.apache.lucene:lucene-collation</include> + <include>commons-codec:commons-codec</include> + <include>commons-io:commons-io</include> + <include>org.slf4j:slf4j-log4j12</include> + </includes> + </dependencySet> + + <dependencySet> <useProjectArtifact>false</useProjectArtifact> <outputDirectory>/dist/lib/provided</outputDirectory> <scope>provided</scope> Modified: search/trunk/hibernate-search-analyzers/pom.xml =================================================================== --- search/trunk/hibernate-search-analyzers/pom.xml 2010-10-13 11:46:15 UTC (rev 20823) +++ search/trunk/hibernate-search-analyzers/pom.xml 2010-10-13 13:19:30 UTC (rev 20824) @@ -51,20 +51,24 @@ <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-snowball</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-collation</artifactId> + <optional>true</optional> </dependency> <!-- Apache Commons --> <dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> + <optional>true</optional> </dependency> </dependencies>