[zanata/zanata] 6b3033: change testng version to 6.4

[GitHub]

  Branch: refs/heads/rhbz803572
  Home:   https://github.com/zanata/zanata
  Commit: 6b3033ecdc7090a820b32750fca8cebf8f04ce51
      https://github.com/zanata/zanata/commit/6b3033ecdc7090a820b32750fca8cebf8f04ce51
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
  M zanata-parent/pom.xml

  Log Message:
  -----------
  change testng version to 6.4


  Commit: 248d67c7ca8fd826a5d99857515f9dd521cdb616
      https://github.com/zanata/zanata/commit/248d67c7ca8fd826a5d99857515f9dd521cdb616
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
  R server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
  R server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
  R server/zanata-war/src/main/java/org/zanata/dao/ContentPropertySelector.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
  M server/zanata-war/src/main/resources/db/h2/create_trigger.sql
  M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
  M server/zanata-war/src/main/webapp/WEB-INF/liquibase
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css
  M server/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
  A server/zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
  M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
  M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
  A server/zanata-war/src/test/java/org/zanata/model/HTextFlowJPATest.java
  M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
  A server/zanata-war/src/test/java/org/zanata/testng/TestMethodListener.java
  A server/zanata-war/src/test/java/org/zanata/testng/annotations/Disabled.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
  M server/zanata-war/src/test/resources/import.sql
  M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Merge branch 'rhbz803572' of github.com:zanata/zanata into rhbz803572

Conflicts:
	server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java


Compare: https://github.com/zanata/zanata/compare/456fb45...248d67c