[tomee] branch master updated (a0f31d2 -> 24dfba9)

[jg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.


    from a0f31d2  Merge pull request #354 from jchemile/master
     add ef70d15  On Windows getJarLocation returns path like x:\tomee\bla\bla\bla This is not ok for the code that uses this path and tries to convert it to URL.
     new 24dfba9  Merge pull request #344 from doychin/jpa-on-windows

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/org/apache/openejb/config/CmpJpaConversion.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

[tomee] 01/01: Merge pull request #344 from doychin/jpa-on-windows

[jg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 24dfba90a39becc2ecee7f3bba65ec85b4231bf7
Merge: a0f31d2 ef70d15
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Sat Jan 5 16:24:36 2019 +0000

    Merge pull request #344 from doychin/jpa-on-windows
    
    On Windows getJarLocation returns path like x:\tomee\bla\bla\bla

 .../src/main/java/org/apache/openejb/config/CmpJpaConversion.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)