HSEARCH-2134 Add elasticsearch backend module for WildFly

hibernate · Mar 12, 2016 · 52d3240 · 52d3240
1 parent e645436
commit 52d3240
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 1 deletion.
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>io.searchbox</groupId>
             <artifactId>jest</artifactId>
-            <version>2.0.0</version>
+            <version>${elasticsearchJestVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>

diff --git a/modules/src/main/assembly/dist.xml b/modules/src/main/assembly/dist.xml
@@ -60,6 +60,11 @@
             <outputDirectory>/org/hibernate/search/backend-jgroups/${hibernate.search.version}</outputDirectory>
             <filtered>true</filtered>
         </file>
+        <file>
+            <source>${module.xml.basedir}/search/backend-elasticsearch/module.xml</source>
+            <outputDirectory>/org/hibernate/search/backend-elasticsearch/${hibernate.search.version}</outputDirectory>
+            <filtered>true</filtered>
+        </file>
     </files>
 
     <dependencySets>
@@ -127,6 +132,20 @@
             </includes>
         </dependencySet>
 
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>org/hibernate/search/backend-elasticsearch/${hibernate.search.version}</outputDirectory>
+            <useTransitiveFiltering>false</useTransitiveFiltering>
+            <unpack>false</unpack>
+            <includes>
+                <include>org.hibernate:hibernate-search-backend-elasticsearch</include>
+                <include>com.google.code.gson:gson</include>
+                <include>io.searchbox:jest</include>
+                <include>io.searchbox:jest-common</include>
+                <include>org.apache.commons:commons-lang3</include>
+            </includes>
+        </dependencySet>
+
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>org/apache/lucene/internal/${lucene.module.slot}</outputDirectory>

diff --git a/modules/src/main/modules/search/backend-elasticsearch/module.xml b/modules/src/main/modules/search/backend-elasticsearch/module.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Hibernate Search, full-text search for your domain model
+ ~
+ ~ License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ ~ See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+  -->
+<module xmlns="urn:jboss:module:1.1" name="org.hibernate.search.backend-elasticsearch" slot="${hibernate.search.version}">
+    <resources>
+        <resource-root path="hibernate-search-backend-elasticsearch-${hibernate.search.version}.jar" />
+        <resource-root path="jest-${elasticsearchJestVersion}.jar" />
+        <resource-root path="jest-common-${elasticsearchJestVersion}.jar" />
+        <resource-root path="commons-lang3-${elasticsearchCommonsLang3Version}.jar" />
+        <resource-root path="gson-${elasticsearchGsonVersion}.jar" />
+    </resources>
+    <dependencies>
+        <module name="com.google.guava" />
+        <module name="org.hibernate.search.engine" slot="${hibernate.search.version}" />
+        <module name="org.hibernate.commons-annotations" />
+        <module name="org.apache.httpcomponents" />
+        <module name="org.jboss.logging" />
+        <module name="org.slf4j" />
+    </dependencies>
+</module>
diff --git a/modules/src/main/modules/search/engine/module.xml b/modules/src/main/modules/search/engine/module.xml
@@ -16,6 +16,9 @@
         <module name="org.apache.lucene.internal" slot="${lucene.module.slot}" />
         <module name="org.jboss.logging" />
 
+        <!-- Elasticsearch backend support -->
+        <module name="org.hibernate.search.backend-elasticsearch" services="import" optional="true" slot="${hibernate.search.version}" />
+
         <!-- JMS backend support -->
         <module name="org.hibernate.search.backend-jms" export="true" optional="true" slot="${hibernate.search.version}" />
 

diff --git a/pom.xml b/pom.xml
@@ -190,6 +190,9 @@
         -->
         <testElasticsearchVersion>2.2.0</testElasticsearchVersion>
         <testElasticsearchJnaVersion>4.1.0</testElasticsearchJnaVersion>
+        <elasticsearchJestVersion>2.0.0</elasticsearchJestVersion>
+        <elasticsearchCommonsLang3Version>3.4</elasticsearchCommonsLang3Version>
+        <elasticsearchGsonVersion>2.4</elasticsearchGsonVersion>
 
         <!-- Integration tests -->
         <arquillianVersion>1.1.8.Final</arquillianVersion>