[seam-commits] [seam/conversation] 0fa73a: Merge branch 'release/3.1.0.Final'

[GitHub]

  Branch: refs/heads/develop
  Home:   https://github.com/seam/conversation
  Commit: 0fa73a7c24ca97353fc7555fa6aca4701d1fb4c0
      https://github.com/seam/conversation/commit/0fa73a7c24ca97353fc7555fa6aca4701d1fb4c0
  Author: LightGuard <lightguard.jp at gmail.com>
  Date:   2012-01-05 (Thu, 05 Jan 2012)

  Changed paths:
    M candi/pom.xml
  M candi/src/test/java/org/jboss/seam/conversation/test/CanDISmokeTest.java
  M owb/pom.xml
  M owb/src/test/java/org/jboss/seam/conversation/test/OWBSmokeTest.java
  M owb/src/test/resources/arquillian.xml
  M pom.xml
  M spi/pom.xml
  M spi/src/main/java/org/jboss/seam/conversation/api/AbstractHttpSeamConversationContext.java
  M spi/src/main/java/org/jboss/seam/conversation/api/AbstractManagerObjectFactory.java
  M spi/src/main/java/org/jboss/seam/conversation/api/AbstractSeamConversationContext.java
  M spi/src/test/java/org/jboss/seam/conversation/support/RealTestFilter.java
  M spi/src/test/java/org/jboss/seam/conversation/test/Deployments.java
  M spi/src/test/java/org/jboss/seam/conversation/test/SmokeBase.java
  M weld/pom.xml
  M weld/src/test/java/org/jboss/seam/conversation/test/WeldSmokeTest.java
  M weld/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Merge branch 'release/3.1.0.Final'


  Commit: 488ed429815dc7babc9efcaa9057253321cf99ea
      https://github.com/seam/conversation/commit/488ed429815dc7babc9efcaa9057253321cf99ea
  Author: LightGuard <lightguard.jp at gmail.com>
  Date:   2012-01-05 (Thu, 05 Jan 2012)

  Changed paths:
    M candi/pom.xml
  M owb/pom.xml
  M pom.xml
  M spi/pom.xml
  M weld/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release 3.0.0.Final


  Commit: 342634dfecf25d5954876c7c31e52ce814541578
      https://github.com/seam/conversation/commit/342634dfecf25d5954876c7c31e52ce814541578
  Author: LightGuard <lightguard.jp at gmail.com>
  Date:   2012-01-05 (Thu, 05 Jan 2012)

  Changed paths:
    M candi/pom.xml
  M owb/pom.xml
  M pom.xml
  M spi/pom.xml
  M weld/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration


  Commit: ffa0bf1c6e01ec09bb05c168234ca00f782494cf
      https://github.com/seam/conversation/commit/ffa0bf1c6e01ec09bb05c168234ca00f782494cf
  Author: LightGuard <lightguard.jp at gmail.com>
  Date:   2012-01-05 (Thu, 05 Jan 2012)

  Log Message:
  -----------
  Merge branch 'release/3.0.0.Final' into develop


  Commit: a3c8d853f00f9cc05dbe086fa68f9dfdeae2443b
      https://github.com/seam/conversation/commit/a3c8d853f00f9cc05dbe086fa68f9dfdeae2443b
  Author: Marek Schmidt <maschmid at redhat.com>
  Date:   2012-01-23 (Mon, 23 Jan 2012)

  Changed paths:
    M pom.xml
  M spi/src/test/java/org/jboss/seam/conversation/test/Deployments.java

  Log Message:
  -----------
  SEAM-130, workaround to make the tests run on Weld


  Commit: a5f2e3f42829f8405e6bee6caab43fd034e5be81
      https://github.com/seam/conversation/commit/a5f2e3f42829f8405e6bee6caab43fd034e5be81
  Author: Marek Schmidt <maschmid at redhat.com>
  Date:   2012-01-23 (Mon, 23 Jan 2012)

  Changed paths:
    M owb/src/main/java/org/jboss/seam/conversation/plugins/openwebbeans/ManagerObjectFactory.java
  M owb/src/main/java/org/jboss/seam/conversation/plugins/openwebbeans/OpenWebBeansHttpSeamConversationContext.java
  M owb/src/main/java/org/jboss/seam/conversation/plugins/openwebbeans/OpenWebBeansSeamConversationManager.java
  M owb/src/main/java/org/jboss/seam/conversation/plugins/openwebbeans/SeamOWBConversationServicePlugin.java
  M owb/src/test/java/org/jboss/seam/conversation/test/OWBSmokeTest.java
  M owb/src/test/resources/arquillian.xml
  M pom.xml

  Log Message:
  -----------
  upgrade owb to 1.1.3


  Commit: 319eb160241dd4d955aa7c994f40214553a95064
      https://github.com/seam/conversation/commit/319eb160241dd4d955aa7c994f40214553a95064
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M owb/src/main/java/org/jboss/seam/conversation/plugins/openwebbeans/ManagerObjectFactory.java
  M owb/src/main/java/org/jboss/seam/conversation/plugins/openwebbeans/OpenWebBeansHttpSeamConversationContext.java
  M owb/src/main/java/org/jboss/seam/conversation/plugins/openwebbeans/OpenWebBeansSeamConversationManager.java
  M owb/src/main/java/org/jboss/seam/conversation/plugins/openwebbeans/SeamOWBConversationServicePlugin.java
  M owb/src/test/java/org/jboss/seam/conversation/test/OWBSmokeTest.java
  M owb/src/test/resources/arquillian.xml
  M pom.xml
  M spi/src/test/java/org/jboss/seam/conversation/test/Deployments.java

  Log Message:
  -----------
  Merge remote-tracking branch 'maschmid/SEAM-130' into SEAM-130


  Commit: 2b2ad153667c9c003ad10cb52441a4a413986941
      https://github.com/seam/conversation/commit/2b2ad153667c9c003ad10cb52441a4a413986941
  Author: Marek Schmidt <maschmid at redhat.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    A building.txt
  A settings.xml

  Log Message:
  -----------
  add settings.xml and building.txt


  Commit: 2099ddcf00b770777319ad883c5eacb2ced2216b
      https://github.com/seam/conversation/commit/2099ddcf00b770777319ad883c5eacb2ced2216b
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    A building.txt
  A settings.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'maschmid/SEAM-130' into SEAM-130


  Commit: 0b0e8a57807eedaeaa536c1a324e6b50c7c780f8
      https://github.com/seam/conversation/commit/0b0e8a57807eedaeaa536c1a324e6b50c7c780f8
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M owb/src/main/java/org/jboss/seam/conversation/plugins/openwebbeans/OpenWebBeansSeamConversationManager.java

  Log Message:
  -----------
  Msg typo.


  Commit: fe5db83f7a26b7169c0902da57fdf40685d4590a
      https://github.com/seam/conversation/commit/fe5db83f7a26b7169c0902da57fdf40685d4590a
  Author: Ales Justin <ales.justin at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Upgrade Weld to 1.1.5.Final


  Commit: 978bc4aac01c1fa202ca11a95c85b937828e6886
      https://github.com/seam/conversation/commit/978bc4aac01c1fa202ca11a95c85b937828e6886
  Author: LightGuard <lightguard.jp at gmail.com>
  Date:   2012-01-27 (Fri, 27 Jan 2012)

  Changed paths:
    A building.txt
  M owb/src/main/java/org/jboss/seam/conversation/plugins/openwebbeans/ManagerObjectFactory.java
  M owb/src/main/java/org/jboss/seam/conversation/plugins/openwebbeans/OpenWebBeansHttpSeamConversationContext.java
  M owb/src/main/java/org/jboss/seam/conversation/plugins/openwebbeans/OpenWebBeansSeamConversationManager.java
  M owb/src/main/java/org/jboss/seam/conversation/plugins/openwebbeans/SeamOWBConversationServicePlugin.java
  M owb/src/test/java/org/jboss/seam/conversation/test/OWBSmokeTest.java
  M owb/src/test/resources/arquillian.xml
  M pom.xml
  A settings.xml
  M spi/src/test/java/org/jboss/seam/conversation/test/Deployments.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into develop


Compare: https://github.com/seam/conversation/compare/1322c4d...978bc4a