This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch tomee-7.1.x in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 82fe910383a7721a961684998ac9d710202b47d3 Merge: db12576 cc69a82 Author: Jonathan Gallimore <j...@jrg.me.uk> AuthorDate: Mon Mar 4 17:01:56 2019 +0000 Merge pull request #434 from apache/revert-433-tomee-7.1.x-TT.x-updates Revert "Tomee 7.1.x tt.x updates" arquillian/arquillian-common/pom.xml | 2 +- arquillian/arquillian-openejb-embedded/pom.xml | 4 +- .../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 | 4 +- arquillian/arquillian-tomee-tests/pom.xml | 32 +++++------ 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 | 12 +---- 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/applet/pom.xml | 6 +-- examples/application-composer/pom.xml | 4 +- examples/applicationcomposer-jaxws-cdi/pom.xml | 6 +-- examples/applicationexception/pom.xml | 4 +- examples/arquillian-jpa/pom.xml | 8 +-- examples/async-methods/pom.xml | 4 +- examples/async-postconstruct/pom.xml | 4 +- .../bean-validation-design-by-contract/pom.xml | 6 +-- .../bval-evaluation-redeployment/WebApp1/pom.xml | 2 +- .../bval-evaluation-redeployment/WebApp2/pom.xml | 2 +- examples/bval-evaluation-redeployment/pom.xml | 8 +-- .../bval-evaluation-redeployment/runner/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 | 8 +-- examples/cdi-request-scope/pom.xml | 4 +- examples/cdi-session-scope/pom.xml | 4 +- examples/change-jaxws-url/pom.xml | 20 +++---- examples/client-resource-lookup-preview/pom.xml | 8 +-- examples/component-interfaces/pom.xml | 4 +- .../connector-ear/connector-sample-api/pom.xml | 2 +- .../connector-ear/connector-sample-ear/pom.xml | 2 +- .../connector-sample-functional-tests/pom.xml | 8 +-- .../connector-ear/connector-sample-impl/pom.xml | 2 +- .../connector-ear/connector-sample-rar/pom.xml | 2 +- .../connector-ear/connector-sample-war/pom.xml | 2 +- examples/connector-ear/pom.xml | 4 +- examples/connector-war/pom.xml | 14 ++--- examples/cucumber-jvm/pom.xml | 4 +- examples/custom-injection/pom.xml | 4 +- examples/datasource-ciphered-password/pom.xml | 6 +-- examples/datasource-definition/pom.xml | 6 +-- examples/datasource-versioning/pom.xml | 12 ++--- examples/decorators/pom.xml | 4 +- examples/deltaspike-configproperty/pom.xml | 6 +-- examples/deltaspike-exception-handling/pom.xml | 6 +-- examples/deltaspike-fullstack/pom.xml | 10 ++-- examples/deltaspike-i18n/pom.xml | 6 +-- examples/dynamic-dao-implementation/pom.xml | 4 +- examples/dynamic-datasource-routing/pom.xml | 6 +-- examples/dynamic-implementation/pom.xml | 6 +-- examples/dynamic-proxy-to-access-mbean/pom.xml | 6 +-- examples/ear-testing/business-logic/pom.xml | 4 +- examples/ear-testing/business-model/pom.xml | 2 +- examples/ear-testing/pom.xml | 2 +- examples/ejb-examples/pom.xml | 4 +- examples/ejb-webservice/pom.xml | 2 +- examples/groovy-cdi/pom.xml | 6 +-- examples/groovy-jpa/pom.xml | 6 +-- examples/groovy-spock/pom.xml | 6 +-- examples/helloworld-weblogic/pom.xml | 4 +- examples/injection-of-connectionfactory/pom.xml | 4 +- examples/injection-of-datasource/pom.xml | 4 +- examples/injection-of-ejbs/pom.xml | 4 +- examples/injection-of-entitymanager/pom.xml | 4 +- examples/injection-of-env-entry/pom.xml | 4 +- examples/interceptors/pom.xml | 4 +- examples/javamail/pom.xml | 4 +- examples/jpa-eclipselink/pom.xml | 4 +- examples/jpa-enumerated/pom.xml | 4 +- examples/jpa-hibernate/pom.xml | 4 +- examples/jsf-cdi-and-ejb/pom.xml | 2 +- examples/jsf-managedBean-and-ejb/pom.xml | 4 +- examples/lookup-of-ejbs-with-descriptor/pom.xml | 4 +- examples/lookup-of-ejbs/pom.xml | 4 +- examples/mbean-auto-registration/pom.xml | 8 +-- examples/moviefun-rest/pom.xml | 16 +++--- examples/moviefun/pom.xml | 16 +++--- examples/movies-complete-meta/pom.xml | 4 +- examples/movies-complete/pom.xml | 4 +- examples/mtom/pom.xml | 10 ++-- examples/multi-jpa-provider-testing/pom.xml | 8 +-- examples/multiple-arquillian-adapters/pom.xml | 14 ++--- examples/multiple-tomee-arquillian/pom.xml | 10 ++-- examples/myfaces-codi-demo/pom.xml | 4 +- examples/persistence-fragment/pom.xml | 4 +- examples/pojo-webservice/pom.xml | 8 +-- 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-mdb/pom.xml | 4 +- examples/polling-parent/polling-web/pom.xml | 4 +- examples/polling-parent/pom.xml | 18 +++---- examples/pom.xml | 2 +- examples/projectstage-demo/pom.xml | 8 +-- examples/quartz-app/pom.xml | 6 +-- examples/quartz-app/quartz-beans/pom.xml | 2 +- examples/quartz-app/quartz-ra/pom.xml | 2 +- examples/realm-in-tomee/pom.xml | 4 +- .../reload-persistence-unit-properties/pom.xml | 4 +- examples/resources-declared-in-webapp/pom.xml | 6 +-- examples/resources-jmx-example/pom.xml | 4 +- .../resources-jmx-ear/pom.xml | 2 +- .../resources-jmx-ejb/pom.xml | 8 +-- examples/rest-applicationcomposer-mockito/pom.xml | 8 +-- examples/rest-applicationcomposer/pom.xml | 6 +-- examples/rest-cdi/pom.xml | 4 +- examples/rest-example-with-application/pom.xml | 6 +-- examples/rest-example/pom.xml | 18 +++---- examples/rest-jaas/pom.xml | 4 +- examples/rest-on-ejb/pom.xml | 6 +-- examples/rest-xml-json/pom.xml | 4 +- examples/scala-basic/pom.xml | 4 +- examples/schedule-events/pom.xml | 4 +- examples/schedule-expression/pom.xml | 4 +- examples/schedule-methods-meta/pom.xml | 4 +- examples/schedule-methods/pom.xml | 4 +- examples/server-events/pom.xml | 6 +-- examples/simple-cdi-interceptor/pom.xml | 4 +- examples/simple-cmp2/pom.xml | 8 +-- .../simple-ear/moviefun-business-logic/pom.xml | 4 +- .../simple-ear/moviefun-business-model/pom.xml | 2 +- examples/simple-ear/moviefun-ear/pom.xml | 2 +- .../simple-ear/moviefun-functional-tests/pom.xml | 8 +-- .../moviefun/MoviesArquillianHtmlUnitTest.java | 2 +- examples/simple-ear/moviefun-webapp/pom.xml | 4 +- examples/simple-ear/pom.xml | 2 +- examples/simple-mdb-and-cdi/pom.xml | 4 +- examples/simple-mdb-with-descriptor/pom.xml | 4 +- examples/simple-mdb/pom.xml | 4 +- examples/simple-remote-tomcatusers/pom.xml | 4 +- examples/simple-rest/pom.xml | 4 +- examples/simple-singleton/pom.xml | 4 +- examples/simple-stateful-callbacks/pom.xml | 4 +- examples/simple-stateful/pom.xml | 4 +- examples/simple-stateless-callbacks/pom.xml | 4 +- examples/simple-stateless-with-descriptor/pom.xml | 6 +-- examples/simple-stateless/pom.xml | 4 +- .../simple-webservice-without-interface/pom.xml | 4 +- examples/simple-webservice/pom.xml | 4 +- examples/spring-data-proxy-meta/pom.xml | 4 +- examples/spring-data-proxy/pom.xml | 4 +- examples/struts/pom.xml | 2 +- examples/telephone-stateful/pom.xml | 4 +- examples/testcase-injection/pom.xml | 4 +- examples/testing-security-2/pom.xml | 4 +- examples/testing-security-3/pom.xml | 4 +- examples/testing-security-4/pom.xml | 4 +- examples/testing-security-meta/pom.xml | 4 +- examples/testing-security/pom.xml | 4 +- examples/testing-transactions-bmt/pom.xml | 4 +- examples/testing-transactions/pom.xml | 4 +- examples/tomee-jersey-eclipselink/pom.xml | 4 +- examples/transaction-rollback/pom.xml | 4 +- examples/troubleshooting/pom.xml | 4 +- examples/webservice-attachments/pom.xml | 4 +- examples/webservice-handlerchain/pom.xml | 4 +- examples/webservice-holder/pom.xml | 4 +- examples/webservice-inheritance/pom.xml | 4 +- examples/webservice-security/pom.xml | 4 +- examples/webservice-ws-security/pom.xml | 4 +- .../webservice-ws-with-resources-config/pom.xml | 4 +- gradle/gradle-tomee-embedded/pom.xml | 2 +- gradle/pom.xml | 2 +- itests/failover-ejb/pom.xml | 2 +- itests/failover/pom.xml | 2 +- itests/legacy-client/pom.xml | 2 +- itests/legacy-server/pom.xml | 2 +- itests/openejb-itests-app/pom.xml | 2 +- itests/openejb-itests-beans/pom.xml | 2 +- itests/openejb-itests-client/pom.xml | 2 +- itests/openejb-itests-interceptor-beans/pom.xml | 2 +- itests/openejb-itests-servlets/pom.xml | 2 +- itests/openejb-itests-web/pom.xml | 2 +- itests/pom.xml | 2 +- maven/applicationcomposer-maven-plugin/pom.xml | 4 +- maven/jarstxt-maven-plugin/pom.xml | 4 +- maven/maven-util/pom.xml | 2 +- maven/openejb-embedded-maven-plugin/pom.xml | 4 +- maven/pom.xml | 4 +- maven/tomee-embedded-maven-plugin/pom.xml | 4 +- maven/tomee-maven-plugin/pom.xml | 4 +- maven/tomee-webapp-archetype/pom.xml | 2 +- mp-jwt/pom.xml | 2 +- pom.xml | 62 +++++----------------- server/openejb-activemq/pom.xml | 2 +- server/openejb-axis/pom.xml | 2 +- server/openejb-bonecp/pom.xml | 2 +- server/openejb-client/pom.xml | 2 +- server/openejb-common-cli/pom.xml | 2 +- server/openejb-cxf-rs/pom.xml | 2 +- server/openejb-cxf-transport/pom.xml | 2 +- server/openejb-cxf/pom.xml | 2 +- server/openejb-daemon/pom.xml | 2 +- server/openejb-derbynet/pom.xml | 2 +- server/openejb-ejbd/pom.xml | 2 +- server/openejb-hessian/pom.xml | 4 +- server/openejb-hsql/pom.xml | 2 +- server/openejb-http/pom.xml | 2 +- server/openejb-multicast/pom.xml | 2 +- server/openejb-rest/pom.xml | 2 +- server/openejb-server/pom.xml | 2 +- server/openejb-ssh/pom.xml | 2 +- server/openejb-webservices/pom.xml | 2 +- server/pom.xml | 2 +- tck/bval-embedded/pom.xml | 2 +- tck/bval-tomee/pom.xml | 2 +- tck/cdi-embedded/pom.xml | 4 +- tck/cdi-tomee/pom.xml | 2 +- tck/microprofile-tck/config/pom.xml | 2 +- tck/microprofile-tck/fault-tolerance/pom.xml | 2 +- tck/microprofile-tck/health/pom.xml | 2 +- tck/microprofile-tck/jwt/pom.xml | 2 +- tck/microprofile-tck/pom.xml | 2 +- tck/pom.xml | 2 +- tck/tck-common/pom.xml | 2 +- tomee/apache-tomee/pom.xml | 2 +- .../apache-tomee/src/main/assembly/tomee-plume.xml | 7 --- .../apache-tomee/src/main/assembly/tomee-plus.xml | 7 --- .../src/main/assembly/tomee-webprofile.xml | 7 --- .../META-INF/release_notes/RELEASE-NOTES-EAP-7.0.x | 29 ---------- tomee/pom.xml | 2 +- tomee/tomee-catalina/pom.xml | 2 +- tomee/tomee-common/pom.xml | 2 +- tomee/tomee-deb/pom.xml | 2 +- tomee/tomee-embedded/pom.xml | 4 +- 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-microprofile-webapp/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 | 12 +---- tomee/tomee-plus-webapp/pom.xml | 12 +---- tomee/tomee-util/pom.xml | 2 +- tomee/tomee-webaccess/pom.xml | 2 +- tomee/tomee-webapp/pom.xml | 2 +- tomee/tomee-webservices/pom.xml | 2 +- utils/livereload-tomee/pom.xml | 2 +- utils/log4j2-tomee/pom.xml | 2 +- utils/openejb-core-eclipselink/pom.xml | 2 +- utils/openejb-core-hibernate/pom.xml | 2 +- utils/openejb-mockito/pom.xml | 2 +- utils/openejb-provisionning/pom.xml | 2 +- utils/pom.xml | 2 +- utils/webdeployer/pom.xml | 2 +- 278 files changed, 558 insertions(+), 676 deletions(-)