Resolve conflict
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d5607fcb Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d5607fcb Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d5607fcb Branch: refs/heads/master Commit: d5607fcb467b1e1e13baeedf8d29943e6e12b206 Parents: 715e7f2 36c9c47 Author: Andy Gumbrecht <agumbre...@tomitribe.com> Authored: Mon Feb 12 18:46:39 2018 +0100 Committer: Andy Gumbrecht <agumbre...@tomitribe.com> Committed: Mon Feb 12 18:46:39 2018 +0100 ---------------------------------------------------------------------- arquillian/arquillian-common/pom.xml | 2 +- arquillian/arquillian-openejb-embedded/pom.xml | 2 +- .../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 | 2 +- .../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-tomee-webapp-remote/pom.xml | 2 +- arquillian/pom.xml | 2 +- arquillian/ziplock/pom.xml | 2 +- examples/access-timeout-meta/pom.xml | 2 +- examples/access-timeout/pom.xml | 2 +- examples/alternate-descriptors/pom.xml | 2 +- examples/applet/pom.xml | 2 +- examples/application-composer/pom.xml | 2 +- examples/applicationcomposer-jaxws-cdi/pom.xml | 2 +- examples/applicationexception/pom.xml | 2 +- examples/arquillian-jpa/pom.xml | 2 +- examples/async-methods/pom.xml | 2 +- examples/async-postconstruct/pom.xml | 2 +- .../bean-validation-design-by-contract/pom.xml | 2 +- .../cdi-alternative-and-stereotypes/pom.xml | 2 +- examples/cdi-application-scope/pom.xml | 2 +- examples/cdi-basic/pom.xml | 2 +- examples/cdi-ejbcontext-jaas/pom.xml | 2 +- examples/cdi-events/pom.xml | 2 +- examples/cdi-interceptors/pom.xml | 2 +- examples/cdi-produces-disposes/pom.xml | 2 +- examples/cdi-produces-field/pom.xml | 2 +- examples/cdi-realm/pom.xml | 2 +- examples/cdi-request-scope/pom.xml | 2 +- examples/cdi-session-scope/pom.xml | 2 +- examples/change-jaxws-url/pom.xml | 2 +- examples/client-resource-lookup-preview/pom.xml | 2 +- examples/component-interfaces/pom.xml | 2 +- examples/cucumber-jvm/pom.xml | 2 +- examples/custom-injection/pom.xml | 2 +- examples/datasource-ciphered-password/pom.xml | 2 +- examples/datasource-definition/pom.xml | 2 +- examples/datasource-versioning/pom.xml | 2 +- examples/decorators/pom.xml | 2 +- examples/deltaspike-configproperty/pom.xml | 2 +- examples/deltaspike-exception-handling/pom.xml | 2 +- examples/deltaspike-fullstack/pom.xml | 2 +- examples/deltaspike-i18n/pom.xml | 2 +- examples/dynamic-dao-implementation/pom.xml | 2 +- examples/dynamic-datasource-routing/pom.xml | 2 +- examples/dynamic-implementation/pom.xml | 2 +- examples/dynamic-proxy-to-access-mbean/pom.xml | 2 +- examples/ear-testing/business-logic/pom.xml | 2 +- examples/ear-testing/business-model/pom.xml | 2 +- examples/ear-testing/pom.xml | 2 +- examples/ejb-examples/pom.xml | 2 +- examples/ejb-webservice/pom.xml | 2 +- examples/groovy-cdi/pom.xml | 2 +- examples/groovy-jpa/pom.xml | 2 +- examples/groovy-spock/pom.xml | 2 +- examples/helloworld-weblogic/pom.xml | 2 +- examples/injection-of-connectionfactory/pom.xml | 2 +- examples/injection-of-datasource/pom.xml | 2 +- examples/injection-of-ejbs/pom.xml | 2 +- examples/injection-of-entitymanager/pom.xml | 2 +- examples/injection-of-env-entry/pom.xml | 2 +- examples/interceptors/pom.xml | 2 +- examples/javamail/pom.xml | 2 +- examples/jpa-eclipselink/pom.xml | 2 +- examples/jpa-enumerated/pom.xml | 2 +- examples/jpa-hibernate/pom.xml | 2 +- examples/jsf-cdi-and-ejb/pom.xml | 2 +- examples/jsf-managedBean-and-ejb/pom.xml | 2 +- examples/lookup-of-ejbs-with-descriptor/pom.xml | 2 +- examples/lookup-of-ejbs/pom.xml | 2 +- examples/mbean-auto-registration/pom.xml | 2 +- examples/moviefun-rest/pom.xml | 2 +- examples/moviefun/pom.xml | 2 +- examples/movies-complete-meta/pom.xml | 2 +- examples/movies-complete/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/myfaces-codi-demo/pom.xml | 2 +- examples/persistence-fragment/pom.xml | 2 +- examples/pojo-webservice/pom.xml | 2 +- examples/polling-parent/polling-client/pom.xml | 2 +- examples/polling-parent/polling-core/pom.xml | 2 +- examples/polling-parent/polling-domain/pom.xml | 2 +- examples/polling-parent/polling-web/pom.xml | 2 +- examples/polling-parent/pom.xml | 2 +- examples/pom.xml | 2 +- examples/projectstage-demo/pom.xml | 2 +- examples/quartz-app/pom.xml | 2 +- examples/quartz-app/quartz-beans/pom.xml | 2 +- examples/quartz-app/quartz-ra/pom.xml | 2 +- examples/realm-in-tomee/pom.xml | 2 +- .../reload-persistence-unit-properties/pom.xml | 2 +- examples/resources-declared-in-webapp/pom.xml | 2 +- examples/resources-jmx-example/pom.xml | 2 +- .../resources-jmx-ear/pom.xml | 2 +- .../resources-jmx-ejb/pom.xml | 2 +- .../rest-applicationcomposer-mockito/pom.xml | 2 +- examples/rest-applicationcomposer/pom.xml | 2 +- examples/rest-cdi/pom.xml | 2 +- examples/rest-example-with-application/pom.xml | 2 +- examples/rest-example/pom.xml | 2 +- examples/rest-jaas/pom.xml | 2 +- examples/rest-on-ejb/pom.xml | 2 +- examples/rest-xml-json/pom.xml | 2 +- examples/scala-basic/pom.xml | 2 +- examples/schedule-events/pom.xml | 2 +- examples/schedule-expression/pom.xml | 2 +- examples/schedule-methods-meta/pom.xml | 2 +- examples/schedule-methods/pom.xml | 2 +- examples/server-events/pom.xml | 2 +- examples/simple-cdi-interceptor/pom.xml | 2 +- examples/simple-cmp2/pom.xml | 2 +- examples/simple-mdb-and-cdi/pom.xml | 2 +- examples/simple-mdb-with-descriptor/pom.xml | 2 +- examples/simple-mdb/pom.xml | 2 +- examples/simple-remote-tomcatusers/pom.xml | 2 +- examples/simple-rest/pom.xml | 2 +- examples/simple-singleton/pom.xml | 2 +- examples/simple-stateful-callbacks/pom.xml | 2 +- examples/simple-stateful/pom.xml | 2 +- examples/simple-stateless-callbacks/pom.xml | 2 +- .../simple-stateless-with-descriptor/pom.xml | 2 +- examples/simple-stateless/pom.xml | 2 +- .../simple-webservice-without-interface/pom.xml | 2 +- examples/simple-webservice/pom.xml | 2 +- examples/spring-data-proxy-meta/pom.xml | 2 +- examples/spring-data-proxy/pom.xml | 2 +- examples/struts/pom.xml | 2 +- examples/telephone-stateful/pom.xml | 2 +- examples/testcase-injection/pom.xml | 2 +- examples/testing-security-2/pom.xml | 2 +- examples/testing-security-3/pom.xml | 2 +- examples/testing-security-4/pom.xml | 2 +- examples/testing-security-meta/pom.xml | 2 +- examples/testing-security/pom.xml | 2 +- examples/testing-transactions-bmt/pom.xml | 2 +- examples/testing-transactions/pom.xml | 2 +- examples/tomee-jersey-eclipselink/pom.xml | 2 +- examples/transaction-rollback/pom.xml | 2 +- examples/troubleshooting/pom.xml | 2 +- examples/webservice-attachments/pom.xml | 2 +- examples/webservice-handlerchain/pom.xml | 2 +- examples/webservice-holder/pom.xml | 2 +- examples/webservice-inheritance/pom.xml | 2 +- examples/webservice-security/pom.xml | 2 +- examples/webservice-ws-security/pom.xml | 2 +- .../webservice-ws-with-resources-config/pom.xml | 2 +- microprofile/microprofile-config/pom.xml | 41 ++++++++++ .../microprofile-fault-tolerance/pom.xml | 35 +++++++++ microprofile/microprofile-health/pom.xml | 35 +++++++++ microprofile/microprofile-jwt-auth/pom.xml | 35 +++++++++ microprofile/microprofile-metrics/pom.xml | 34 ++++++++ microprofile/microprofile-open-api/pom.xml | 34 ++++++++ microprofile/microprofile-opentracing/pom.xml | 34 ++++++++ microprofile/microprofile-rest-client/pom.xml | 34 ++++++++ microprofile/pom.xml | 46 +++++++++++ pom.xml | 83 ++++++++++++++------ tomee/apache-tomee/pom.xml | 2 +- tomee/pom.xml | 2 +- tomee/tomee-catalina/pom.xml | 4 +- tomee/tomee-common/pom.xml | 2 +- tomee/tomee-deb/pom.xml | 2 +- tomee/tomee-embedded/pom.xml | 2 +- tomee/tomee-jaxrs/pom.xml | 2 +- tomee/tomee-jdbc/pom.xml | 2 +- tomee/tomee-juli/pom.xml | 2 +- tomee/tomee-loader/pom.xml | 2 +- tomee/tomee-mojarra/pom.xml | 2 +- tomee/tomee-myfaces/pom.xml | 2 +- tomee/tomee-overlay-runner/pom.xml | 2 +- tomee/tomee-plume-webapp/pom.xml | 2 +- tomee/tomee-plus-webapp/pom.xml | 2 +- tomee/tomee-util/pom.xml | 2 +- tomee/tomee-webaccess/pom.xml | 9 ++- tomee/tomee-webapp/pom.xml | 2 +- tomee/tomee-webservices/pom.xml | 2 +- 188 files changed, 573 insertions(+), 203 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/d5607fcb/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/d5607fcb/examples/polling-parent/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/d5607fcb/examples/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/d5607fcb/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index c4210b3,1f75a77..1ba0b74 --- a/pom.xml +++ b/pom.xml @@@ -124,16 -124,8 +124,12 @@@ <openejb.osgi.export.version>${project.version}</openejb.osgi.export.version> <openejb.osgi.dynamic.import>${openejb.osgi.dynamic.import.pkg}</openejb.osgi.dynamic.import> <openejb.osgi.symbolic.name>${project.groupId}.${project.artifactId}</openejb.osgi.symbolic.name> - - <batchee.version>0.4-incubating</batchee.version> - - <version.arquillian>1.1.13.Final</version.arquillian> - <version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor> - <version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap> - + <batchee.version>0.4-incubating</batchee.version> + <cxf.version>3.1.13</cxf.version> + <tomcat.version>8.5.24</tomcat.version> - - <cxf.version>3.1.14</cxf.version> ++ <version.shrinkwrap.shrinkwrap>1.2.6</version.shrinkwrap.shrinkwrap> ++ <version.shrinkwrap.descriptor>2.0.0</version.shrinkwrap.descriptor> ++ <version.arquillian>1.1.13.Final</version.arquillian> <ehcache.version>2.10.3</ehcache.version> <!-- used by cxf for security (replay attack) --> <jetty.version>7.5.3.v20111011</jetty.version> http://git-wip-us.apache.org/repos/asf/tomee/blob/d5607fcb/tomee/pom.xml ----------------------------------------------------------------------
