[tomee] Git Push Summary
Repository: tomee Updated Tags: refs/tags/tomee-project-7.1.0 [created] 392c6e421
[3/6] tomee git commit: [maven-release-plugin] prepare release tomee-project-7.1.0
[maven-release-plugin] prepare release tomee-project-7.1.0 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/62afa561 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/62afa561 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/62afa561 Branch: refs/heads/tomee-7.1.x Commit: 62afa561b1e69a342292df408f8df3ad7b6ad086 Parents: 6d3ef94 Author: Jonathan Gallimore Authored: Wed Aug 22 22:29:58 2018 +0100 Committer: Jonathan Gallimore Committed: Wed Aug 22 22:29:58 2018 +0100 -- arquillian/arquillian-common/pom.xml| 2 +- arquillian/arquillian-openejb-embedded/pom.xml | 4 ++-- .../arquillian-openejb-transaction-provider/pom.xml | 2 +- arquillian/arquillian-tck/pom.xml | 2 +- arquillian/arquillian-tomee-common/pom.xml | 2 +- arquillian/arquillian-tomee-embedded/pom.xml| 2 +- .../arquillian-tomee-moviefun-example/pom.xml | 2 +- arquillian/arquillian-tomee-remote/pom.xml | 8 .../arquillian-tomee-codi-tests/pom.xml | 2 +- .../arquillian-tomee-config-tests/pom.xml | 2 +- .../arquillian-tomee-jaxrs-tests/pom.xml| 2 +- .../arquillian-tomee-jaxws-tests/pom.xml| 2 +- .../arquillian-tomee-jms-tests/pom.xml | 2 +- .../arquillian-tomee-webprofile-tests/pom.xml | 2 +- arquillian/arquillian-tomee-tests/pom.xml | 2 +- arquillian/arquillian-tomee-webapp-remote/pom.xml | 2 +- arquillian/pom.xml | 4 ++-- arquillian/ziplock/pom.xml | 2 +- assembly/openejb-lite/pom.xml | 2 +- assembly/openejb-standalone/pom.xml | 2 +- assembly/pom.xml| 2 +- container/mbean-annotation-api/pom.xml | 2 +- container/openejb-api/pom.xml | 2 +- container/openejb-core/pom.xml | 2 +- container/openejb-javaagent/pom.xml | 2 +- container/openejb-jee-accessors/pom.xml | 2 +- container/openejb-jee/pom.xml | 2 +- container/openejb-jpa-integration/pom.xml | 2 +- container/openejb-junit/pom.xml | 2 +- container/openejb-loader/pom.xml| 2 +- container/pom.xml | 2 +- examples/access-timeout-meta/pom.xml| 4 ++-- examples/access-timeout/pom.xml | 4 ++-- examples/alternate-descriptors/pom.xml | 4 ++-- examples/application-composer/pom.xml | 4 ++-- examples/applicationcomposer-jaxws-cdi/pom.xml | 6 +++--- examples/applicationexception/pom.xml | 4 ++-- examples/arquillian-jpa/pom.xml | 6 +++--- examples/async-methods/pom.xml | 4 ++-- examples/async-postconstruct/pom.xml| 4 ++-- examples/bean-validation-design-by-contract/pom.xml | 4 ++-- examples/cdi-alternative-and-stereotypes/pom.xml| 4 ++-- examples/cdi-application-scope/pom.xml | 4 ++-- examples/cdi-basic/pom.xml | 4 ++-- examples/cdi-ejbcontext-jaas/pom.xml| 6 +++--- examples/cdi-events/pom.xml | 4 ++-- examples/cdi-interceptors/pom.xml | 4 ++-- examples/cdi-produces-disposes/pom.xml | 4 ++-- examples/cdi-produces-field/pom.xml | 4 ++-- examples/cdi-realm/pom.xml | 6 +++--- examples/cdi-request-scope/pom.xml | 4 ++-- examples/cdi-session-scope/pom.xml | 4 ++-- examples/change-jaxws-url/pom.xml | 16 examples/client-resource-lookup-preview/pom.xml | 8 examples/component-interfaces/pom.xml | 4 ++-- examples/connector-ear/connector-sample-api/pom.xml | 2 +- examples/connector-ear/connector-sample-ear/pom.xml | 2 +- .../connector-sample-functional-tests/pom.xml | 8 .../connector-ear/connector-sample-impl/pom.xml | 2 +- examples/connector-ear/connector-sample-rar/pom.xml | 2 +- examples/connector-ear/connector-sample-war/pom.xml | 2 +- examples/connector-ear/pom.xml | 2 +- examples/connector-war/pom.xml | 12 ++-- examples/cucumber-jvm/pom.xml | 4 ++-- examples/custom-injection/pom.xml | 4 ++-- examples/datasource-ciphered-password/pom.xml | 4 ++-- examples/datasource-definition/pom.xml | 4 ++-- examples/datasource-versioning/pom.xml | 10 +- examples/decorators/pom.xml | 4 ++-- examples/deltaspike-configproperty/pom.xml
[5/6] tomee git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/ear-testing/business-logic/pom.xml -- diff --git a/examples/ear-testing/business-logic/pom.xml b/examples/ear-testing/business-logic/pom.xml index 6662d51..86552a2 100644 --- a/examples/ear-testing/business-logic/pom.xml +++ b/examples/ear-testing/business-logic/pom.xml @@ -23,7 +23,7 @@ org.superbiz myear -7.1.0 +7.1.1-SNAPSHOT 4.0.0 business-logic @@ -77,7 +77,7 @@ org.apache.tomee openejb-core - 7.1.0 + 7.1.1-SNAPSHOT test http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/ear-testing/business-model/pom.xml -- diff --git a/examples/ear-testing/business-model/pom.xml b/examples/ear-testing/business-model/pom.xml index 9bfaf8c..e9ef4ed 100644 --- a/examples/ear-testing/business-model/pom.xml +++ b/examples/ear-testing/business-model/pom.xml @@ -23,7 +23,7 @@ org.superbiz myear -7.1.0 +7.1.1-SNAPSHOT 4.0.0 business-model http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/ear-testing/pom.xml -- diff --git a/examples/ear-testing/pom.xml b/examples/ear-testing/pom.xml index b86d39e..f6cd135 100644 --- a/examples/ear-testing/pom.xml +++ b/examples/ear-testing/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.superbiz myear - 7.1.0 + 7.1.1-SNAPSHOT pom OpenEJB :: Examples :: Ear Testing http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/ejb-examples/pom.xml -- diff --git a/examples/ejb-examples/pom.xml b/examples/ejb-examples/pom.xml index f31b2ab..67a3292 100644 --- a/examples/ejb-examples/pom.xml +++ b/examples/ejb-examples/pom.xml @@ -24,7 +24,7 @@ org.superbiz ejb-examples war - 7.1.0 + 7.1.1-SNAPSHOT OpenEJB :: Web Examples :: EJB Examples War UTF-8 @@ -61,7 +61,7 @@ org.apache.tomee.maven tomee-maven-plugin -7.1.0 +7.1.1-SNAPSHOT /ejb-examples plus http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/ejb-webservice/pom.xml -- diff --git a/examples/ejb-webservice/pom.xml b/examples/ejb-webservice/pom.xml index a24d647..4df62f7 100644 --- a/examples/ejb-webservice/pom.xml +++ b/examples/ejb-webservice/pom.xml @@ -24,7 +24,7 @@ org.superbiz ejb-webservice war - 7.1.0 + 7.1.1-SNAPSHOT OpenEJB :: Web Examples :: EJB WebService UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/groovy-cdi/pom.xml -- diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml index e7afeee..34b87c1 100644 --- a/examples/groovy-cdi/pom.xml +++ b/examples/groovy-cdi/pom.xml @@ -23,7 +23,7 @@ org.superbiz groovy-cdi jar - 7.1.0 + 7.1.1-SNAPSHOT OpenEJB :: Examples :: Groovy CDI @@ -98,13 +98,13 @@ org.apache.tomee arquillian-openejb-embedded - 7.1.0 + 7.1.1-SNAPSHOT test org.apache.tomee ziplock - 7.1.0 + 7.1.1-SNAPSHOT test http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/groovy-jpa/pom.xml -- diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml index f94c8f3..c5e5b32 100644 --- a/examples/groovy-jpa/pom.xml +++ b/examples/groovy-jpa/pom.xml @@ -23,7 +23,7 @@ org.superbiz groovy-jpa jar - 7.1.0 + 7.1.1-SNAPSHOT OpenEJB :: Examples :: Groovy JPA @@ -99,13 +99,13 @@ org.apache.tomee arquillian-openejb-embedded - 7.1.0 + 7.1.1-SNAPSHOT test org.apache.tomee ziplock - 7.1.0 + 7.1.1-SNAPSHOT test http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/groovy-spock/pom.xml -- diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml index 65e4698..a9d73f9 100644 --- a/examples/groovy-spock/pom.xml +++ b/examples/groovy-spock/pom.xml @@ -23,7 +23,7 @@ org.superbiz groovy-spock jar - 7.1.0 + 7.1.1-SNAPSHOT OpenEJB :: Examples :: Groovy Spock @@ -108,7 +108,7 @@ org.apache.tomee arquillian-openejb-embedded - 7.1.0 + 7.1.1-SNAPSHOT test @@ -120,7 +120,7 @@ org.apache.tomee ziplock - 7.1.0 + 7.1.1-SNAPSHOT test http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/helloworld-weblogic/pom.xm
[6/6] tomee git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/eb3305f0 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/eb3305f0 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/eb3305f0 Branch: refs/heads/tomee-7.1.x Commit: eb3305f015dd19a59d54b89659dbfa167253e77a Parents: 62afa56 Author: Jonathan Gallimore Authored: Wed Aug 22 22:30:10 2018 +0100 Committer: Jonathan Gallimore Committed: Wed Aug 22 22:30:10 2018 +0100 -- arquillian/arquillian-common/pom.xml| 2 +- arquillian/arquillian-openejb-embedded/pom.xml | 4 ++-- .../arquillian-openejb-transaction-provider/pom.xml | 2 +- arquillian/arquillian-tck/pom.xml | 2 +- arquillian/arquillian-tomee-common/pom.xml | 2 +- arquillian/arquillian-tomee-embedded/pom.xml| 2 +- .../arquillian-tomee-moviefun-example/pom.xml | 2 +- arquillian/arquillian-tomee-remote/pom.xml | 8 .../arquillian-tomee-codi-tests/pom.xml | 2 +- .../arquillian-tomee-config-tests/pom.xml | 2 +- .../arquillian-tomee-jaxrs-tests/pom.xml| 2 +- .../arquillian-tomee-jaxws-tests/pom.xml| 2 +- .../arquillian-tomee-jms-tests/pom.xml | 2 +- .../arquillian-tomee-webprofile-tests/pom.xml | 2 +- arquillian/arquillian-tomee-tests/pom.xml | 2 +- arquillian/arquillian-tomee-webapp-remote/pom.xml | 2 +- arquillian/pom.xml | 4 ++-- arquillian/ziplock/pom.xml | 2 +- assembly/openejb-lite/pom.xml | 2 +- assembly/openejb-standalone/pom.xml | 2 +- assembly/pom.xml| 2 +- container/mbean-annotation-api/pom.xml | 2 +- container/openejb-api/pom.xml | 2 +- container/openejb-core/pom.xml | 2 +- container/openejb-javaagent/pom.xml | 2 +- container/openejb-jee-accessors/pom.xml | 2 +- container/openejb-jee/pom.xml | 2 +- container/openejb-jpa-integration/pom.xml | 2 +- container/openejb-junit/pom.xml | 2 +- container/openejb-loader/pom.xml| 2 +- container/pom.xml | 2 +- examples/access-timeout-meta/pom.xml| 4 ++-- examples/access-timeout/pom.xml | 4 ++-- examples/alternate-descriptors/pom.xml | 4 ++-- examples/application-composer/pom.xml | 4 ++-- examples/applicationcomposer-jaxws-cdi/pom.xml | 6 +++--- examples/applicationexception/pom.xml | 4 ++-- examples/arquillian-jpa/pom.xml | 6 +++--- examples/async-methods/pom.xml | 4 ++-- examples/async-postconstruct/pom.xml| 4 ++-- examples/bean-validation-design-by-contract/pom.xml | 4 ++-- examples/cdi-alternative-and-stereotypes/pom.xml| 4 ++-- examples/cdi-application-scope/pom.xml | 4 ++-- examples/cdi-basic/pom.xml | 4 ++-- examples/cdi-ejbcontext-jaas/pom.xml| 6 +++--- examples/cdi-events/pom.xml | 4 ++-- examples/cdi-interceptors/pom.xml | 4 ++-- examples/cdi-produces-disposes/pom.xml | 4 ++-- examples/cdi-produces-field/pom.xml | 4 ++-- examples/cdi-realm/pom.xml | 6 +++--- examples/cdi-request-scope/pom.xml | 4 ++-- examples/cdi-session-scope/pom.xml | 4 ++-- examples/change-jaxws-url/pom.xml | 16 examples/client-resource-lookup-preview/pom.xml | 8 examples/component-interfaces/pom.xml | 4 ++-- examples/connector-ear/connector-sample-api/pom.xml | 2 +- examples/connector-ear/connector-sample-ear/pom.xml | 2 +- .../connector-sample-functional-tests/pom.xml | 8 .../connector-ear/connector-sample-impl/pom.xml | 2 +- examples/connector-ear/connector-sample-rar/pom.xml | 2 +- examples/connector-ear/connector-sample-war/pom.xml | 2 +- examples/connector-ear/pom.xml | 2 +- examples/connector-war/pom.xml | 12 ++-- examples/cucumber-jvm/pom.xml | 4 ++-- examples/custom-injection/pom.xml | 4 ++-- examples/datasource-ciphered-password/pom.xml | 4 ++-- examples/datasource-definition/pom.xml | 4 ++-- examples/datasource-versioning/pom.xml | 10 +- examples/decorators/pom.xml | 4 ++-- examples/deltaspike-configproperty/pom.
[2/6] tomee git commit: [maven-release-plugin] prepare release tomee-project-7.1.0
http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/ear-testing/business-logic/pom.xml -- diff --git a/examples/ear-testing/business-logic/pom.xml b/examples/ear-testing/business-logic/pom.xml index ada1dde..6662d51 100644 --- a/examples/ear-testing/business-logic/pom.xml +++ b/examples/ear-testing/business-logic/pom.xml @@ -23,7 +23,7 @@ org.superbiz myear -7.1.0-SNAPSHOT +7.1.0 4.0.0 business-logic @@ -77,7 +77,7 @@ org.apache.tomee openejb-core - 7.1.0-SNAPSHOT + 7.1.0 test http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/ear-testing/business-model/pom.xml -- diff --git a/examples/ear-testing/business-model/pom.xml b/examples/ear-testing/business-model/pom.xml index 40fa2aa..9bfaf8c 100644 --- a/examples/ear-testing/business-model/pom.xml +++ b/examples/ear-testing/business-model/pom.xml @@ -23,7 +23,7 @@ org.superbiz myear -7.1.0-SNAPSHOT +7.1.0 4.0.0 business-model http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/ear-testing/pom.xml -- diff --git a/examples/ear-testing/pom.xml b/examples/ear-testing/pom.xml index f9b0dc2..b86d39e 100644 --- a/examples/ear-testing/pom.xml +++ b/examples/ear-testing/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.superbiz myear - 7.1.0-SNAPSHOT + 7.1.0 pom OpenEJB :: Examples :: Ear Testing http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/ejb-examples/pom.xml -- diff --git a/examples/ejb-examples/pom.xml b/examples/ejb-examples/pom.xml index bb9cd2b..f31b2ab 100644 --- a/examples/ejb-examples/pom.xml +++ b/examples/ejb-examples/pom.xml @@ -24,7 +24,7 @@ org.superbiz ejb-examples war - 7.1.0-SNAPSHOT + 7.1.0 OpenEJB :: Web Examples :: EJB Examples War UTF-8 @@ -61,7 +61,7 @@ org.apache.tomee.maven tomee-maven-plugin -7.1.0-SNAPSHOT +7.1.0 /ejb-examples plus http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/ejb-webservice/pom.xml -- diff --git a/examples/ejb-webservice/pom.xml b/examples/ejb-webservice/pom.xml index 00f61e5..a24d647 100644 --- a/examples/ejb-webservice/pom.xml +++ b/examples/ejb-webservice/pom.xml @@ -24,7 +24,7 @@ org.superbiz ejb-webservice war - 7.1.0-SNAPSHOT + 7.1.0 OpenEJB :: Web Examples :: EJB WebService UTF-8 http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/groovy-cdi/pom.xml -- diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml index 2deae95..e7afeee 100644 --- a/examples/groovy-cdi/pom.xml +++ b/examples/groovy-cdi/pom.xml @@ -23,7 +23,7 @@ org.superbiz groovy-cdi jar - 7.1.0-SNAPSHOT + 7.1.0 OpenEJB :: Examples :: Groovy CDI @@ -98,13 +98,13 @@ org.apache.tomee arquillian-openejb-embedded - 7.1.0-SNAPSHOT + 7.1.0 test org.apache.tomee ziplock - 7.1.0-SNAPSHOT + 7.1.0 test http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/groovy-jpa/pom.xml -- diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml index 13f3a02..f94c8f3 100644 --- a/examples/groovy-jpa/pom.xml +++ b/examples/groovy-jpa/pom.xml @@ -23,7 +23,7 @@ org.superbiz groovy-jpa jar - 7.1.0-SNAPSHOT + 7.1.0 OpenEJB :: Examples :: Groovy JPA @@ -99,13 +99,13 @@ org.apache.tomee arquillian-openejb-embedded - 7.1.0-SNAPSHOT + 7.1.0 test org.apache.tomee ziplock - 7.1.0-SNAPSHOT + 7.1.0 test http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/groovy-spock/pom.xml -- diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml index a4fa57f..65e4698 100644 --- a/examples/groovy-spock/pom.xml +++ b/examples/groovy-spock/pom.xml @@ -23,7 +23,7 @@ org.superbiz groovy-spock jar - 7.1.0-SNAPSHOT + 7.1.0 OpenEJB :: Examples :: Groovy Spock @@ -108,7 +108,7 @@ org.apache.tomee arquillian-openejb-embedded - 7.1.0-SNAPSHOT + 7.1.0 test @@ -120,7 +120,7 @@ org.apache.tomee ziplock - 7.1.0-SNAPSHOT + 7.1.0 test http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/helloworld-weblogic/pom.xm
[4/6] tomee git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/spring-data-proxy-meta/pom.xml -- diff --git a/examples/spring-data-proxy-meta/pom.xml b/examples/spring-data-proxy-meta/pom.xml index fc36d08..307b994 100644 --- a/examples/spring-data-proxy-meta/pom.xml +++ b/examples/spring-data-proxy-meta/pom.xml @@ -21,7 +21,7 @@ org.superbiz spring-data-proxy-meta jar - 7.1.0 + 7.1.1-SNAPSHOT OpenEJB :: Examples :: Spring Data Meta UTF-8 @@ -69,7 +69,7 @@ org.apache.tomee openejb-core - 7.1.0 + 7.1.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/spring-data-proxy/pom.xml -- diff --git a/examples/spring-data-proxy/pom.xml b/examples/spring-data-proxy/pom.xml index 09b1d02..b534fe6 100644 --- a/examples/spring-data-proxy/pom.xml +++ b/examples/spring-data-proxy/pom.xml @@ -21,7 +21,7 @@ org.superbiz spring-data-proxy jar - 7.1.0 + 7.1.1-SNAPSHOT OpenEJB :: Examples :: Spring Data UTF-8 @@ -69,7 +69,7 @@ org.apache.tomee openejb-core - 7.1.0 + 7.1.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/struts/pom.xml -- diff --git a/examples/struts/pom.xml b/examples/struts/pom.xml index f2b1f77..53f480e 100644 --- a/examples/struts/pom.xml +++ b/examples/struts/pom.xml @@ -20,7 +20,7 @@ org.superbiz.struts struts war - 7.1.0 + 7.1.1-SNAPSHOT OpenEJB :: Web Examples :: Struts http://tomee.apache.org http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/telephone-stateful/pom.xml -- diff --git a/examples/telephone-stateful/pom.xml b/examples/telephone-stateful/pom.xml index 7d66a9c..956a2ca 100644 --- a/examples/telephone-stateful/pom.xml +++ b/examples/telephone-stateful/pom.xml @@ -24,7 +24,7 @@ org.superbiz telephone-stateful jar - 7.1.0 + 7.1.1-SNAPSHOT OpenEJB :: Examples :: Telephone Stateful Pojo UTF-8 @@ -83,7 +83,7 @@ org.apache.tomee openejb-ejbd - 7.1.0 + 7.1.1-SNAPSHOT test http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/testcase-injection/pom.xml -- diff --git a/examples/testcase-injection/pom.xml b/examples/testcase-injection/pom.xml index 42d4b11..5677651 100644 --- a/examples/testcase-injection/pom.xml +++ b/examples/testcase-injection/pom.xml @@ -24,7 +24,7 @@ org.superbiz testcase-injection jar - 7.1.0 + 7.1.1-SNAPSHOT OpenEJB :: Examples :: TestCase Injection UTF-8 @@ -71,7 +71,7 @@ org.apache.tomee openejb-core - 7.1.0 + 7.1.1-SNAPSHOT test http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/testing-security-2/pom.xml -- diff --git a/examples/testing-security-2/pom.xml b/examples/testing-security-2/pom.xml index 9f9fa22..66f3b8b 100644 --- a/examples/testing-security-2/pom.xml +++ b/examples/testing-security-2/pom.xml @@ -24,7 +24,7 @@ org.superbiz testing-security-2 jar - 7.1.0 + 7.1.1-SNAPSHOT OpenEJB :: Examples :: Testing Security UTF-8 @@ -76,7 +76,7 @@ org.apache.tomee openejb-core - 7.1.0 + 7.1.1-SNAPSHOT test http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/testing-security-3/pom.xml -- diff --git a/examples/testing-security-3/pom.xml b/examples/testing-security-3/pom.xml index 6707d4f..60b8537 100644 --- a/examples/testing-security-3/pom.xml +++ b/examples/testing-security-3/pom.xml @@ -24,7 +24,7 @@ org.superbiz testing-security-3 jar - 7.1.0 + 7.1.1-SNAPSHOT OpenEJB :: Examples :: Testing Security Service Provider UTF-8 @@ -76,7 +76,7 @@ org.apache.tomee openejb-core - 7.1.0 + 7.1.1-SNAPSHOT provided http://git-wip-us.apache.org/repos/asf/tomee/blob/eb3305f0/examples/testing-security-4/pom.xml -- diff --git a/examples/testing-security-4/pom.xml b/examples/testing-security-4/pom.xml index 49ce6ed..51cab80 100644 --- a/examples/testing-security-4/pom.xml +++ b/examples/testing-security-4/pom.xml @@ -24,7 +24,7 @@ org.superbiz testing-security-4 jar - 7.1.0 + 7.1.1-SNAPSHOT OpenEJB :: Examples :: Testing Security Script Service Provider UTF-8 @@ -76,7 +76,7 @@ org.apache.tomee openejb-core - 7.1.0 + 7.1.1-SNAPSHOT provided h
[1/6] tomee git commit: [maven-release-plugin] prepare release tomee-project-7.1.0
Repository: tomee Updated Branches: refs/heads/tomee-7.1.x 6d3ef9419 -> eb3305f01 http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/spring-data-proxy-meta/pom.xml -- diff --git a/examples/spring-data-proxy-meta/pom.xml b/examples/spring-data-proxy-meta/pom.xml index 7b6260e..fc36d08 100644 --- a/examples/spring-data-proxy-meta/pom.xml +++ b/examples/spring-data-proxy-meta/pom.xml @@ -21,7 +21,7 @@ org.superbiz spring-data-proxy-meta jar - 7.1.0-SNAPSHOT + 7.1.0 OpenEJB :: Examples :: Spring Data Meta UTF-8 @@ -69,7 +69,7 @@ org.apache.tomee openejb-core - 7.1.0-SNAPSHOT + 7.1.0 http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/spring-data-proxy/pom.xml -- diff --git a/examples/spring-data-proxy/pom.xml b/examples/spring-data-proxy/pom.xml index 1c2533b..09b1d02 100644 --- a/examples/spring-data-proxy/pom.xml +++ b/examples/spring-data-proxy/pom.xml @@ -21,7 +21,7 @@ org.superbiz spring-data-proxy jar - 7.1.0-SNAPSHOT + 7.1.0 OpenEJB :: Examples :: Spring Data UTF-8 @@ -69,7 +69,7 @@ org.apache.tomee openejb-core - 7.1.0-SNAPSHOT + 7.1.0 http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/struts/pom.xml -- diff --git a/examples/struts/pom.xml b/examples/struts/pom.xml index bd963e5..f2b1f77 100644 --- a/examples/struts/pom.xml +++ b/examples/struts/pom.xml @@ -20,7 +20,7 @@ org.superbiz.struts struts war - 7.1.0-SNAPSHOT + 7.1.0 OpenEJB :: Web Examples :: Struts http://tomee.apache.org http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/telephone-stateful/pom.xml -- diff --git a/examples/telephone-stateful/pom.xml b/examples/telephone-stateful/pom.xml index b07c841..7d66a9c 100644 --- a/examples/telephone-stateful/pom.xml +++ b/examples/telephone-stateful/pom.xml @@ -24,7 +24,7 @@ org.superbiz telephone-stateful jar - 7.1.0-SNAPSHOT + 7.1.0 OpenEJB :: Examples :: Telephone Stateful Pojo UTF-8 @@ -83,7 +83,7 @@ org.apache.tomee openejb-ejbd - 7.1.0-SNAPSHOT + 7.1.0 test http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/testcase-injection/pom.xml -- diff --git a/examples/testcase-injection/pom.xml b/examples/testcase-injection/pom.xml index 9b7ab06..42d4b11 100644 --- a/examples/testcase-injection/pom.xml +++ b/examples/testcase-injection/pom.xml @@ -24,7 +24,7 @@ org.superbiz testcase-injection jar - 7.1.0-SNAPSHOT + 7.1.0 OpenEJB :: Examples :: TestCase Injection UTF-8 @@ -71,7 +71,7 @@ org.apache.tomee openejb-core - 7.1.0-SNAPSHOT + 7.1.0 test http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/testing-security-2/pom.xml -- diff --git a/examples/testing-security-2/pom.xml b/examples/testing-security-2/pom.xml index 7f72239..9f9fa22 100644 --- a/examples/testing-security-2/pom.xml +++ b/examples/testing-security-2/pom.xml @@ -24,7 +24,7 @@ org.superbiz testing-security-2 jar - 7.1.0-SNAPSHOT + 7.1.0 OpenEJB :: Examples :: Testing Security UTF-8 @@ -76,7 +76,7 @@ org.apache.tomee openejb-core - 7.1.0-SNAPSHOT + 7.1.0 test http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/testing-security-3/pom.xml -- diff --git a/examples/testing-security-3/pom.xml b/examples/testing-security-3/pom.xml index 12946db..6707d4f 100644 --- a/examples/testing-security-3/pom.xml +++ b/examples/testing-security-3/pom.xml @@ -24,7 +24,7 @@ org.superbiz testing-security-3 jar - 7.1.0-SNAPSHOT + 7.1.0 OpenEJB :: Examples :: Testing Security Service Provider UTF-8 @@ -76,7 +76,7 @@ org.apache.tomee openejb-core - 7.1.0-SNAPSHOT + 7.1.0 provided http://git-wip-us.apache.org/repos/asf/tomee/blob/62afa561/examples/testing-security-4/pom.xml -- diff --git a/examples/testing-security-4/pom.xml b/examples/testing-security-4/pom.xml index 72c58a3..49ce6ed 100644 --- a/examples/testing-security-4/pom.xml +++ b/examples/testing-security-4/pom.xml @@ -24,7 +24,7 @@ org.superbiz testing-security-4 jar - 7.1.0-SNAPSHOT + 7.1.0 OpenEJB :: Examples :: Testing Security Script Service Provider UTF-8 @@ -76,7 +76,7 @@ org.apache.t
buildbot failure in on tomee-7.1.x-ubuntu-jvm8
The Buildbot has detected a new failure on builder tomee-7.1.x-ubuntu-jvm8 while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-7.1.x-ubuntu-jvm8/builds/4 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_qnode5_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-7.1.x-ubuntu-jvm8-commit' triggered this build Build Source Stamp: [branch tomee-7.1.x] 6d3ef9419db1bf94877b7de9f1421b11428579dc Blamelist: Jonathan Gallimore BUILD FAILED: failed compile Sincerely, -The Buildbot
tomee git commit: Release prep
Repository: tomee
Updated Branches:
refs/heads/tomee-7.1.x d7b3168c0 -> 6d3ef9419
Release prep
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/6d3ef941
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/6d3ef941
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/6d3ef941
Branch: refs/heads/tomee-7.1.x
Commit: 6d3ef9419db1bf94877b7de9f1421b11428579dc
Parents: d7b3168
Author: Jonathan Gallimore
Authored: Wed Aug 22 22:14:20 2018 +0100
Committer: Jonathan Gallimore
Committed: Wed Aug 22 22:14:20 2018 +0100
--
arquillian/arquillian-tomee-tests/pom.xml | 30 ++--
examples/arquillian-jpa/pom.xml | 2 +-
.../bean-validation-design-by-contract/pom.xml | 2 +-
examples/cdi-realm/pom.xml | 2 +-
examples/change-jaxws-url/pom.xml | 2 +-
examples/connector-ear/pom.xml | 2 +-
examples/connector-war/pom.xml | 2 +-
examples/datasource-ciphered-password/pom.xml | 2 +-
examples/datasource-definition/pom.xml | 2 +-
examples/datasource-versioning/pom.xml | 2 +-
examples/deltaspike-fullstack/pom.xml | 2 +-
examples/dynamic-datasource-routing/pom.xml | 2 +-
examples/mbean-auto-registration/pom.xml| 2 +-
examples/moviefun-rest/pom.xml | 2 +-
examples/moviefun/pom.xml | 2 +-
examples/mtom/pom.xml | 2 +-
examples/multi-jpa-provider-testing/pom.xml | 2 +-
examples/multiple-arquillian-adapters/pom.xml | 2 +-
examples/multiple-tomee-arquillian/pom.xml | 2 +-
examples/pojo-webservice/pom.xml| 2 +-
examples/polling-parent/pom.xml | 2 +-
examples/projectstage-demo/pom.xml | 2 +-
examples/quartz-app/pom.xml | 2 +-
examples/resources-declared-in-webapp/pom.xml | 2 +-
examples/resources-jmx-example/pom.xml | 2 +-
examples/rest-example-with-application/pom.xml | 2 +-
examples/rest-example/pom.xml | 2 +-
examples/rest-on-ejb/pom.xml| 2 +-
examples/simple-cmp2/pom.xml| 2 +-
pom.xml | 2 +-
30 files changed, 44 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/6d3ef941/arquillian/arquillian-tomee-tests/pom.xml
--
diff --git a/arquillian/arquillian-tomee-tests/pom.xml
b/arquillian/arquillian-tomee-tests/pom.xml
index ed21808..346e89b 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -161,7 +161,7 @@
${maven.test.skip}
-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${project.version}/openejb-javaagent-${project.version}.jar
-7.1.0-SNAPSHOT
+7.1.0
tomee-embedded
tomee-embedded
@@ -260,7 +260,7 @@
${skip.remote.webprofile}
true
-7.1.0-SNAPSHOT
+7.1.0
webprofile
tomee-remote
tomee-remote
@@ -277,7 +277,7 @@
${skip.embedded}
-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${project.version}/openejb-javaagent-${project.version}.jar
-XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=768M
-7.1.0-SNAPSHOT
+7.1.0
tomee-embedded
tomee-embedded
@@ -293,7 +293,7 @@
${skip.remote.plume}
true
-7.1.0-SNAPSHOT
+7.1.0
plume
tomee-remote
tomee-remote
@@ -313,7 +313,7 @@
${skip.remote.plus}
true
-7.1.0-SNAPSHOT
+7.1.0
plus
tomee-remote
tomee-remote
@@ -329,7 +329,7 @@
${skip.webapp.webprofile}
-7.1.0-SNAPSHOT
+7.1.0
${tomcat.version}
tomee-webapp
tomee-webapp
@@ -346,7 +346,7 @@
${skip.webapp.plus}
-7.1.0-SNAPSHOT
+7.1.0
buildbot success in on tomee-7.1.x-ubuntu-jvm8
The Buildbot has detected a restored build on builder tomee-7.1.x-ubuntu-jvm8 while building tomee. Full details are available at: https://ci.apache.org/builders/tomee-7.1.x-ubuntu-jvm8/builds/3 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_qnode5_ubuntu Build Reason: The SingleBranchScheduler scheduler named 'on-tomee-7.1.x-ubuntu-jvm8-commit' triggered this build Build Source Stamp: [branch tomee-7.1.x] d7b3168c054cb729445c20f1d5441c1e41c7a0c0 Blamelist: Jonathan Gallimore ,Roberto Cortez Build succeeded! Sincerely, -The Buildbot
[3/5] tomee git commit: TOMEE-2221 - Tests with @JohnzonProperty and @JsonbProperty.
TOMEE-2221 - Tests with @JohnzonProperty and @JsonbProperty.
(cherry picked from commit 4c7fd4a)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/75d0efc4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/75d0efc4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/75d0efc4
Branch: refs/heads/tomee-7.1.x
Commit: 75d0efc4e8ab2df53b7ea570b6ecba4cddc4c4da
Parents: 8247205
Author: Roberto Cortez
Authored: Mon Aug 13 15:40:38 2018 +0100
Committer: Roberto Cortez
Committed: Tue Aug 21 12:24:25 2018 +0100
--
.../cxf/rs/johnzon/JsonbJaxrsProviderTest.java | 50 +++-
1 file changed, 37 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/75d0efc4/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/johnzon/JsonbJaxrsProviderTest.java
--
diff --git
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/johnzon/JsonbJaxrsProviderTest.java
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/johnzon/JsonbJaxrsProviderTest.java
index 0c4a451..98b6b8e 100644
---
a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/johnzon/JsonbJaxrsProviderTest.java
+++
b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/johnzon/JsonbJaxrsProviderTest.java
@@ -17,6 +17,7 @@
package org.apache.openejb.server.cxf.rs.johnzon;
import org.apache.johnzon.mapper.JohnzonIgnore;
+import org.apache.johnzon.mapper.JohnzonProperty;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.junit.ApplicationComposer;
@@ -27,6 +28,7 @@ import org.apache.openejb.testing.RandomPort;
import org.junit.Test;
import org.junit.runner.RunWith;
+import javax.json.bind.annotation.JsonbProperty;
import javax.json.bind.annotation.JsonbTransient;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -52,7 +54,7 @@ public class JsonbJaxrsProviderTest {
@Test
public void run() throws IOException {
-assertEquals("{\"value\":\"value\"}",
+
assertEquals("{\"johnzon\":\"johnzon\",\"jsonb\":\"jsonb\",\"value\":\"value\"}",
IO.slurp(new URL(base.toExternalForm() +
getClass().getSimpleName() + "/test")));
}
@@ -63,8 +65,10 @@ public class JsonbJaxrsProviderTest {
public Model get() {
final Model model = new Model();
model.setValue("value");
-model.setIgnoreJohnzon("ignoreJohnzon");
-model.setIgnoreJsonb("ignoreJsonb");
+model.setJohnzonIgnore("ignoreJohnzon");
+model.setJsonbIgnore("ignoreJsonb");
+model.setJohnzonProperty("johnzon");
+model.setJsonbProperty("jsonb");
return model;
}
}
@@ -72,9 +76,13 @@ public class JsonbJaxrsProviderTest {
public static class Model {
private String value;
@JohnzonIgnore
-private String ignoreJohnzon;
+private String johnzonIgnore;
@JsonbTransient
-private String ignoreJsonb;
+private String jsonbIgnore;
+@JohnzonProperty("johnzon")
+private String johnzonProperty;
+@JsonbProperty("jsonb")
+private String jsonbProperty;
public String getValue() {
return value;
@@ -84,20 +92,36 @@ public class JsonbJaxrsProviderTest {
this.value = value;
}
-public String getIgnoreJohnzon() {
-return ignoreJohnzon;
+public String getJohnzonIgnore() {
+return johnzonIgnore;
}
-public void setIgnoreJohnzon(final String ignoreJohnzon) {
-this.ignoreJohnzon = ignoreJohnzon;
+public void setJohnzonIgnore(final String johnzonIgnore) {
+this.johnzonIgnore = johnzonIgnore;
}
-public String getIgnoreJsonb() {
-return ignoreJsonb;
+public String getJsonbIgnore() {
+return jsonbIgnore;
}
-public void setIgnoreJsonb(final String ignoreJsonb) {
-this.ignoreJsonb = ignoreJsonb;
+public void setJsonbIgnore(final String jsonbIgnore) {
+this.jsonbIgnore = jsonbIgnore;
+}
+
+public String getJohnzonProperty() {
+return johnzonProperty;
+}
+
+public void setJohnzonProperty(final String johnzonProperty) {
+this.johnzonProperty = johnzonProperty;
+}
+
+public String getJsonbProperty() {
+return jsonbProperty;
+}
+
+public void setJsonbProperty(final String jsonbProperty) {
+this.jsonbProperty = jsonbProperty;
}
}
}
[4/5] tomee git commit: TOMEE-2221 - Integration for TomEE 7.1.x.
TOMEE-2221 - Integration for TomEE 7.1.x.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/9f7b50fa
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/9f7b50fa
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/9f7b50fa
Branch: refs/heads/tomee-7.1.x
Commit: 9f7b50fa4030b2babbe6f6a672d81246c6e67941
Parents: 75d0efc
Author: Roberto Cortez
Authored: Tue Aug 21 13:12:26 2018 +0100
Committer: Roberto Cortez
Committed: Tue Aug 21 13:12:26 2018 +0100
--
server/openejb-cxf-rs/pom.xml | 5 +
1 file changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/9f7b50fa/server/openejb-cxf-rs/pom.xml
--
diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml
index 9bfe972..f1e7064 100644
--- a/server/openejb-cxf-rs/pom.xml
+++ b/server/openejb-cxf-rs/pom.xml
@@ -119,6 +119,11 @@
${johnzon.version}
+ org.apache.geronimo.specs
+ geronimo-jsonb_1.0_spec
+ ${jsonb.api.version}
+
+
org.apache.johnzon
johnzon-jsonb
${johnzon.version}
[5/5] tomee git commit: Merge branch 'tomee-7.1.x' of github.com:radcortez/tomee into tomee-7.1.x
Merge branch 'tomee-7.1.x' of github.com:radcortez/tomee into tomee-7.1.x Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d7b3168c Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d7b3168c Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d7b3168c Branch: refs/heads/tomee-7.1.x Commit: d7b3168c054cb729445c20f1d5441c1e41c7a0c0 Parents: 11b7583 9f7b50f Author: Jonathan Gallimore Authored: Wed Aug 22 10:23:42 2018 +0100 Committer: Jonathan Gallimore Committed: Wed Aug 22 10:23:42 2018 +0100 -- server/openejb-cxf-rs/pom.xml | 8 +- .../openejb/server/cxf/rs/CxfRSService.java | 2 +- .../TomEEJsonbPropertyVisibilityStrategy.java | 88 + .../cxf/rs/johnzon/TomEEJsonbProvider.java | 33 + .../cxf/rs/johnzon/JsonbJaxrsProviderTest.java | 127 +++ 5 files changed, 254 insertions(+), 4 deletions(-) --
[1/5] tomee git commit: TOMEE-2221 - Added Johnzon Jsonb Provider.
Repository: tomee
Updated Branches:
refs/heads/tomee-7.1.x 11b75830c -> d7b3168c0
TOMEE-2221 - Added Johnzon Jsonb Provider.
(cherry picked from commit 95cfcc2)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/0fa51f42
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/0fa51f42
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/0fa51f42
Branch: refs/heads/tomee-7.1.x
Commit: 0fa51f4234b6714e0de0b8543cc8b5af51045855
Parents: abfc263
Author: Roberto Cortez
Authored: Thu Aug 2 15:12:24 2018 +0100
Committer: Roberto Cortez
Committed: Tue Aug 21 12:24:19 2018 +0100
--
server/openejb-cxf-rs/pom.xml | 3 ---
.../main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java | 1 +
2 files changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/0fa51f42/server/openejb-cxf-rs/pom.xml
--
diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml
index 429a25d..9bfe972 100644
--- a/server/openejb-cxf-rs/pom.xml
+++ b/server/openejb-cxf-rs/pom.xml
@@ -118,14 +118,11 @@
johnzon-jaxrs
${johnzon.version}
-
org.codehaus.jettison
jettison
http://git-wip-us.apache.org/repos/asf/tomee/blob/0fa51f42/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
--
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
index 31bd2e0..2d7a55f 100644
---
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
@@ -224,6 +224,7 @@ public class CxfRSService extends RESTService {
final Collection defaults = new ArrayList<>();
for (final String provider : asList(
+"org.apache.johnzon.jaxrs.jsonb.jaxrs.JsonbJaxrsProvider",
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJohnzonProvider",
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonpProvider")) {
if (!isActive(provider)) {
[2/5] tomee git commit: TOMEE-2221 - Improved compatibility between Johnzon and Jsonb Provider. Added Jsonb PropertyVisibilityStrategy to also map objects annotated with Johnzon annotations. Added Tom
TOMEE-2221 - Improved compatibility between Johnzon and Jsonb Provider.
Added Jsonb PropertyVisibilityStrategy to also map objects annotated with
Johnzon annotations.
Added TomEE Provider to control CXF Provider order.
(cherry picked from commit a44f123)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/82472058
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/82472058
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/82472058
Branch: refs/heads/tomee-7.1.x
Commit: 82472058c8052bbf18874feb732a9b7ad4f41ab6
Parents: 0fa51f4
Author: Roberto Cortez
Authored: Fri Aug 10 18:02:34 2018 +0100
Committer: Roberto Cortez
Committed: Tue Aug 21 12:24:23 2018 +0100
--
.../openejb/server/cxf/rs/CxfRSService.java | 3 +-
.../TomEEJsonbPropertyVisibilityStrategy.java | 88
.../cxf/rs/johnzon/TomEEJsonbProvider.java | 33 ++
.../cxf/rs/johnzon/JsonbJaxrsProviderTest.java | 103 +++
4 files changed, 225 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tomee/blob/82472058/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
--
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
index 2d7a55f..347f42b 100644
---
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRSService.java
@@ -224,8 +224,7 @@ public class CxfRSService extends RESTService {
final Collection defaults = new ArrayList<>();
for (final String provider : asList(
-"org.apache.johnzon.jaxrs.jsonb.jaxrs.JsonbJaxrsProvider",
-
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJohnzonProvider",
+
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonbProvider",
"org.apache.openejb.server.cxf.rs.johnzon.TomEEJsonpProvider")) {
if (!isActive(provider)) {
continue;
http://git-wip-us.apache.org/repos/asf/tomee/blob/82472058/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEJsonbPropertyVisibilityStrategy.java
--
diff --git
a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEJsonbPropertyVisibilityStrategy.java
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEJsonbPropertyVisibilityStrategy.java
new file mode 100644
index 000..dd7bce8
--- /dev/null
+++
b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/johnzon/TomEEJsonbPropertyVisibilityStrategy.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.server.cxf.rs.johnzon;
+
+import org.apache.johnzon.mapper.JohnzonProperty;
+
+import javax.json.bind.annotation.JsonbProperty;
+import javax.json.bind.annotation.JsonbVisibility;
+import javax.json.bind.config.PropertyVisibilityStrategy;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+public class TomEEJsonbPropertyVisibilityStrategy implements
PropertyVisibilityStrategy {
+private final ConcurrentMap, PropertyVisibilityStrategy>
strategies = new ConcurrentHashMap<>();
+
+@Override
+public boolean isVisible(final Field field) {
+return field.getAnnotation(JsonbProperty.class) != null ||
+ field.getAnnotation(JohnzonProperty.class) != null ||
+ Modifier.isPublic(field.getModifiers()) ||
+ strategies.computeIfAbsent(field.getDeclaringClass(),
this::visibilityStrategy).isVisible(field);
