[zanata/zanata-server] feea5a: Fix dependency problem

[GitHub]

  Branch: refs/heads/cdi-prep
  Home:   https://github.com/zanata/zanata-server
  Commit: feea5a68d9f87d78579ab1ee0617f9cceefe7b33
      https://github.com/zanata/zanata-server/commit/feea5a68d9f87d78579ab1ee0617f9cceefe7b33
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Fix dependency problem


  Commit: cf4af0e2247c1ce08a32b53b40b459ea7c883e7e
      https://github.com/zanata/zanata-server/commit/cf4af0e2247c1ce08a32b53b40b459ea7c883e7e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M .gitignore
    M build.sh
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M functional-test/src/test/resources/log4j.xml
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/app/index.html
    A zanata-war/src/main/webapp/resources/script/test/finished.js

  Log Message:
  -----------
  Merge branch 'reduce-boms' into cdi-prep

Conflicts:
	pom.xml


Compare: https://github.com/zanata/zanata-server/compare/0d581dce6cc9...cf4af0e2247c