You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2015/05/17 13:21:16 UTC
[30/37] tomee git commit: Merge branch 'master' into fb_tomee2_owb16
Merge branch 'master' into fb_tomee2_owb16
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ac291b93
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ac291b93
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ac291b93
Branch: refs/heads/master
Commit: ac291b93f1d23204772738006a911e8b49185b29
Parents: 9304f7d ff024a2
Author: Mark Struberg <st...@apache.org>
Authored: Wed May 13 19:48:30 2015 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Wed May 13 19:48:30 2015 +0200
----------------------------------------------------------------------
.gitignore | 1 +
arquillian/arquillian-common/pom.xml | 2 +-
.../arquillian-openejb-embedded-5/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 | 2 +-
arquillian/arquillian-tomee-tests/pom.xml | 4 +-
.../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 +-
.../loader/provisining/MavenResolver.java | 42 ++++++++++++++++----
container/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 | 4 +-
examples/application-composer/pom.xml | 2 +-
examples/applicationcomposer-jaxws-cdi/pom.xml | 4 +-
examples/applicationexception/pom.xml | 2 +-
examples/arquillian-jpa/pom.xml | 4 +-
examples/async-methods/pom.xml | 2 +-
examples/async-postconstruct/pom.xml | 2 +-
.../bean-validation-design-by-contract/pom.xml | 4 +-
examples/bval-evaluation-redeployment/pom.xml | 6 +--
.../bval-evaluation-redeployment/runner/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 | 4 +-
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 | 4 +-
examples/client-resource-lookup-preview/pom.xml | 6 +--
examples/component-interfaces/pom.xml | 2 +-
examples/cucumber-jvm/pom.xml | 2 +-
examples/custom-injection/pom.xml | 2 +-
examples/datasource-ciphered-password/pom.xml | 4 +-
examples/datasource-definition/pom.xml | 4 +-
examples/datasource-versioning/pom.xml | 4 +-
examples/decorators/pom.xml | 2 +-
examples/deltaspike-configproperty/pom.xml | 4 +-
examples/deltaspike-exception-handling/pom.xml | 4 +-
examples/deltaspike-fullstack/pom.xml | 4 +-
examples/deltaspike-i18n/pom.xml | 4 +-
examples/dynamic-dao-implementation/pom.xml | 2 +-
examples/dynamic-datasource-routing/pom.xml | 4 +-
examples/dynamic-implementation/pom.xml | 4 +-
examples/dynamic-proxy-to-access-mbean/pom.xml | 4 +-
examples/ear-testing/business-logic/pom.xml | 2 +-
examples/ejb-examples/pom.xml | 2 +-
examples/groovy-cdi/pom.xml | 4 +-
examples/groovy-jpa/pom.xml | 4 +-
examples/groovy-spock/pom.xml | 4 +-
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/jpa-eclipselink/pom.xml | 2 +-
examples/jpa-enumerated/pom.xml | 2 +-
examples/jpa-hibernate/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 | 6 +--
examples/moviefun-rest/pom.xml | 4 +-
examples/moviefun/pom.xml | 10 ++---
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 | 4 +-
examples/multiple-tomee-arquillian/pom.xml | 6 +--
examples/myfaces-codi-demo/pom.xml | 2 +-
examples/persistence-fragment/pom.xml | 2 +-
examples/pojo-webservice/pom.xml | 4 +-
examples/polling-parent/pom.xml | 4 +-
examples/pom.xml | 2 +-
examples/projectstage-demo/pom.xml | 2 +-
examples/quartz-app/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 | 4 +-
.../rest-applicationcomposer-mockito/pom.xml | 6 +--
examples/rest-applicationcomposer/pom.xml | 4 +-
examples/rest-cdi/pom.xml | 2 +-
examples/rest-example-with-application/pom.xml | 4 +-
examples/rest-example/pom.xml | 4 +-
examples/rest-jaas/pom.xml | 2 +-
examples/rest-on-ejb/pom.xml | 2 +-
examples/rest-xml-json/pom.xml | 2 +-
examples/scala-basic/build.sbt | 4 +-
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 | 4 +-
examples/simple-cdi-interceptor/pom.xml | 2 +-
examples/simple-cmp2/pom.xml | 4 +-
examples/simple-mdb-and-cdi/pom.xml | 2 +-
examples/simple-mdb-with-descriptor/pom.xml | 2 +-
examples/simple-mdb/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 | 4 +-
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/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 +-
itests/failover-ejb/pom.xml | 2 +-
itests/failover/pom.xml | 4 +-
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 +-
.../openejb/maven/plugin/AbstractTomEEMojo.java | 3 +-
.../maven/plugin/TomEEMavenPluginRule.java | 2 +-
maven/tomee-webapp-archetype/pom.xml | 2 +-
pom.xml | 6 +--
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-embedded/pom.xml | 2 +-
tck/cdi-tomee/pom.xml | 2 +-
tck/pom.xml | 2 +-
tck/tck-common/pom.xml | 2 +-
tomee/apache-tomee/pom.xml | 2 +-
tomee/pom.xml | 6 +--
tomee/tomee-catalina/pom.xml | 2 +-
.../apache/tomee/catalina/ServerListener.java | 3 +-
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-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 | 2 +-
tomee/tomee-webapp/pom.xml | 2 +-
tomee/tomee-webservices/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 +-
237 files changed, 336 insertions(+), 309 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/ac291b93/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index f90cab2,a14c842..05ada53
--- a/pom.xml
+++ b/pom.xml
@@@ -91,11 -91,11 +91,11 @@@
</scm>
<properties>
- <openejb.version>5.0.0-SNAPSHOT</openejb.version>
- <tomee.version>2.0.0-SNAPSHOT</tomee.version>
+ <openejb.version>7.0.0-SNAPSHOT</openejb.version>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
<openjpa.version>2.4.0</openjpa.version>
- <org.apache.openwebbeans.version>1.5.0</org.apache.openwebbeans.version>
+ <org.apache.openwebbeans.version>1.6.0-SNAPSHOT</org.apache.openwebbeans.version>
<jcs.version>2.0-SNAPSHOT</jcs.version>
<!-- Maven module versions -->
http://git-wip-us.apache.org/repos/asf/tomee/blob/ac291b93/tck/cdi-tomee-embedded/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/ac291b93/tck/cdi-tomee/pom.xml
----------------------------------------------------------------------