Merge branch 'master' into master Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/849b3842 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/849b3842 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/849b3842
Branch: refs/heads/master Commit: 849b3842ae5627530d618fdfff5cac940b704803 Parents: 571754a 64ed418 Author: Aboullaite Mohammed <aboullaite.moham...@gmail.com> Authored: Sun Dec 16 15:09:25 2018 +0100 Committer: GitHub <nore...@github.com> Committed: Sun Dec 16 15:09:25 2018 +0100 ---------------------------------------------------------------------- .../arquillian/tests/bmp/local/BigFinder.java | 22 ++ .../tests/bmp/local/BigFinderBean.java | 57 ++++ .../tests/bmp/local/BigFinderHome.java | 25 ++ .../arquillian/tests/bmp/local/BigFinderPK.java | 24 ++ .../tests/bmp/local/BmpLocalEntityTest.java | 62 ++++ .../tests/bmp/local/FinderServlet.java | 33 ++ .../arquillian/tests/bmp/local/FinderTest.java | 25 ++ .../tests/bmp/local/FinderTestBean.java | 86 ++++++ .../tests/bmp/local/FinderTestHome.java | 25 ++ .../arquillian/tests/bmp/local/IntegerPK.java | 99 ++++++ .../tests/bmp/local/LittleFinder.java | 22 ++ .../tests/bmp/local/LittleFinderBean.java | 55 ++++ .../tests/bmp/local/LittleFinderHome.java | 25 ++ .../tests/bmp/local/LittleFinderPK.java | 25 ++ .../arquillian/tests/bmp/local/StringPK.java | 71 +++++ .../arquillian/tests/bmp/remote/BigFinder.java | 22 ++ .../tests/bmp/remote/BigFinderBean.java | 57 ++++ .../tests/bmp/remote/BigFinderHome.java | 25 ++ .../tests/bmp/remote/BigFinderPK.java | 24 ++ .../tests/bmp/remote/BmpRemoteEntityTest.java | 62 ++++ .../tests/bmp/remote/FinderServlet.java | 33 ++ .../arquillian/tests/bmp/remote/FinderTest.java | 24 ++ .../tests/bmp/remote/FinderTestBean.java | 82 +++++ .../tests/bmp/remote/FinderTestHome.java | 25 ++ .../arquillian/tests/bmp/remote/IntegerPK.java | 99 ++++++ .../tests/bmp/remote/LittleFinder.java | 22 ++ .../tests/bmp/remote/LittleFinderBean.java | 55 ++++ .../tests/bmp/remote/LittleFinderHome.java | 25 ++ .../tests/bmp/remote/LittleFinderPK.java | 25 ++ .../arquillian/tests/bmp/remote/StringPK.java | 71 +++++ .../arquillian/tests/bmp/local/ejb-jar.xml | 65 ++++ .../openejb/arquillian/tests/bmp/local/web.xml | 42 +++ .../arquillian/tests/bmp/remote/ejb-jar.xml | 65 ++++ .../openejb/arquillian/tests/bmp/remote/web.xml | 42 +++ .../assembler/classic/JndiEncBuilder.java | 2 +- .../openejb/cdi/ManagedSecurityService.java | 30 +- .../apache/openejb/config/CmpJpaConversion.java | 5 +- .../apache/openejb/core/cmp/cmp2/EjbSelect.java | 4 +- .../openejb/core/ivm/IntraVmArtifact.java | 4 +- .../singleton/SingletonEjbObjectHandler.java | 2 +- .../openejb/core/timer/EJBCronTrigger.java | 4 +- .../stat/descriptive/DescriptiveStatistics.java | 4 +- .../java/org/apache/openejb/util/Index.java | 6 +- .../apache/openejb/util/PojoSerialization.java | 16 +- .../apache/openejb/config/InjectionTest.java | 2 +- .../openejb/core/LegacyInterfaceTest.java | 4 +- .../openejb/core/ivm/naming/IvmContextTest.java | 8 +- .../core/webservices/JPACMDIntegrationTest.java | 4 +- .../StatelessWithAroundInvokeOnlyTest.java | 2 +- .../test/entity/cmp2/model/StorageBean.java | 4 +- .../openejb/util/proxy/SampleLocalBean.java | 2 +- .../org/apache/openejb/jee/BooleanAdapter.java | 2 +- examples/mp-config-example/README.md | 4 + examples/mp-faulttolerance-retry/README.md | 4 + examples/mp-metrics-histogram/README.md | 182 +++++++++++ examples/mp-metrics-histogram/pom.xml | 109 +++++++ .../org/superbiz/histogram/WeatherService.java | 66 ++++ .../src/main/webapp/WEB-INF/web.xml | 25 ++ .../superbiz/histogram/WeatherServiceTest.java | 167 ++++++++++ .../src/test/resources/arquillian.xml | 30 ++ examples/mp-opentracing-traced/pom.xml | 88 ++++++ .../src/test/resources/arquillian.xml | 30 ++ examples/mp-rest-jwt/README.md | 307 +++++++++++++++++++ examples/mp-rest-jwt/pom.xml | 208 +++++++++++++ .../main/java/org/superbiz/moviefun/Movie.java | 70 +++++ .../java/org/superbiz/moviefun/MoviesBean.java | 61 ++++ .../moviefun/rest/ApplicationConfig.java | 28 ++ .../rest/MoviesMPJWTConfigurationProvider.java | 56 ++++ .../org/superbiz/moviefun/rest/MoviesRest.java | 77 +++++ .../java/org/superbiz/moviefun/MoviesTest.java | 132 ++++++++ .../java/org/superbiz/moviefun/TokenUtils.java | 257 ++++++++++++++++ .../resources/META-INF/application-client.xml | 1 + .../mp-rest-jwt/src/test/resources/Token1.json | 17 + .../mp-rest-jwt/src/test/resources/Token2.json | 14 + .../src/test/resources/arquillian.xml | 32 ++ .../src/test/resources/privateKey.pem | 28 ++ .../src/test/resources/publicKey.pem | 9 + examples/pom.xml | 7 +- examples/rest-mp-jwt/README.md | 4 - examples/rest-mp-jwt/pom.xml | 279 ----------------- .../main/java/org/superbiz/moviefun/Movie.java | 102 ------ .../java/org/superbiz/moviefun/MoviesBean.java | 91 ------ .../moviefun/rest/ApplicationConfig.java | 28 -- .../org/superbiz/moviefun/rest/LoadRest.java | 42 --- .../rest/MoviesMPJWTConfigurationProvider.java | 63 ---- .../org/superbiz/moviefun/rest/MoviesRest.java | 113 ------- .../java/org/superbiz/rest/GreetingService.java | 41 --- .../src/main/resources/META-INF/persistence.xml | 31 -- examples/rest-mp-jwt/src/main/tomee/tomee.xml | 27 -- .../java/org/superbiz/moviefun/MoviesTest.java | 88 ------ .../java/org/superbiz/moviefun/TokenUtils.java | 257 ---------------- .../org/superbiz/rest/GreetingServiceTest.java | 61 ---- .../resources/META-INF/application-client.xml | 1 - .../rest-mp-jwt/src/test/resources/Token1.json | 20 -- .../rest-mp-jwt/src/test/resources/Token2.json | 12 - .../src/test/resources/arquillian.xml | 32 -- .../src/test/resources/privateKey.pem | 28 -- .../src/test/resources/publicKey.pem | 9 - .../MPJWTSecurityAnnotationsInterceptor.java | 9 +- pom.xml | 6 +- .../server/cxf/rs/ApplicationFeatureTest.java | 87 ++++++ .../apache/openejb/server/rest/RESTService.java | 2 + tck/microprofile-tck/config/pom.xml | 38 +++ .../config/src/test/resources/arquillian.xml | 34 +- tck/microprofile-tck/fault-tolerance/pom.xml | 38 +++ .../src/test/resources/arquillian.xml | 27 +- tck/microprofile-tck/health/pom.xml | 38 +++ .../health/src/test/resources/arquillian.xml | 27 +- tck/microprofile-tck/jwt/pom.xml | 41 ++- .../jwt/src/test/resources/arquillian.xml | 61 +++- tck/microprofile-tck/metrics/pom.xml | 38 +++ .../metrics/src/test/resources/arquillian.xml | 33 +- tck/microprofile-tck/openapi/pom.xml | 39 ++- .../openapi/src/test/resources/arquillian.xml | 35 ++- tck/microprofile-tck/opentracing/pom.xml | 38 +++ .../src/test/resources/arquillian.xml | 27 +- tck/microprofile-tck/rest-client/pom.xml | 38 +++ .../src/test/resources/arquillian.xml | 33 +- .../src/main/resources/META-INF/plume/NOTICE | 23 ++ .../src/main/resources/META-INF/plus/NOTICE | 45 +++ .../tomee-microprofile-webapp/pom.xml | 6 +- tomee/tomee-plume-webapp/pom.xml | 134 ++++++++ .../src/main/resources/META-INF/NOTICE | 75 ++++- tomee/tomee-plus-webapp/pom.xml | 134 ++++++++ .../src/main/resources/META-INF/NOTICE | 91 ++++++ 125 files changed, 4744 insertions(+), 1417 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/849b3842/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index c11a727,770f3af..1878b85 --- a/pom.xml +++ b/pom.xml @@@ -215,10 -216,8 +215,14 @@@ <microprofile.opentracing.version>1.1</microprofile.opentracing.version> <microprofile.opentracing.impl.version>1.0.0</microprofile.opentracing.impl.version> <opentracing.api>0.31.0</opentracing.api> ++ + <!-- Jackson required by OpenAPI Impl --> + <jackson.version>2.9.4</jackson.version> ++ + <!-- Javadoc & Asciidoclet --> + <javadoc.version>3.0.1</javadoc.version> + <asciidoclet.version>1.5.0</asciidoclet.version> - ++ </properties> <build>