Merge branch 'master' into glassfish-version
-rw-r--r-- 63 .gitignore
-rw-r--r-- 2362 pom.xml
drwxr-xr-x - src