[zanata/zanata-common] 1c60db: prepare for next development iteration

[GitHub]

  Branch: refs/heads/release
  Home:   https://github.com/zanata/zanata-common
  Commit: 1c60db99d34543a2cbcd2fd09bcea9108201c664
      https://github.com/zanata/zanata-common/commit/1c60db99d34543a2cbcd2fd09bcea9108201c664
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M pom.xml
    M zanata-adapter-glossary/pom.xml
    M zanata-adapter-po/pom.xml
    M zanata-adapter-properties/pom.xml
    M zanata-adapter-xliff/pom.xml
    M zanata-common-util/pom.xml

  Log Message:
  -----------
  prepare for next development iteration


  Commit: 71c6baa42db3bf12f9fc99f64c08af91aa153039
      https://github.com/zanata/zanata-common/commit/71c6baa42db3bf12f9fc99f64c08af91aa153039
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 3fe5944760dc277e654ed0b5fa5146156f4ac791
      https://github.com/zanata/zanata-common/commit/3fe5944760dc277e654ed0b5fa5146156f4ac791
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-19 (Mon, 19 May 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 6429617e54661be401514164ab7b39d314e0cbe3
      https://github.com/zanata/zanata-common/commit/6429617e54661be401514164ab7b39d314e0cbe3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update zanata-parent


  Commit: 552fda33886b3be4364479c093eb7fc8d4729844
      https://github.com/zanata/zanata-common/commit/552fda33886b3be4364479c093eb7fc8d4729844
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Revert "Update zanata-parent"

This reverts commit 6429617e54661be401514164ab7b39d314e0cbe3.


  Commit: b392d92da7984f107edce60975290c8d5f126a96
      https://github.com/zanata/zanata-common/commit/b392d92da7984f107edce60975290c8d5f126a96
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M pom.xml
    M zanata-adapter-glossary/pom.xml
    M zanata-adapter-xliff/pom.xml
    M zanata-common-util/pom.xml

  Log Message:
  -----------
  Replace findbugs:jsr305 with findbugs:annotations; update parent


  Commit: f24f283ee375c2381b1aee6f244bde0b0d72ed41
      https://github.com/zanata/zanata-common/commit/f24f283ee375c2381b1aee6f244bde0b0d72ed41
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M zanata-common-util/src/main/java/org/zanata/util/ShortString.java
    M zanata-common-util/src/test/java/org/zanata/util/TestShortString.java

  Log Message:
  -----------
  Add a parameter to ShortString shorten.

This is a patch to enable configuration of the length of the
resulting string in shorten.


  Commit: 97b2dc675cee12155605e11e94a08fc011f82509
      https://github.com/zanata/zanata-common/commit/97b2dc675cee12155605e11e94a08fc011f82509
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M zanata-common-util/src/main/java/org/zanata/util/ShortString.java
    M zanata-common-util/src/test/java/org/zanata/util/TestShortString.java

  Log Message:
  -----------
  Merge pull request #6 from zanata/configureshorten

Add a parameter to ShortString shorten.


  Commit: 58da48479aa3c02e08b9309e516e6426c7935099
      https://github.com/zanata/zanata-common/commit/58da48479aa3c02e08b9309e516e6426c7935099
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-29 (Tue, 29 Jul 2014)

  Changed paths:
    M pom.xml
    M zanata-adapter-xliff/pom.xml

  Log Message:
  -----------
  Remove dependency on jaxb-impl


  Commit: 9eab1a31364901d12399b3fb1a7cae590359be4a
      https://github.com/zanata/zanata-common/commit/9eab1a31364901d12399b3fb1a7cae590359be4a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-01 (Fri, 01 Aug 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update api


  Commit: 30f951fa2fd1f1f63508105bbfdb96d10446728b
      https://github.com/zanata/zanata-common/commit/30f951fa2fd1f1f63508105bbfdb96d10446728b
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-09-25 (Thu, 25 Sep 2014)

  Log Message:
  -----------
  Merge branch 'release'

This merge is done to ensure that release can be brought up-to-date with
master as a fast-forward-only merge, in preparation for release.

Using merge strategy 'ours' to prevent version changes in release
overwriting the correct versions in master.


  Commit: 401c2299eeed926ea9d4fd604a6ad324317d5397
      https://github.com/zanata/zanata-common/commit/401c2299eeed926ea9d4fd604a6ad324317d5397
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-09-25 (Thu, 25 Sep 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Use lastest parent and api versions.

Use parent 20, api 3.4.0


Compare: https://github.com/zanata/zanata-common/compare/3c5451afb7f7...401c2299eeed