OGM-703 Update Neo4j WildFly modules

hibernate · Jul 29, 2015 · 5d9ac37 · 5d9ac37
1 parent 8a10514
commit 5d9ac37
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/modules/wildfly/src/main/assembly/dist.xml b/modules/wildfly/src/main/assembly/dist.xml
@@ -155,10 +155,10 @@
                   <include>org.neo4j:neo4j-graph-matching</include>
                   <include>org.neo4j:neo4j-jmx</include>
                   <include>org.neo4j:neo4j-cypher</include>
-                  <include>org.neo4j:neo4j-cypher-commons</include>
                   <include>org.neo4j:neo4j-cypher-compiler-1.9</include>
                   <include>org.neo4j:neo4j-cypher-compiler-2.0</include>
                   <include>org.neo4j:neo4j-cypher-compiler-2.1</include>
+                  <include>org.neo4j:neo4j-cypher-compiler-2.2</include>
               </includes>
        </dependencySet>
        <dependencySet>
@@ -169,10 +169,13 @@
               <includes>
                   <!-- Include the Lucene version used by Neo4J, not the one from Hibernate Search! -->
                   <include>org.apache.lucene:lucene-core</include>
+                  <include>org.neo4j:neo4j-io</include>
                   <include>org.neo4j:neo4j-lucene-index</include>
                   <include>org.parboiled:parboiled-scala_2.10</include>
+                  <include>org.scala-lang:scala-reflect</include>
                   <include>org.scala-lang:scala-library</include>
                   <include>org.neo4j:neo4j-primitive-collections</include>
+                  <include>org.neo4j:neo4j-unsafe</include>
                   <include>com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru</include>
               </includes>
        </dependencySet>

diff --git a/modules/wildfly/src/main/modules/ogm/neo4j-internal/module.xml b/modules/wildfly/src/main/modules/ogm/neo4j-internal/module.xml
@@ -15,14 +15,22 @@
         <resource-root path="neo4j-lucene-index-${neo4jVersion}.jar" />
         <resource-root path="parboiled-scala_2.10-${parboiledVersion}.jar" />
         <resource-root path="scala-library-${scalaLibraryVersion}.jar" />
+        <resource-root path="scala-reflect-${scalaLibraryVersion}.jar" />
+        <resource-root path="neo4j-io-${neo4jVersion}.jar" />
         <resource-root path="neo4j-primitive-collections-${neo4jVersion}.jar" />
+        <resource-root path="neo4j-unsafe-${neo4jVersion}.jar" />
         <resource-root path="concurrentlinkedhashmap-lru-${concurrentlinkedhashmapVersion}.jar" />
     </resources>
 
     <dependencies>
         <module name="javax.api"/>
         <module name="javax.transaction.api"/>
         <module name="org.parboiled"/>
+
+        <!-- neo4j-lucene-index requires the API in the Kernel -->
         <module name="org.hibernate.ogm.neo4j" slot="${hibernate.ogm.neo4j.module.slot}"/>
+
+        <!-- It requires sun.misc.Unsafe -->
+        <module name="sun.jdk" />
     </dependencies>
 </module>
diff --git a/modules/wildfly/src/main/modules/ogm/neo4j/module.xml b/modules/wildfly/src/main/modules/ogm/neo4j/module.xml
@@ -10,10 +10,10 @@
         <resource-root path="hibernate-ogm-neo4j-${project.version}.jar" />
         <resource-root path="neo4j-${neo4jVersion}.jar" />
         <resource-root path="neo4j-cypher-${neo4jVersion}.jar" />
-        <resource-root path="neo4j-cypher-commons-${neo4jVersion}.jar" />
-        <resource-root path="neo4j-cypher-compiler-1.9-${neo4jCypherCompilerOlderVersion}.jar" />
-        <resource-root path="neo4j-cypher-compiler-2.0-${neo4jCypherCompilerOlderVersion}.jar" />
-        <resource-root path="neo4j-cypher-compiler-2.1-${neo4jVersion}.jar" />
+        <resource-root path="neo4j-cypher-compiler-1.9-${neo4jCypherCompiler19Version}.jar" />
+        <resource-root path="neo4j-cypher-compiler-2.0-${neo4jCypherCompiler20Version}.jar" />
+        <resource-root path="neo4j-cypher-compiler-2.1-${neo4jCypherCompiler21Version}.jar" />
+        <resource-root path="neo4j-cypher-compiler-2.2-${neo4jCypherCompiler22Version}.jar" />
         <resource-root path="neo4j-kernel-${neo4jVersion}.jar" />
         <resource-root path="neo4j-udc-${neo4jVersion}.jar" />
         <resource-root path="neo4j-graph-algo-${neo4jVersion}.jar" />
@@ -24,13 +24,14 @@
         <module name="org.hibernate" slot="${hibernate.ogm.module.slot}" />
         <module name="org.hibernate.hql" slot="${hibernate.hql.module.slot}" />
 
+        <module name="org.parboiled"/>
+
         <!-- Separate module to make sure it's not visible to the applications -->
         <module name="org.hibernate.ogm.neo4j.internal" slot="${hibernate.ogm.neo4j-internal.module.slot}" services="import" />
 
         <module name="javax.api" />
         <module name="javax.persistence.api" />
         <module name="javax.transaction.api" />
         <module name="org.jboss.logging" />
-        <module name="org.parboiled" />
     </dependencies>
 </module>