diff --git a/build/build.xml b/build/build.xml index bc19e77d02a0..f37ac6edcaff 100644 --- a/build/build.xml +++ b/build/build.xml @@ -679,6 +679,10 @@ + + + + diff --git a/build/pom.xml b/build/pom.xml index 6a60f10cbf32..bff1f3bd7841 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -692,6 +692,11 @@ javax.json + + org.glassfish + javax.el + + org.hibernate hibernate-core @@ -2167,6 +2172,7 @@ org.codehaus.woodstox:woodstox-core-asl org.eclipse.jdt.core.compiler:ecj org.fusesource.jansi:jansi + org.glassfish:javax.el org.glassfish:javax.json org.hornetq:hornetq-ra org.infinispan:infinispan-cachestore-jdbc @@ -2766,6 +2772,10 @@ Module org.codehaus.jettison org.codehaus.jettison:org.codehaus.jettison.badgerfish:org.codehaus.jettison.json:org.codehaus.jettison.mapped:org.codehaus.jettison.util + + Module org.glassfish.javax.el + javax.el:com.sun.glassfish:com.sun.el + Module org.glassfish.javax.json org.glassfish.json diff --git a/build/src/main/resources/modules/system/layers/base/org/glassfish/javax/el/main/module.xml b/build/src/main/resources/modules/system/layers/base/org/glassfish/javax/el/main/module.xml new file mode 100644 index 000000000000..4dc24db18316 --- /dev/null +++ b/build/src/main/resources/modules/system/layers/base/org/glassfish/javax/el/main/module.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index f26bc7c91487..3dde4c27f583 100644 --- a/pom.xml +++ b/pom.xml @@ -143,6 +143,7 @@ 4.2.0 3.7.2 1.9 + 3.0-b07 4.2.0.Final 4.0.1.Final 1.0.1.Final @@ -3414,6 +3415,13 @@ ${version.javax.json-api} + + + org.glassfish + javax.el + ${version.org.glassfish.javax.el} + + org.hibernate hibernate-core