Merge branch 'release' into integration/master

Conflicts: pom.xml
zanata · Apr 6, 2015 · 307b890 · 307b890
2 parents 762490d + c0b7f4c
commit 307b890
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -120,6 +120,12 @@
         <groupId>org.richfaces</groupId>
         <artifactId>richfaces</artifactId>
         <version>${richfaces.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.spec.javax.el</groupId>
+            <artifactId>jboss-el-api_3.0_spec</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>