Upgrade Hibernate and Mojarra

zanata · May 6, 2015 · 5ee87a7 · 5ee87a7
1 parent 320a3dc
commit 5ee87a7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/functional-test/src/test/resources/conf/standalone_wildfly.xml b/functional-test/src/test/resources/conf/standalone_wildfly.xml
@@ -280,7 +280,7 @@
     <subsystem xmlns="urn:jboss:domain:jpa:1.1">
       <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:jsf:1.0" default-jsf-impl-slot="mojarra-2.1.28"/>
+    <subsystem xmlns="urn:jboss:domain:jsf:1.0" default-jsf-impl-slot="mojarra-2.1.29-01"/>
     <subsystem xmlns="urn:jboss:domain:mail:2.0">
       <mail-session name="default" jndi-name="java:jboss/mail/Default">
         <smtp-server outbound-socket-binding-ref="mail-smtp"/>

diff --git a/pom.xml b/pom.xml
@@ -48,10 +48,9 @@
     <!-- see also the jboss7 profile below -->
     <hibernate.scope>provided</hibernate.scope>
     <!--
-         TODO include Hibernate in war (or deploy as JBoss modules).
-         NB: JBoss EAP 6.2.3 only has 4.2.7.SP4
+         NB: JBoss EAP 6.4.0 has 4.2.18.Final-redhat-2
     -->
-    <hibernate.version>4.2.8.Final</hibernate.version>
+    <hibernate.version>4.2.19.Final</hibernate.version>
     <hibernate.search.scope>compile</hibernate.search.scope>
     <!-- Hibernate Search 4.4.x is for Hibernate Core 4.2.x:
      http://in.relation.to/Bloggers/HibernateSearchWeekendReleasesFromBothMaintenanceBranches
@@ -1216,9 +1215,9 @@
         <appserver.home>${cargo.extract.dir}/${appserver.dir.name}/${appserver.dir.name}</appserver.home>
 
         <module.wildfly.version>8.1.0.Final</module.wildfly.version>
-        <mojarra.module.version>2.1.28</mojarra.module.version>
+        <mojarra.module.version>2.1.29-01</mojarra.module.version>
         <mojarra.module.name>wildfly-${module.wildfly.version}-module-mojarra-${mojarra.module.version}.zip</mojarra.module.name>
-        <hibernate.module.version>4.2.15.Final</hibernate.module.version>
+        <hibernate.module.version>4.2.19.Final</hibernate.module.version>
         <hibernate.module.name>wildfly-${module.wildfly.version}-module-hibernate-main-${hibernate.module.version}.zip</hibernate.module.name>
       </properties>
 

diff --git a/zanata-overlay/config/remote-deps.groovy b/zanata-overlay/config/remote-deps.groovy
@@ -19,13 +19,13 @@
 
 'wildfly-8.1' {
     hibernatemodule {
-        url = "http://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-hibernate-main-4.2.15.Final.zip/download"
+        url = "http://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-hibernate-main-4.2.19.Final.zip/download"
         toFile = "/hibernate-module.zip"
         extract = true
     }
 
     jsfmodule {
-        url = "http://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-mojarra-2.1.28.zip/download"
+        url = "http://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-mojarra-2.1.29-01.zip/download"
         toFile = "/mojarra-module.zip"
         extract = true
     }

diff --git a/zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml b/zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
@@ -302,7 +302,7 @@
         <subsystem xmlns="urn:jboss:domain:jpa:1.1">
             <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
         </subsystem>
-        <subsystem xmlns="urn:jboss:domain:jsf:1.0" default-jsf-impl-slot="mojarra-2.1.28"/>
+        <subsystem xmlns="urn:jboss:domain:jsf:1.0" default-jsf-impl-slot="mojarra-2.1.29-01"/>
         <subsystem xmlns="urn:jboss:domain:mail:2.0">
             <mail-session name="default" jndi-name="java:jboss/mail/Default">
                 <smtp-server outbound-socket-binding-ref="mail-smtp"/>

diff --git a/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml b/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
@@ -293,7 +293,7 @@
     <subsystem xmlns="urn:jboss:domain:jpa:1.1">
       <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
     </subsystem>
-    <subsystem xmlns="urn:jboss:domain:jsf:1.0" default-jsf-impl-slot="mojarra-2.1.28"/>
+    <subsystem xmlns="urn:jboss:domain:jsf:1.0" default-jsf-impl-slot="mojarra-2.1.29-01"/>
     <subsystem xmlns="urn:jboss:domain:mail:2.0">
       <mail-session name="default" jndi-name="java:jboss/mail/Default">
         <smtp-server outbound-socket-binding-ref="mail-smtp"/>