HSEARCH-3146 Use the feature packs produced by Hibernate ORM

hibernate · Apr 27, 2018 · 134ff5c · 134ff5c
1 parent f496413
commit 134ff5c
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 366 deletions.
diff --git a/jbossmodules/hibernate-orm/assembly.xml b/jbossmodules/hibernate-orm/assembly.xml
diff --git a/jbossmodules/hibernate-orm/pom.xml b/jbossmodules/hibernate-orm/pom.xml
diff --git a/jbossmodules/hibernate-orm/src/main/aliases/org/hibernate/core/module.xml b/jbossmodules/hibernate-orm/src/main/aliases/org/hibernate/core/module.xml
diff --git a/jbossmodules/hibernate-orm/src/main/aliases/org/hibernate/jipijapa-hibernate5/module.xml b/jbossmodules/hibernate-orm/src/main/aliases/org/hibernate/jipijapa-hibernate5/module.xml
diff --git a/jbossmodules/hibernate-orm/src/main/feature-pack-def/feature-pack-template.xml b/jbossmodules/hibernate-orm/src/main/feature-pack-def/feature-pack-template.xml
diff --git a/jbossmodules/hibernate-orm/src/main/modules/org/hibernate/core/module.xml b/jbossmodules/hibernate-orm/src/main/modules/org/hibernate/core/module.xml
diff --git a/jbossmodules/hibernate-orm/src/main/modules/org/hibernate/jipijapa-hibernate5/module.xml b/jbossmodules/hibernate-orm/src/main/modules/org/hibernate/jipijapa-hibernate5/module.xml
diff --git a/jbossmodules/orm/pom.xml b/jbossmodules/orm/pom.xml
@@ -66,8 +66,8 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>hibernate-search-jbossmodules-hibernate-orm</artifactId>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-orm-jbossmodules</artifactId>
             <type>zip</type>
             <exclusions>
                 <exclusion>

diff --git a/jbossmodules/orm/src/main/feature-pack-def/feature-pack-template.xml b/jbossmodules/orm/src/main/feature-pack-def/feature-pack-template.xml
@@ -8,6 +8,6 @@
 <build xmlns="urn:wildfly:feature-pack-build:1.1">
     <dependencies>
         <artifact name="org.hibernate:hibernate-search-jbossmodules-engine"/>
-        <artifact name="org.hibernate:hibernate-search-jbossmodules-hibernate-orm"/>
+        <artifact name="org.hibernate:hibernate-orm-jbossmodules"/>
     </dependencies>
 </build>
diff --git a/jbossmodules/pom.xml b/jbossmodules/pom.xml
@@ -20,7 +20,6 @@
 
     <modules>
         <module>engine</module>
-        <module>hibernate-orm</module>
         <module>orm</module>
         <module>backend-jgroups</module>
         <module>elasticsearch</module>