From 93444cb838d1ef7d07cd307b41894fea40e3a985 Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Tue, 10 Feb 2015 16:28:29 +1000
Subject: [PATCH] Eliminate all BOMs except jboss-javaee-6.0

---
 functional-test/pom.xml                       |  41 ++-
 pom.xml                                       | 295 +++++++++++++-----
 zanata-model/pom.xml                          |   7 +-
 zanata-war/pom.xml                            | 162 +++++-----
 .../main/java/org/zanata/dao/ActivityDAO.java |   1 -
 5 files changed, 336 insertions(+), 170 deletions(-)

diff --git a/functional-test/pom.xml b/functional-test/pom.xml
index 94f54aebf8..e692a7eaba 100644
--- a/functional-test/pom.xml
+++ b/functional-test/pom.xml
@@ -65,8 +65,8 @@
     <!-- This may be changed by the SMTP_PORT profile -->
     <smtp.port>2552</smtp.port>
     <jndi-remote-client.groupId>org.jboss.as</jndi-remote-client.groupId>
-    <jndi-remote-client.artifactId>jboss-as-ejb-client-bom</jndi-remote-client.artifactId>
-    <jndi-remote-client.version>7.1.1.Final</jndi-remote-client.version>
+    <jndi-remote-client.artifactId>jboss-as-controller-client</jndi-remote-client.artifactId>
+    <jndi-remote-client.version>7.2.0.Final</jndi-remote-client.version>
     <standalone.xml.file>standalone.xml</standalone.xml.file>
   </properties>
 
@@ -219,6 +219,7 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>jaxrs-api</artifactId>
+      <scope>${resteasy.scope}</scope>
     </dependency>
 
     <!-- to use rest client in test -->
@@ -248,17 +249,33 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxb-provider</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
 
     <dependency>
       <groupId>org.zanata</groupId>
       <artifactId>zanata-adapter-po</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>org.jboss.spec.javax.xml.bind</groupId>
+      <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
     </dependency>
 
     <dependency>
@@ -274,13 +291,25 @@
       <groupId>${jndi-remote-client.groupId}</groupId>
       <artifactId>${jndi-remote-client.artifactId}</artifactId>
       <version>${jndi-remote-client.version}</version>
-      <type>pom</type>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-remote-naming</artifactId>
+      <version>2.0.1.Final</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jboss.remoting</groupId>
+          <artifactId>jboss-remoting</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -336,7 +365,7 @@
       <properties>
         <standalone.xml.file>standalone_wildfly.xml</standalone.xml.file>
         <jndi-remote-client.groupId>org.wildfly</jndi-remote-client.groupId>
-        <jndi-remote-client.artifactId>wildfly-ejb-client-bom</jndi-remote-client.artifactId>
+        <jndi-remote-client.artifactId>wildfly-controller-client</jndi-remote-client.artifactId>
         <jndi-remote-client.version>${wildfly.version}</jndi-remote-client.version>
       </properties>
       <build>
diff --git a/pom.xml b/pom.xml
index d625905128..5d811459d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
     <icu4j.version>50.1.1</icu4j.version>
     <lombok.source.dir>${project.build.sourceDirectory}/org/zanata</lombok.source.dir>
     <lucene.version>3.6.2</lucene.version>
+    <solr.version>${lucene.version}</solr.version>
     <seam.version>2.3.1.Final</seam.version>
     <gwteventservice.version>1.2.1</gwteventservice.version>
     <okapi.version>0.22</okapi.version>
@@ -41,29 +42,29 @@
 
     <richfaces.version>4.5.0.Final</richfaces.version>
 
+    <arquillian.version>1.1.5.Final</arquillian.version>
+    <shrinkwrap.api.version>1.2.2</shrinkwrap.api.version>
+    <shrinkwrap.resolver.version>2.0.0</shrinkwrap.resolver.version>
     <shrinkwrap.desc.version>2.0.0-alpha-5</shrinkwrap.desc.version>
 
     <!-- see http://community.jboss.org/wiki/HibernateCompatibilityMatrix?decorator=print -->
     <!-- 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
-    -->
-    <hibernate.version>4.2.8.Final</hibernate.version>
+    <hibernate.version>4.2.17.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
      -->
-    <hibernate.search.version>4.4.2.Final</hibernate.search.version>
+    <!-- 4.4.5.Final is not in Central -->
+    <hibernate.search.version>4.4.4.Final</hibernate.search.version>
     <hibernate.entitymanager.version>${hibernate.version}</hibernate.entitymanager.version>
     <war_bundles_jsf_impl>false</war_bundles_jsf_impl>
-    <hibernate.validator.version>4.3.1.Final</hibernate.validator.version>
+    <hibernate.validator.version>4.3.2.Final</hibernate.validator.version>
 
     <!-- controls concordion output location-->
     <concordion.output.dir>${project.build.directory}/concordion</concordion.output.dir>
 
-    <!-- JBoss version for dependencies (arquillian, jboss-as-parent) -->
+    <!-- JBoss version for Arquillian dependencies -->
     <jboss.as.version>7.2.0.Final</jboss.as.version>
 
     <jdbc.groupId>mysql</jdbc.groupId>
@@ -71,6 +72,7 @@
     <jdbc.version>5.1.26</jdbc.version>
 
     <resteasy.scope>compile</resteasy.scope>
+    <resteasy.version>2.3.7.Final</resteasy.version>
 
     <cargo.extract.dir>${project.build.directory}/cargo/installs</cargo.extract.dir>
     <!-- This URL must be set by a profile (wildfly), settings.xml or mvn command line -->
@@ -81,37 +83,22 @@
   <dependencyManagement>
     <dependencies>
 
-      <!-- arquillian and shrinkwrap boms must precede other boms -->
       <dependency>
         <groupId>org.jboss.shrinkwrap</groupId>
-        <artifactId>shrinkwrap-bom</artifactId>
-        <version>1.2.2</version>
-        <scope>import</scope>
-        <type>pom</type>
-      </dependency>
-
-      <!-- Override dependency resolver with latest version.
-      This must go *BEFORE* the Arquillian BOM. -->
-      <dependency>
-        <groupId>org.jboss.shrinkwrap.resolver</groupId>
-        <artifactId>shrinkwrap-resolver-bom</artifactId>
-        <version>2.0.0</version>
-        <scope>import</scope>
-        <type>pom</type>
+        <artifactId>shrinkwrap-api</artifactId>
+        <version>${shrinkwrap.api.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.jboss.arquillian</groupId>
-        <artifactId>arquillian-bom</artifactId>
-        <version>1.1.5.Final</version>
-        <scope>import</scope>
-        <type>pom</type>
+        <groupId>org.jboss.shrinkwrap</groupId>
+        <artifactId>shrinkwrap-impl-base</artifactId>
+        <version>${shrinkwrap.api.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>org.jboss.spec.javax.servlet</groupId>
-        <artifactId>jboss-servlet-api_3.0_spec</artifactId>
-        <version>1.0.1.Final</version>
+        <groupId>org.jboss.shrinkwrap</groupId>
+        <artifactId>shrinkwrap-spi</artifactId>
+        <version>${shrinkwrap.api.version}</version>
       </dependency>
 
       <dependency>
@@ -120,43 +107,96 @@
         <version>1.13</version>
       </dependency>
 
-      <!-- repeat resteasy version to make sure the seam bom doesn't downgrade it -->
       <dependency>
-        <groupId>org.jboss.resteasy</groupId>
-        <artifactId>resteasy-bom</artifactId>
-        <version>${resteasy.version}</version>
+        <groupId>org.richfaces</groupId>
+        <artifactId>richfaces</artifactId>
+        <version>${richfaces.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.spec</groupId>
+        <artifactId>jboss-javaee-6.0</artifactId>
+        <version>3.0.2.Final</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
 
-      <!-- make sure the richfaces version is not provided by the seam bom -->
       <dependency>
-        <groupId>org.richfaces</groupId>
-        <artifactId>richfaces</artifactId>
-        <version>${richfaces.version}</version>
+        <groupId>antlr</groupId>
+        <artifactId>antlr</artifactId>
+        <version>2.7.7</version>
+        <scope>provided</scope>
       </dependency>
 
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>1.9</version>
+      </dependency>
 
-      <!--
-        TODO remove this, OR when we remove the org.jboss.seam bom, move this
-        to the jbosseap6 profile
-      -->
       <dependency>
-        <groupId>org.jboss.as</groupId>
-        <artifactId>jboss-as-parent</artifactId>
-        <version>${jboss.as.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
+        <groupId>dom4j</groupId>
+        <artifactId>dom4j</artifactId>
+        <version>1.6.1</version>
+        <scope>provided</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>com.sun.faces</groupId>
+        <artifactId>jsf-impl</artifactId>
+        <version>2.1.28</version>
+        <scope>provided</scope>
       </dependency>
 
-      <!-- Seam bom goes last because it uses outdated dependencies,
-           and isn't being updated -->
       <dependency>
         <groupId>org.jboss.seam</groupId>
-        <artifactId>bom</artifactId>
+        <artifactId>jboss-seam</artifactId>
+        <type>ejb</type>
+        <version>${seam.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.el</groupId>
+            <artifactId>el-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.seam</groupId>
+        <artifactId>jboss-seam-debug</artifactId>
+        <version>${seam.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.seam</groupId>
+        <artifactId>jboss-seam-mail</artifactId>
         <version>${seam.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.seam</groupId>
+        <artifactId>jboss-seam-ui</artifactId>
+        <version>${seam.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.security</groupId>
+        <artifactId>jboss-negotiation-common</artifactId>
+        <version>2.3.6.Final</version>
+        <scope>provided</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.jboss.web</groupId>
+        <artifactId>jbossweb</artifactId>
+        <version>7.5.4.Final</version>
+        <scope>provided</scope>
       </dependency>
 
       <dependency>
@@ -171,10 +211,16 @@
         </exclusions>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>4.4</version>
+      </dependency>
+
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
-        <version>4.2.3</version>
+        <version>4.4</version>
       </dependency>
 
       <dependency>
@@ -298,14 +344,52 @@
         <artifactId>zanata-common-api</artifactId>
         <version>${zanata.api.version}</version>
         <exclusions>
+          <exclusion>
+            <groupId>javax.annotation</groupId>
+            <artifactId>jsr250-api</artifactId>
+          </exclusion>
           <exclusion>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxb-provider</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-multipart-provider</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>org.zanata</groupId>
+        <artifactId>zanata-common-api</artifactId>
+        <version>${zanata.api.compat.version}</version>
+        <classifier>compat</classifier>
+        <scope>test</scope>
+        <exclusions>
           <exclusion>
             <groupId>javax.annotation</groupId>
             <artifactId>jsr250-api</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
 
@@ -567,13 +651,6 @@
         <version>0.9.14</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-search</artifactId>
-        <version>${hibernate.search.version}</version>
-        <scope>${hibernate.search.scope}</scope>
-      </dependency>
-
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-search-orm</artifactId>
@@ -586,6 +663,12 @@
         <artifactId>hibernate-search-engine</artifactId>
         <version>${hibernate.search.version}</version>
         <scope>${hibernate.search.scope}</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
@@ -599,18 +682,31 @@
         <groupId>org.hibernate.common</groupId>
         <artifactId>hibernate-commons-annotations</artifactId>
         <version>4.0.4.Final</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-core</artifactId>
         <version>${hibernate.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-ehcache</artifactId>
         <version>${hibernate.version}</version>
+        <!--<version>${hibernate.version}</version>-->
       </dependency>
 
       <dependency>
@@ -629,6 +725,12 @@
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>
         <version>${hibernate.validator.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
@@ -643,12 +745,6 @@
         <version>3.18.2-GA</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.jboss.el</groupId>
-        <artifactId>jboss-el</artifactId>
-        <version>1.0_02.CR6</version>
-      </dependency>
-
       <dependency>
         <groupId>org.jboss.logging</groupId>
         <artifactId>jboss-logging</artifactId>
@@ -686,11 +782,47 @@
         </exclusions>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-core</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-analyzers</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-facet</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-phonetic</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-smartcn</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-stempel</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+
       <!-- Solr dependencies -->
       <dependency>
         <groupId>org.apache.solr</groupId>
         <artifactId>solr-core</artifactId>
-        <version>3.6.2</version>
+        <version>${solr.version}</version>
         <exclusions>
           <exclusion>
             <groupId>commons-httpclient</groupId>
@@ -726,7 +858,7 @@
       <dependency>
         <groupId>org.apache.solr</groupId>
         <artifactId>solr-solrj</artifactId>
-        <version>3.6.2</version>
+        <version>${solr.version}</version>
         <exclusions>
           <exclusion>
             <groupId>commons-httpclient</groupId>
@@ -738,7 +870,11 @@
           </exclusion>
         </exclusions>
       </dependency>
-
+      <dependency>
+        <groupId>org.apache.solr</groupId>
+        <artifactId>solr-analysis-extras</artifactId>
+        <version>${solr.version}</version>
+      </dependency>
       <dependency>
         <groupId>net.customware.gwt.presenter</groupId>
         <artifactId>gwt-presenter</artifactId>
@@ -759,13 +895,6 @@
         </exclusions>
       </dependency>
 
-      <dependency>
-        <groupId>javax.validation</groupId>
-        <artifactId>validation-api</artifactId>
-        <version>1.0.0.GA</version>
-        <scope>compile</scope>
-      </dependency>
-
       <dependency>
         <groupId>org.concordion</groupId>
         <artifactId>concordion</artifactId>
@@ -930,6 +1059,18 @@
           <rules>
             <bannedDependencies>
               <excludes combine.children="append">
+                <!-- Use org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec -->
+                <exclude>javax.annotation:jsr250-api</exclude>
+
+                <!-- Use org.jboss.spec.javax.el:jboss-el-api_2.2_spec -->
+                <exclude>javax.el:el-api</exclude>
+
+                <!-- Use org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec -->
+                <exclude>javax.xml.bind:jaxb-api</exclude>
+
+                <!-- Use org.jboss.resteasy:jaxrs-api (since we package resteasy) -->
+                <exclude>org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_1.1_spec</exclude>
+
                 <!-- use org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec -->
                 <exclude>org.jboss.spec.javax.servlet:jboss-servlet-api_3.1_spec</exclude>
 
diff --git a/zanata-model/pom.xml b/zanata-model/pom.xml
index c0bdb4498b..85e8ddc087 100644
--- a/zanata-model/pom.xml
+++ b/zanata-model/pom.xml
@@ -34,7 +34,6 @@
         <configuration>
           <usedDependencies combine.children="append">
             <usedDependency>org.projectlombok:lombok</usedDependency>
-            <usedDependency>org.hibernate:hibernate-search</usedDependency>
           </usedDependencies>
         </configuration>
       </plugin>
@@ -190,15 +189,11 @@
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
-      <!-- okapi-lib-search would otherwise use lucene 3.0.0 -->
-      <version>${lucene.version}</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-analyzers</artifactId>
-      <!-- okapi-lib-search would otherwise use lucene 3.0.0 -->
-      <version>${lucene.version}</version>
     </dependency>
 
     <!-- Solr -->
@@ -253,7 +248,7 @@
 
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-search</artifactId>
+      <artifactId>hibernate-search-orm</artifactId>
     </dependency>
 
     <dependency>
diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
index 2726dfd38e..b55c08662e 100644
--- a/zanata-war/pom.xml
+++ b/zanata-war/pom.xml
@@ -102,7 +102,7 @@
         </executions>
         <configuration>
           <usedDependencies combine.children="append">
-            <usedDependency>javax.xml.bind:jaxb-api</usedDependency>
+            <usedDependency>org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec</usedDependency>
             <!-- runtime dep for liquibase logging -->
             <usedDependency>com.mattbertolini:liquibase-slf4j</usedDependency>
             <usedDependency>org.opensymphony.quartz:quartz</usedDependency>
@@ -110,8 +110,6 @@
             <usedDependency>org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-api</usedDependency>
             <!-- used by REST API interfaces -->
             <usedDependency>org.jboss.resteasy:resteasy-multipart-provider</usedDependency>
-            <!-- used indirectly by drools -->
-            <usedDependency>com.google.protobuf:protobuf-java</usedDependency>
             <!-- Used by javamelody for email/pdf support -->
             <usedDependency>com.lowagie:itext</usedDependency>
             <!--used to log sql and parameters when debugging Hibernate -->
@@ -121,22 +119,19 @@
             <!-- required for guava in gwt -->
             <usedDependency>com.google.guava:guava-gwt</usedDependency>
             <!-- Used for StringUtils lib -->
-            <!-- Needed by ui rendering on runtime -->
-            <usedDependency>javax.el:el-api</usedDependency>
+            <!-- Needed by ui rendering at runtime -->
+            <usedDependency>org.jboss.spec.javax.el:jboss-el-api_2.2_spec</usedDependency>
             <usedDependency>javax.servlet.jsp:jsp-api</usedDependency>
             <usedDependency>com.sun.faces:jsf-impl</usedDependency>
             <!-- Used for different content analyzers based on langugage for search. -->
             <usedDependency>org.apache.solr:solr-core</usedDependency>
             <usedDependency>org.apache.solr:solr-solrj</usedDependency>
-            <!-- Used for security.drl -->
-            <usedDependency>org.drools:drools-compiler</usedDependency>
             <usedDependency>org.antlr:antlr</usedDependency>
             <!-- Used by lucene search -->
             <usedDependency>org.hibernate.common:hibernate-commons-annotations</usedDependency>
             <!-- Used by hibernate -->
             <usedDependency>org.hibernate:hibernate-ehcache</usedDependency>
             <usedDependency>org.hibernate:hibernate-search-analyzers</usedDependency>
-            <usedDependency>org.hibernate:hibernate-search</usedDependency>
             <!-- used for arquillian deployment (org.zanata.Deployments) -->
             <usedDependency>org.hibernate:hibernate-testing</usedDependency>
             <usedDependency>org.jboss.arquillian.junit:arquillian-junit-container</usedDependency>
@@ -162,7 +157,9 @@
         </configuration>
       </plugin>
 
-
+      <!--<plugin>-->
+        <!--<artifactId>maven-enforcer-plugin</artifactId>-->
+      <!--</plugin>-->
 
       <plugin>
         <groupId>com.ning.maven.plugins</groupId>
@@ -175,32 +172,16 @@
             </dependency>
           </ignoredDependencies>
           <ignoredResources>
+            <!-- many, many jars -->
+            <ignoredResource>META-INF/.*</ignoredResource>
             <!-- iText and JavaMelody -->
             <ignoredResource>com/lowagie/text/pdf/fonts/cmap_info.txt</ignoredResource>
-            <!-- Seam -->
-            <ignoredResource>META-INF/components.xml</ignoredResource>
-            <!-- Seam and RichFaces -->
-            <ignoredResource>META-INF/faces-config.xml</ignoredResource>
-            <!-- any mail provider will need this -->
-            <ignoredResource>META-INF/javamail.providers</ignoredResource>
-            <!-- RichFaces 4.3 -->
-            <ignoredResource>META-INF/richfaces/resource-mappings.properties</ignoredResource>
-            <!-- Seam -->
-            <ignoredResource>META-INF/seam-deployment.properties</ignoredResource>
             <!-- drools and quartz -->
             <ignoredResource>build.properties</ignoredResource>
             <!-- Seam -->
             <ignoredResource>seam.properties</ignoredResource>
           </ignoredResources>
         </configuration>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
 
       <plugin>
@@ -1110,6 +1091,7 @@
         <dependency>
           <groupId>org.jboss.as</groupId>
           <artifactId>jboss-as-arquillian-common</artifactId>
+          <version>${jboss.as.version}</version>
           <scope>test</scope>
           <exclusions>
             <exclusion>
@@ -1136,14 +1118,28 @@
           </exclusions>
         </dependency>
 
+        <dependency>
+          <groupId>org.jboss.osgi.metadata</groupId>
+          <artifactId>jbosgi-metadata</artifactId>
+          <version>2.2.0.Final</version>
+        </dependency>
+
+        <dependency>
+          <groupId>org.jboss.osgi.vfs</groupId>
+          <artifactId>jbosgi-vfs30</artifactId>
+          <version>1.2.1.Final</version>
+        </dependency>
+
         <dependency>
           <groupId>org.jboss.as</groupId>
           <artifactId>jboss-as-controller-client</artifactId>
+          <version>${jboss.as.version}</version>
           <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>org.jboss.as</groupId>
           <artifactId>jboss-as-controller</artifactId>
+          <version>${jboss.as.version}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>
@@ -1289,6 +1285,12 @@
     <dependency>
       <groupId>org.zanata</groupId>
       <artifactId>zanata-adapter-po</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -1307,8 +1309,8 @@
     <dependency>
       <groupId>org.zanata</groupId>
       <artifactId>zanata-common-api</artifactId>
-      <version>${zanata.api.compat.version}</version>
       <classifier>compat</classifier>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
@@ -1356,6 +1358,7 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxrs</artifactId>
+      <version>${resteasy.version}</version>
       <scope>${resteasy.scope}</scope>
       <exclusions>
         <exclusion>
@@ -1376,6 +1379,12 @@
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxb-provider</artifactId>
       <scope>${resteasy.scope}</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
@@ -1389,12 +1398,16 @@
       <scope>${resteasy.scope}</scope>
       <exclusions>
         <exclusion>
-          <artifactId>
-            servlet-api
-          </artifactId>
-          <groupId>
-            javax.servlet
-          </groupId>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.jboss.resteasy</groupId>
+          <artifactId>resteasy-jaxrs</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
@@ -1424,38 +1437,11 @@
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-dmr</artifactId>
+      <version>1.2.1.Final</version>
       <scope>test</scope>
     </dependency>
 
-    <!-- Drools -->
-
-    <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.drools</groupId>
-      <artifactId>drools-compiler</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>ecj</artifactId>
-          <groupId>org.eclipse.jdt.core.compiler</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>org.antlr</artifactId>
-          <groupId>antlr</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>antlr</artifactId>
-          <groupId>antlr</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
+    <!-- TODO remove this? -->
     <dependency>
       <groupId>org.antlr</groupId>
       <artifactId>antlr</artifactId>
@@ -1466,13 +1452,11 @@
     <dependency>
       <groupId>antlr</groupId>
       <artifactId>antlr</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -1503,7 +1487,6 @@
     <dependency>
       <groupId>com.sun.faces</groupId>
       <artifactId>jsf-impl</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <!-- Hibernate / JPA -->
@@ -1535,6 +1518,10 @@
           <artifactId>ejb3-persistence</artifactId>
           <groupId>org.hibernate</groupId>
         </exclusion>
+        <exclusion>
+          <groupId>org.jboss.logging</groupId>
+          <artifactId>jboss-logging</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
@@ -1744,10 +1731,9 @@
       <artifactId>solr-solrj</artifactId>
     </dependency>
 
-    <!-- JBoss 5 Provided Dependencies -->
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-search</artifactId>
+      <artifactId>hibernate-search-orm</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.hibernate</groupId>
@@ -1773,19 +1759,16 @@
     <dependency>
       <groupId>org.hibernate.javax.persistence</groupId>
       <artifactId>hibernate-jpa-2.0-api</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-search-engine</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-search-orm</artifactId>
-    </dependency>
 
     <dependency>
-      <groupId>javax.el</groupId>
-      <artifactId>el-api</artifactId>
+      <groupId>org.jboss.spec.javax.el</groupId>
+      <artifactId>jboss-el-api_2.2_spec</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -1854,13 +1837,11 @@
     <dependency>
       <groupId>org.jboss.web</groupId>
       <artifactId>jbossweb</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.security</groupId>
       <artifactId>jboss-negotiation-common</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -1904,62 +1885,74 @@
     <dependency>
       <groupId>org.jboss.shrinkwrap.resolver</groupId>
       <artifactId>shrinkwrap-resolver-api-maven</artifactId>
+      <version>${shrinkwrap.resolver.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.shrinkwrap.resolver</groupId>
       <artifactId>shrinkwrap-resolver-api</artifactId>
+      <version>${shrinkwrap.resolver.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.arquillian.config</groupId>
       <artifactId>arquillian-config-api</artifactId>
+      <version>${arquillian.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
       <artifactId>arquillian-container-test-api</artifactId>
+      <version>${arquillian.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
       <artifactId>arquillian-container-test-impl-base</artifactId>
+      <version>${arquillian.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.container</groupId>
       <artifactId>arquillian-container-spi</artifactId>
+      <version>${arquillian.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.core</groupId>
       <artifactId>arquillian-core-spi</artifactId>
+      <version>${arquillian.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.core</groupId>
       <artifactId>arquillian-core-api</artifactId>
+      <version>${arquillian.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.junit</groupId>
       <artifactId>arquillian-junit-container</artifactId>
+      <version>${arquillian.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.junit</groupId>
       <artifactId>arquillian-junit-core</artifactId>
+      <version>${arquillian.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.test</groupId>
       <artifactId>arquillian-test-api</artifactId>
+      <version>${arquillian.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.test</groupId>
       <artifactId>arquillian-test-spi</artifactId>
+      <version>${arquillian.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -1989,6 +1982,7 @@
     <dependency>
       <groupId>org.jboss.arquillian.protocol</groupId>
       <artifactId>arquillian-protocol-servlet</artifactId>
+      <version>${arquillian.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -2068,6 +2062,12 @@
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- openid4java -->
@@ -2151,11 +2151,12 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>jaxrs-api</artifactId>
+      <version>${resteasy.version}</version>
       <scope>${resteasy.scope}</scope>
     </dependency>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>org.jboss.spec.javax.xml.bind</groupId>
+      <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -2224,9 +2225,10 @@
 
     <dependency>
       <!-- needed for GWT compilation of JAXB annotated classes -->
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>org.jboss.spec.javax.xml.bind</groupId>
+      <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
       <classifier>sources</classifier>
+      <version>1.0.4.Final</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java b/zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
index 9d396ba634..fb896c4223 100644
--- a/zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
+++ b/zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
@@ -29,7 +29,6 @@
 import org.jboss.seam.annotations.AutoCreate;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
-import org.zanata.apicompat.common.ContentState;
 import org.zanata.common.ActivityType;
 import org.zanata.model.Activity;
 import org.zanata.model.type.EntityType;