3:31 a.m.
Author: hardy.ferentschik
Date: 2010-10-13 04:31:25 -0400 (Wed, 13 Oct 2010)
New Revision: 20818
Modified:
search/trunk/hibernate-search/pom.xml
search/trunk/hibernate-search/src/main/assembly/dist.xml
Log:
HSEARCH-593 Made sure the APL2 is included in assembly. Also updated dependency
configuration
Modified: search/trunk/hibernate-search/pom.xml
===================================================================
--- search/trunk/hibernate-search/pom.xml 2010-10-12 18:02:55 UTC (rev 20817)
+++ search/trunk/hibernate-search/pom.xml 2010-10-13 08:31:25 UTC (rev 20818)
@@ -22,7 +22,9 @@
~ 51 Franklin Street, Fifth Floor
~ Boston, MA 02110-1301 USA
-->
-<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/maven-v4_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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -47,10 +49,6 @@
<artifactId>hibernate-commons-annotations</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
</dependency>
@@ -63,6 +61,11 @@
<artifactId>lucene-analyzers</artifactId>
</dependency>
<dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>jgroups</groupId>
<artifactId>jgroups</artifactId>
<optional>true</optional>
@@ -197,12 +200,12 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<tags>
- <tag>
- <name>experimental</name>
- <placement>a</placement>
- <head>Experimental</head>
- </tag>
- </tags>
+ <tag>
+ <name>experimental</name>
+ <placement>a</placement>
+ <head>Experimental</head>
+ </tag>
+ </tags>
<docfilessubdirs>true</docfilessubdirs>
<stylesheetfile>${basedir}/src/main/javadoc/stylesheet.css</stylesheetfile>
<links>
Modified: search/trunk/hibernate-search/src/main/assembly/dist.xml
===================================================================
--- search/trunk/hibernate-search/src/main/assembly/dist.xml 2010-10-12 18:02:55 UTC (rev
20817)
+++ search/trunk/hibernate-search/src/main/assembly/dist.xml 2010-10-13 08:31:25 UTC (rev
20818)
@@ -11,7 +11,26 @@
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>/dist/lib</outputDirectory>
<scope>runtime</scope>
+ <excludes>
+ <exclude>jgroups:jgroups</exclude>
+
<exclude>org.hibernate.javax.persistence:hibernate-jpa-2.0-api</exclude>
+ </excludes>
</dependencySet>
+
+ <dependencySet>
+ <outputDirectory>/dist/lib/optional</outputDirectory>
+ <includes>
+ <include>jgroups:jgroups</include>
+
<include>org.hibernate.javax.persistence:hibernate-jpa-2.0-api</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>/dist/lib/provided</outputDirectory>
+ <scope>provided</scope>
+ </dependencySet>
+
</dependencySets>
<fileSets>
@@ -44,7 +63,16 @@
<include>changelog.txt</include>
</includes>
</fileSet>
+ <!-- Include the APL2 into the dist as well, because the Solr code is
originally licensed under APL -->
<fileSet>
+ <directory>../hibernate-search-analyzers</directory>
+ <outputDirectory/>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>license.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>.</directory>
<outputDirectory/>
<useDefaultExcludes>true</useDefaultExcludes>
@@ -52,6 +80,6 @@
<include>pom.xml</include>
<include>src/**/*</include>
</includes>
- </fileSet>
+ </fileSet>
</fileSets>
</assembly>