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/14 18:51:11 UTC
[1/6] tomee git commit: TOMEE-1584 - ProvisioningUtil does not escape
group id for maven-metadata.xml check
Repository: tomee
Updated Branches:
refs/heads/fb_tomee2_owb16 9304f7d88 -> c8c7f5c91
TOMEE-1584 - ProvisioningUtil does not escape group id for maven-metadata.xml check
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c6c362e0
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c6c362e0
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c6c362e0
Branch: refs/heads/fb_tomee2_owb16
Commit: c6c362e0be4d5640282787a30d7895b6358af1f4
Parents: 25207a0
Author: andygumbrecht@apache.org <an...@gmx.de>
Authored: Tue May 12 23:49:43 2015 +0200
Committer: andygumbrecht@apache.org <an...@gmx.de>
Committed: Tue May 12 23:49:43 2015 +0200
----------------------------------------------------------------------
.gitignore | 1 +
.../loader/provisining/MavenResolver.java | 42 ++++++++++++++++----
2 files changed, 36 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c6c362e0/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 92dd6e3..6fe2ebd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ target
quick.bat
/tomee/tomee-plume-webapp/overlays/
/tomee/tomee-plus-webapp/overlays/
+/temp
http://git-wip-us.apache.org/repos/asf/tomee/blob/c6c362e0/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java
----------------------------------------------------------------------
diff --git a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java
index 110b319..8978ba1 100644
--- a/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java
+++ b/container/openejb-loader/src/main/java/org/apache/openejb/loader/provisining/MavenResolver.java
@@ -18,12 +18,17 @@ package org.apache.openejb.loader.provisining;
import org.apache.openejb.loader.IO;
import org.apache.openejb.loader.SystemInstance;
+import org.w3c.dom.Document;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathFactory;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -63,7 +68,7 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware
private String sanitize(final String url) {
final int sep = url.indexOf('!') + 1;
- String value = url.substring(prefix().length() + 1);
+ final String value = url.substring(prefix().length() + 1);
return value.substring(0, sep) + value.substring(sep).replace(":", "/");
}
@@ -116,13 +121,36 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware
}
private static String m2Home() {
+
final Properties properties;
if (SystemInstance.isInitialized()) {
properties = SystemInstance.get().getProperties();
} else {
properties = System.getProperties();
}
- return properties.getProperty("openejb.m2.home", System.getProperty("user.home") + "/.m2/repository/");
+
+ String home = "";
+ File f = new File(properties.getProperty("openejb.m2.home", System.getProperty("user.home") + "/.m2/repository/"));
+
+ if (f.exists()) {
+ home = f.getAbsolutePath();
+ } else {
+ f = new File(properties.getProperty("openejb.m2.home", System.getProperty("user.home") + "/.m2/settings.xml"));
+ if (f.exists()) {
+ try {
+ final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ final DocumentBuilder builder = factory.newDocumentBuilder();
+ final Document document = builder.parse(f);
+ final XPathFactory xpf = XPathFactory.newInstance();
+ final XPath xp = xpf.newXPath();
+ home = xp.evaluate("//settings/localRepository/text()", document.getDocumentElement());
+ } catch (final Exception ignore) {
+ //no-op
+ }
+ }
+ }
+
+ return (home.endsWith("/") ? home : home + "/");
}
private String mvnArtifactPath(final String toParse, final String snapshotBase) throws MalformedURLException {
@@ -146,10 +174,10 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware
throw new MalformedURLException("Invalid artifactId. " + toParse);
}
- String base = snapshotBase == null || snapshotBase.isEmpty() ? "" : (snapshotBase + (!snapshotBase.endsWith("/") ? "/" : ""));
+ final String base = snapshotBase == null || snapshotBase.isEmpty() ? "" : (snapshotBase + (!snapshotBase.endsWith("/") ? "/" : ""));
if (("LATEST".equals(version) || "LATEST-SNAPSHOT".equals(version)) && base.startsWith("http")) {
- final String meta = base + group + "/" + artifact + "/maven-metadata.xml";
+ final String meta = base + group.replace('.', '/') + "/" + artifact + "/maven-metadata.xml";
final URL url = new URL(meta);
final ByteArrayOutputStream out = new ByteArrayOutputStream();
InputStream is = null;
@@ -169,7 +197,7 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware
String artifactVersion;
if (version.endsWith("-SNAPSHOT") && base.startsWith("http")) {
- final String meta = base + group + "/" + artifact + "/" + version + "/maven-metadata.xml";
+ final String meta = base + group.replace('.', '/') + "/" + artifact + "/" + version + "/maven-metadata.xml";
final URL url = new URL(meta);
final ByteArrayOutputStream out = new ByteArrayOutputStream();
InputStream is = null;
@@ -199,7 +227,7 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware
fullClassifier = "-" + segments[4];
}
- StringBuilder builder = new StringBuilder(base);
+ final StringBuilder builder = new StringBuilder(base);
builder.append(group.replace('.', '/')).append("/");
builder.append(artifact).append("/");
builder.append(version).append("/");
@@ -211,7 +239,7 @@ public class MavenResolver implements ArchiveResolver, ProvisioningResolverAware
return builder.append(".").append(type).toString();
}
- private static String extractRealVersion(String version, ByteArrayOutputStream out) {
+ private static String extractRealVersion(String version, final ByteArrayOutputStream out) {
final QuickMvnMetadataParser handler = new QuickMvnMetadataParser();
try {
final SAXParser parser = FACTORY.newSAXParser();
[4/6] tomee git commit: updating versions to 7.0.0-SNAPSHOT
Posted by st...@apache.org.
updating versions to 7.0.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ff024a2c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ff024a2c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ff024a2c
Branch: refs/heads/fb_tomee2_owb16
Commit: ff024a2cc49e1110fe15b7c618bd90493d921f05
Parents: c6c362e
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Wed May 13 12:23:57 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Wed May 13 12:23:57 2015 +0200
----------------------------------------------------------------------
arquillian/arquillian-common/pom.xml | 2 +-
arquillian/arquillian-openejb-embedded-5/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/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/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 | 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 +-
examples/bean-validation-design-by-contract/pom.xml | 4 ++--
examples/bval-evaluation-redeployment/pom.xml | 6 +++---
examples/bval-evaluation-redeployment/runner/pom.xml | 2 +-
examples/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 +-
examples/reload-persistence-unit-properties/pom.xml | 2 +-
examples/resources-declared-in-webapp/pom.xml | 2 +-
examples/resources-jmx-example/pom.xml | 4 ++--
examples/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 +-
examples/simple-stateless-with-descriptor/pom.xml | 4 ++--
examples/simple-stateless/pom.xml | 2 +-
examples/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 +-
examples/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 ++--
.../apache/openejb/maven/plugin/AbstractTomEEMojo.java | 3 +--
.../apache/openejb/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 +-
.../java/org/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 +-
235 files changed, 300 insertions(+), 302 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-common/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-common/pom.xml b/arquillian/arquillian-common/pom.xml
index 041412c..271e047 100644
--- a/arquillian/arquillian-common/pom.xml
+++ b/arquillian/arquillian-common/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-common</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-openejb-embedded-5/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-openejb-embedded-5/pom.xml b/arquillian/arquillian-openejb-embedded-5/pom.xml
index 8071da9..37ffbc4 100644
--- a/arquillian/arquillian-openejb-embedded-5/pom.xml
+++ b/arquillian/arquillian-openejb-embedded-5/pom.xml
@@ -22,13 +22,13 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>arquillian-openejb-embedded-5</artifactId>
<name>OpenEJB :: Arquillian Adaptors Parent :: OpenEJB Container</name>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-openejb-transaction-provider/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-openejb-transaction-provider/pom.xml b/arquillian/arquillian-openejb-transaction-provider/pom.xml
index df0dcc9..c89010a 100644
--- a/arquillian/arquillian-openejb-transaction-provider/pom.xml
+++ b/arquillian/arquillian-openejb-transaction-provider/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-tck/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tck/pom.xml b/arquillian/arquillian-tck/pom.xml
index 0c01fcd..c47d6f7 100644
--- a/arquillian/arquillian-tck/pom.xml
+++ b/arquillian/arquillian-tck/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-tomee-common/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
index a958eda..5e0ab92 100644
--- a/arquillian/arquillian-tomee-common/pom.xml
+++ b/arquillian/arquillian-tomee-common/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-tomee-common</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-tomee-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-embedded/pom.xml b/arquillian/arquillian-tomee-embedded/pom.xml
index a757a3b..98e8ca9 100644
--- a/arquillian/arquillian-tomee-embedded/pom.xml
+++ b/arquillian/arquillian-tomee-embedded/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-tomee-embedded</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-tomee-moviefun-example/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-moviefun-example/pom.xml b/arquillian/arquillian-tomee-moviefun-example/pom.xml
index 004351d..f08a812 100644
--- a/arquillian/arquillian-tomee-moviefun-example/pom.xml
+++ b/arquillian/arquillian-tomee-moviefun-example/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-tomee-moviefun-example</artifactId>
<packaging>war</packaging>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-tomee-remote/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-remote/pom.xml b/arquillian/arquillian-tomee-remote/pom.xml
index c86652f..d8d9035 100644
--- a/arquillian/arquillian-tomee-remote/pom.xml
+++ b/arquillian/arquillian-tomee-remote/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-tomee-remote</artifactId>
<packaging>jar</packaging>
@@ -92,7 +92,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
<type>zip</type>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<classifier>webprofile</classifier>
<scope>provided</scope>
</dependency>
@@ -121,7 +121,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-common</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
@@ -148,7 +148,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-common</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
index 2a8c168..6c90260 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>arquillian-tomee-tests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-tomee-codi-tests</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
index a7c2cb6..2d7c3f3 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>arquillian-tomee-tests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-tomee-config-tests</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
index 3ec76bf..b507500 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>arquillian-tomee-tests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-tomee-jaxrs-tests</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
index ee883c7..57865b9 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>arquillian-tomee-tests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-tomee-jaxws-tests</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
index 4f9d01d..170dcaa 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>arquillian-tomee-tests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-tomee-jms-tests</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
index fa422fa..eecaf52 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>arquillian-tomee-tests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-tomee-webprofile-tests</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-tomee-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml
index d136e61..090ef28 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -15,7 +15,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-tomee-tests</artifactId>
<packaging>pom</packaging>
@@ -116,7 +116,7 @@
<dependency> <!-- tomee-embedded needs it + dependencies but tomee-*-remote doesn't need dependencies so to avoid conflicts bringing it back here -->
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</dependency>
<!-- just to get it in the correct order -->
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/arquillian-tomee-webapp-remote/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml
index 411119d..596172d 100644
--- a/arquillian/arquillian-tomee-webapp-remote/pom.xml
+++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian-tomee-webapp-remote</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/pom.xml b/arquillian/pom.xml
index 1655e2f..dfd0434 100644
--- a/arquillian/pom.xml
+++ b/arquillian/pom.xml
@@ -23,11 +23,11 @@
<parent>
<artifactId>openejb</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>arquillian</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenEJB :: Arquillian Adaptors Parent</name>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/arquillian/ziplock/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/ziplock/pom.xml b/arquillian/ziplock/pom.xml
index bfed9da..82ca776 100644
--- a/arquillian/ziplock/pom.xml
+++ b/arquillian/ziplock/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>arquillian</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>ziplock</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/assembly/openejb-lite/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/openejb-lite/pom.xml b/assembly/openejb-lite/pom.xml
index deb9dd5..28781a7 100644
--- a/assembly/openejb-lite/pom.xml
+++ b/assembly/openejb-lite/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>assembly</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-lite</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/assembly/openejb-standalone/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/openejb-standalone/pom.xml b/assembly/openejb-standalone/pom.xml
index a18e1e8..4620a71 100644
--- a/assembly/openejb-standalone/pom.xml
+++ b/assembly/openejb-standalone/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>assembly</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-standalone</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
index ab18dcf..a4ee8f1 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>openejb</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>assembly</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/container/mbean-annotation-api/pom.xml
----------------------------------------------------------------------
diff --git a/container/mbean-annotation-api/pom.xml b/container/mbean-annotation-api/pom.xml
index 52e36c2..1a5a2a1 100644
--- a/container/mbean-annotation-api/pom.xml
+++ b/container/mbean-annotation-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>container</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>mbean-annotation-api</artifactId>
<name>OpenEJB :: Container :: MBean Annotation API</name>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/container/openejb-api/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-api/pom.xml b/container/openejb-api/pom.xml
index b81c05c..889fb5d 100644
--- a/container/openejb-api/pom.xml
+++ b/container/openejb-api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>container</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/container/openejb-core/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 38d36f9..53373ea 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>container</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-core</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/container/openejb-javaagent/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-javaagent/pom.xml b/container/openejb-javaagent/pom.xml
index c97487a..7a8ccdb 100644
--- a/container/openejb-javaagent/pom.xml
+++ b/container/openejb-javaagent/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>container</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-javaagent</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/container/openejb-jee-accessors/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee-accessors/pom.xml b/container/openejb-jee-accessors/pom.xml
index 661b585..b18dd56 100644
--- a/container/openejb-jee-accessors/pom.xml
+++ b/container/openejb-jee-accessors/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>container</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-jee-accessors</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/container/openejb-jee/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jee/pom.xml b/container/openejb-jee/pom.xml
index dad24c2..3656405 100644
--- a/container/openejb-jee/pom.xml
+++ b/container/openejb-jee/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>container</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-jee</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/container/openejb-jpa-integration/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml
index 0b17dba..a788b10 100644
--- a/container/openejb-jpa-integration/pom.xml
+++ b/container/openejb-jpa-integration/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>container</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/container/openejb-junit/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-junit/pom.xml b/container/openejb-junit/pom.xml
index ca7de34..1a91a97 100644
--- a/container/openejb-junit/pom.xml
+++ b/container/openejb-junit/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>container</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/container/openejb-loader/pom.xml
----------------------------------------------------------------------
diff --git a/container/openejb-loader/pom.xml b/container/openejb-loader/pom.xml
index b6731db..541c912 100644
--- a/container/openejb-loader/pom.xml
+++ b/container/openejb-loader/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>container</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-loader</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/container/pom.xml
----------------------------------------------------------------------
diff --git a/container/pom.xml b/container/pom.xml
index ce19852..e2bc5d4 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>openejb</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/access-timeout-meta/pom.xml
----------------------------------------------------------------------
diff --git a/examples/access-timeout-meta/pom.xml b/examples/access-timeout-meta/pom.xml
index 7d86ab6..bb9ac6a 100644
--- a/examples/access-timeout-meta/pom.xml
+++ b/examples/access-timeout-meta/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/access-timeout/pom.xml
----------------------------------------------------------------------
diff --git a/examples/access-timeout/pom.xml b/examples/access-timeout/pom.xml
index c6af79c..44f6392 100644
--- a/examples/access-timeout/pom.xml
+++ b/examples/access-timeout/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/alternate-descriptors/pom.xml
----------------------------------------------------------------------
diff --git a/examples/alternate-descriptors/pom.xml b/examples/alternate-descriptors/pom.xml
index f63ab23..1b7e47f 100644
--- a/examples/alternate-descriptors/pom.xml
+++ b/examples/alternate-descriptors/pom.xml
@@ -91,7 +91,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
<exclusions>
<exclusion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/applet/pom.xml
----------------------------------------------------------------------
diff --git a/examples/applet/pom.xml b/examples/applet/pom.xml
index 230e36a..0fbafab 100644
--- a/examples/applet/pom.xml
+++ b/examples/applet/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -112,7 +112,7 @@
<artifactItem>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<outputDirectory>${project.build.directory}/${project.build.finalName}</outputDirectory>
<destFileName>openejb-client.jar</destFileName>
</artifactItem>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/application-composer/pom.xml
----------------------------------------------------------------------
diff --git a/examples/application-composer/pom.xml b/examples/application-composer/pom.xml
index de23ff0..f6a92aa 100644
--- a/examples/application-composer/pom.xml
+++ b/examples/application-composer/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/applicationcomposer-jaxws-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/applicationcomposer-jaxws-cdi/pom.xml b/examples/applicationcomposer-jaxws-cdi/pom.xml
index f1d2e81..e0b09a1 100644
--- a/examples/applicationcomposer-jaxws-cdi/pom.xml
+++ b/examples/applicationcomposer-jaxws-cdi/pom.xml
@@ -69,13 +69,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/applicationexception/pom.xml
----------------------------------------------------------------------
diff --git a/examples/applicationexception/pom.xml b/examples/applicationexception/pom.xml
index 299e5cd..800cc87 100644
--- a/examples/applicationexception/pom.xml
+++ b/examples/applicationexception/pom.xml
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/arquillian-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/examples/arquillian-jpa/pom.xml b/examples/arquillian-jpa/pom.xml
index dc44a98..2b37f5f 100644
--- a/examples/arquillian-jpa/pom.xml
+++ b/examples/arquillian-jpa/pom.xml
@@ -19,7 +19,7 @@
<properties>
<arquillian.version>1.1.5.Final</arquillian.version>
<arquillian-persistence.version>1.0.0.Alpha7</arquillian-persistence.version>
- <tomee.version>2.0.0-SNAPSHOT</tomee.version>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/async-methods/pom.xml
----------------------------------------------------------------------
diff --git a/examples/async-methods/pom.xml b/examples/async-methods/pom.xml
index f54245e..bfe4ce1 100644
--- a/examples/async-methods/pom.xml
+++ b/examples/async-methods/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/async-postconstruct/pom.xml
----------------------------------------------------------------------
diff --git a/examples/async-postconstruct/pom.xml b/examples/async-postconstruct/pom.xml
index 9e225ae..e48ac84 100644
--- a/examples/async-postconstruct/pom.xml
+++ b/examples/async-postconstruct/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/bean-validation-design-by-contract/pom.xml
----------------------------------------------------------------------
diff --git a/examples/bean-validation-design-by-contract/pom.xml b/examples/bean-validation-design-by-contract/pom.xml
index 61e2b94..9285dc9 100755
--- a/examples/bean-validation-design-by-contract/pom.xml
+++ b/examples/bean-validation-design-by-contract/pom.xml
@@ -24,7 +24,7 @@
<name>OpenEJB :: Examples :: Bean Validation Design By Contract</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <openejb.version>5.0.0-SNAPSHOT</openejb.version>
+ <openejb.version>7.0.0-SNAPSHOT</openejb.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/bval-evaluation-redeployment/pom.xml
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/pom.xml b/examples/bval-evaluation-redeployment/pom.xml
index 5a471cb..6703866 100644
--- a/examples/bval-evaluation-redeployment/pom.xml
+++ b/examples/bval-evaluation-redeployment/pom.xml
@@ -28,8 +28,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.test.version>2.0.0-SNAPSHOT</tomee.test.version>
- <openejb.test.version>5.0.0-SNAPSHOT</openejb.test.version>
+ <tomee.test.version>7.0.0-SNAPSHOT</tomee.test.version>
+ <openejb.test.version>7.0.0-SNAPSHOT</openejb.test.version>
</properties>
<modules>
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-remote</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/bval-evaluation-redeployment/runner/pom.xml
----------------------------------------------------------------------
diff --git a/examples/bval-evaluation-redeployment/runner/pom.xml b/examples/bval-evaluation-redeployment/runner/pom.xml
index c59a1a7..922fcc1 100644
--- a/examples/bval-evaluation-redeployment/runner/pom.xml
+++ b/examples/bval-evaluation-redeployment/runner/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<type>zip</type>
<classifier>webprofile</classifier>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/cdi-alternative-and-stereotypes/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-alternative-and-stereotypes/pom.xml b/examples/cdi-alternative-and-stereotypes/pom.xml
index cec4c25..fecde58 100644
--- a/examples/cdi-alternative-and-stereotypes/pom.xml
+++ b/examples/cdi-alternative-and-stereotypes/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/cdi-application-scope/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-application-scope/pom.xml b/examples/cdi-application-scope/pom.xml
index 22feaa6..52eaf63 100644
--- a/examples/cdi-application-scope/pom.xml
+++ b/examples/cdi-application-scope/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/cdi-basic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-basic/pom.xml b/examples/cdi-basic/pom.xml
index 29fe09e..d50b1d5 100644
--- a/examples/cdi-basic/pom.xml
+++ b/examples/cdi-basic/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/cdi-ejbcontext-jaas/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-ejbcontext-jaas/pom.xml b/examples/cdi-ejbcontext-jaas/pom.xml
index 38e2134..b59ef6d 100644
--- a/examples/cdi-ejbcontext-jaas/pom.xml
+++ b/examples/cdi-ejbcontext-jaas/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -64,7 +64,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<configuration>
<systemVariables>
<java.security.auth.login.config>${project.build.directory}/apache-tomee/conf/login.config</java.security.auth.login.config>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/cdi-events/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-events/pom.xml b/examples/cdi-events/pom.xml
index 45c5017..2642238 100644
--- a/examples/cdi-events/pom.xml
+++ b/examples/cdi-events/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- to show events we log them in the test -->
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/cdi-interceptors/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-interceptors/pom.xml b/examples/cdi-interceptors/pom.xml
index 17f4bc0..2194056 100644
--- a/examples/cdi-interceptors/pom.xml
+++ b/examples/cdi-interceptors/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/cdi-produces-disposes/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-disposes/pom.xml b/examples/cdi-produces-disposes/pom.xml
index 9072eb7..decdd83 100644
--- a/examples/cdi-produces-disposes/pom.xml
+++ b/examples/cdi-produces-disposes/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/cdi-produces-field/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-produces-field/pom.xml b/examples/cdi-produces-field/pom.xml
index 6eab40f..de4dffb 100644
--- a/examples/cdi-produces-field/pom.xml
+++ b/examples/cdi-produces-field/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/cdi-realm/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-realm/pom.xml b/examples/cdi-realm/pom.xml
index 9b83764..54372db 100644
--- a/examples/cdi-realm/pom.xml
+++ b/examples/cdi-realm/pom.xml
@@ -26,7 +26,7 @@
<name>OpenEJB :: Examples :: CDI Realm</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>2.0.0-SNAPSHOT</tomee.version>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/cdi-request-scope/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-request-scope/pom.xml b/examples/cdi-request-scope/pom.xml
index f53ca28..d4410bd 100644
--- a/examples/cdi-request-scope/pom.xml
+++ b/examples/cdi-request-scope/pom.xml
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/cdi-session-scope/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-session-scope/pom.xml b/examples/cdi-session-scope/pom.xml
index 6c58a59..8e83c6e 100644
--- a/examples/cdi-session-scope/pom.xml
+++ b/examples/cdi-session-scope/pom.xml
@@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/change-jaxws-url/pom.xml
----------------------------------------------------------------------
diff --git a/examples/change-jaxws-url/pom.xml b/examples/change-jaxws-url/pom.xml
index 770a9c4..6f24faf 100644
--- a/examples/change-jaxws-url/pom.xml
+++ b/examples/change-jaxws-url/pom.xml
@@ -25,8 +25,8 @@
<name>OpenEJB :: Web Examples :: Change JAXWS URL</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <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>
</properties>
<repositories>
<repository>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/client-resource-lookup-preview/pom.xml
----------------------------------------------------------------------
diff --git a/examples/client-resource-lookup-preview/pom.xml b/examples/client-resource-lookup-preview/pom.xml
index 5e7ed86..3551af3 100644
--- a/examples/client-resource-lookup-preview/pom.xml
+++ b/examples/client-resource-lookup-preview/pom.xml
@@ -59,13 +59,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/component-interfaces/pom.xml
----------------------------------------------------------------------
diff --git a/examples/component-interfaces/pom.xml b/examples/component-interfaces/pom.xml
index 4df6ef9..a3c5143 100644
--- a/examples/component-interfaces/pom.xml
+++ b/examples/component-interfaces/pom.xml
@@ -78,7 +78,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/cucumber-jvm/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cucumber-jvm/pom.xml b/examples/cucumber-jvm/pom.xml
index 070185d..c21629d 100644
--- a/examples/cucumber-jvm/pom.xml
+++ b/examples/cucumber-jvm/pom.xml
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/custom-injection/pom.xml
----------------------------------------------------------------------
diff --git a/examples/custom-injection/pom.xml b/examples/custom-injection/pom.xml
index 65ef951..636c09d 100644
--- a/examples/custom-injection/pom.xml
+++ b/examples/custom-injection/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/datasource-ciphered-password/pom.xml
----------------------------------------------------------------------
diff --git a/examples/datasource-ciphered-password/pom.xml b/examples/datasource-ciphered-password/pom.xml
index d61b3a9..1a6d2e4 100644
--- a/examples/datasource-ciphered-password/pom.xml
+++ b/examples/datasource-ciphered-password/pom.xml
@@ -24,7 +24,7 @@
<name>OpenEJB :: Examples :: Datasource Ciphered Password</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <openejb.version>5.0.0-SNAPSHOT</openejb.version>
+ <openejb.version>7.0.0-SNAPSHOT</openejb.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/datasource-definition/pom.xml
----------------------------------------------------------------------
diff --git a/examples/datasource-definition/pom.xml b/examples/datasource-definition/pom.xml
index 31f9339..25998c5 100644
--- a/examples/datasource-definition/pom.xml
+++ b/examples/datasource-definition/pom.xml
@@ -24,7 +24,7 @@
<name>OpenEJB :: Examples :: Datasource Definition</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <openejb.version>5.0.0-SNAPSHOT</openejb.version>
+ <openejb.version>7.0.0-SNAPSHOT</openejb.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -116,7 +116,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/datasource-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/examples/datasource-versioning/pom.xml b/examples/datasource-versioning/pom.xml
index a60fd50..bd4c373 100644
--- a/examples/datasource-versioning/pom.xml
+++ b/examples/datasource-versioning/pom.xml
@@ -26,7 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.tomee>2.0.0-SNAPSHOT</version.tomee>
+ <version.tomee>7.0.0-SNAPSHOT</version.tomee>
</properties>
<build>
@@ -158,7 +158,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/decorators/pom.xml
----------------------------------------------------------------------
diff --git a/examples/decorators/pom.xml b/examples/decorators/pom.xml
index 01dbdda..cf0300d 100644
--- a/examples/decorators/pom.xml
+++ b/examples/decorators/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/deltaspike-configproperty/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-configproperty/pom.xml b/examples/deltaspike-configproperty/pom.xml
index bcaefa7..0bd051c 100644
--- a/examples/deltaspike-configproperty/pom.xml
+++ b/examples/deltaspike-configproperty/pom.xml
@@ -81,13 +81,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-openejb-embedded-5</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/deltaspike-exception-handling/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-exception-handling/pom.xml b/examples/deltaspike-exception-handling/pom.xml
index 313b029..0a16696 100644
--- a/examples/deltaspike-exception-handling/pom.xml
+++ b/examples/deltaspike-exception-handling/pom.xml
@@ -79,13 +79,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-openejb-embedded-5</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/deltaspike-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml
index eb7fc28..6d19cf5 100644
--- a/examples/deltaspike-fullstack/pom.xml
+++ b/examples/deltaspike-fullstack/pom.xml
@@ -25,8 +25,8 @@
<version.myfaces2>2.2.5</version.myfaces2>
<version.deltaspike>1.0.1</version.deltaspike>
<version.extval>2.0.8</version.extval>
- <version.openejb>5.0.0-SNAPSHOT</version.openejb>
- <version.tomee>2.0.0-SNAPSHOT</version.tomee>
+ <version.openejb>7.0.0-SNAPSHOT</version.openejb>
+ <version.tomee>7.0.0-SNAPSHOT</version.tomee>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/deltaspike-i18n/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-i18n/pom.xml b/examples/deltaspike-i18n/pom.xml
index ac4107f..97c4d77 100644
--- a/examples/deltaspike-i18n/pom.xml
+++ b/examples/deltaspike-i18n/pom.xml
@@ -81,13 +81,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-openejb-embedded-5</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/dynamic-dao-implementation/pom.xml
----------------------------------------------------------------------
diff --git a/examples/dynamic-dao-implementation/pom.xml b/examples/dynamic-dao-implementation/pom.xml
index 2d49461..779fad5 100644
--- a/examples/dynamic-dao-implementation/pom.xml
+++ b/examples/dynamic-dao-implementation/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/dynamic-datasource-routing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/dynamic-datasource-routing/pom.xml b/examples/dynamic-datasource-routing/pom.xml
index afddd58..4649064 100755
--- a/examples/dynamic-datasource-routing/pom.xml
+++ b/examples/dynamic-datasource-routing/pom.xml
@@ -24,7 +24,7 @@
<name>OpenEJB :: Examples :: Dynamic Datasource Routing</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <openejb.version>5.0.0-SNAPSHOT</openejb.version>
+ <openejb.version>7.0.0-SNAPSHOT</openejb.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
<!--
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/dynamic-implementation/pom.xml
----------------------------------------------------------------------
diff --git a/examples/dynamic-implementation/pom.xml b/examples/dynamic-implementation/pom.xml
index ef6e482..549da33 100644
--- a/examples/dynamic-implementation/pom.xml
+++ b/examples/dynamic-implementation/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-api</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/dynamic-proxy-to-access-mbean/pom.xml
----------------------------------------------------------------------
diff --git a/examples/dynamic-proxy-to-access-mbean/pom.xml b/examples/dynamic-proxy-to-access-mbean/pom.xml
index 363cf17..a06e55f 100644
--- a/examples/dynamic-proxy-to-access-mbean/pom.xml
+++ b/examples/dynamic-proxy-to-access-mbean/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-api</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/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 9d433a7..e937d93 100644
--- a/examples/ear-testing/business-logic/pom.xml
+++ b/examples/ear-testing/business-logic/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/ejb-examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/ejb-examples/pom.xml b/examples/ejb-examples/pom.xml
index 6ce6e04..102261e 100644
--- a/examples/ejb-examples/pom.xml
+++ b/examples/ejb-examples/pom.xml
@@ -65,7 +65,7 @@
<webappArtifact>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-tomcat-webapp</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<contextPath>openejb</contextPath>
</webappArtifact>
</webapps>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/groovy-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml
index 6e5b7f5..584d9b1 100644
--- a/examples/groovy-cdi/pom.xml
+++ b/examples/groovy-cdi/pom.xml
@@ -93,13 +93,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-openejb-embedded-5</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/groovy-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml
index 263ca50..055c058 100644
--- a/examples/groovy-jpa/pom.xml
+++ b/examples/groovy-jpa/pom.xml
@@ -94,13 +94,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-openejb-embedded-5</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/groovy-spock/pom.xml
----------------------------------------------------------------------
diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml
index 291da0d..3e7a36e 100644
--- a/examples/groovy-spock/pom.xml
+++ b/examples/groovy-spock/pom.xml
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-openejb-embedded-5</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -132,7 +132,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/helloworld-weblogic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/helloworld-weblogic/pom.xml b/examples/helloworld-weblogic/pom.xml
index f2cb651..c370324 100644
--- a/examples/helloworld-weblogic/pom.xml
+++ b/examples/helloworld-weblogic/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/injection-of-connectionfactory/pom.xml
----------------------------------------------------------------------
diff --git a/examples/injection-of-connectionfactory/pom.xml b/examples/injection-of-connectionfactory/pom.xml
index b1f4fba..54723c2 100644
--- a/examples/injection-of-connectionfactory/pom.xml
+++ b/examples/injection-of-connectionfactory/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/injection-of-datasource/pom.xml
----------------------------------------------------------------------
diff --git a/examples/injection-of-datasource/pom.xml b/examples/injection-of-datasource/pom.xml
index 1057fa0..15478ae 100644
--- a/examples/injection-of-datasource/pom.xml
+++ b/examples/injection-of-datasource/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/injection-of-ejbs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/injection-of-ejbs/pom.xml b/examples/injection-of-ejbs/pom.xml
index c248bf8..b79147f 100644
--- a/examples/injection-of-ejbs/pom.xml
+++ b/examples/injection-of-ejbs/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/injection-of-entitymanager/pom.xml
----------------------------------------------------------------------
diff --git a/examples/injection-of-entitymanager/pom.xml b/examples/injection-of-entitymanager/pom.xml
index 43665fe..ee2c0c1 100644
--- a/examples/injection-of-entitymanager/pom.xml
+++ b/examples/injection-of-entitymanager/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/injection-of-env-entry/pom.xml
----------------------------------------------------------------------
diff --git a/examples/injection-of-env-entry/pom.xml b/examples/injection-of-env-entry/pom.xml
index d92a124..9b41f68 100644
--- a/examples/injection-of-env-entry/pom.xml
+++ b/examples/injection-of-env-entry/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/interceptors/pom.xml
----------------------------------------------------------------------
diff --git a/examples/interceptors/pom.xml b/examples/interceptors/pom.xml
index a09a382..1dbb282 100644
--- a/examples/interceptors/pom.xml
+++ b/examples/interceptors/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/jpa-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jpa-eclipselink/pom.xml b/examples/jpa-eclipselink/pom.xml
index 7680d29..33287b0 100644
--- a/examples/jpa-eclipselink/pom.xml
+++ b/examples/jpa-eclipselink/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- toplink dependencies -->
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/jpa-enumerated/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jpa-enumerated/pom.xml b/examples/jpa-enumerated/pom.xml
index c47e087..a9c6664 100644
--- a/examples/jpa-enumerated/pom.xml
+++ b/examples/jpa-enumerated/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/jpa-hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jpa-hibernate/pom.xml b/examples/jpa-hibernate/pom.xml
index 5c0bcd7..64e9044 100644
--- a/examples/jpa-hibernate/pom.xml
+++ b/examples/jpa-hibernate/pom.xml
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core-hibernate</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<type>pom</type>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/jsf-managedBean-and-ejb/pom.xml
----------------------------------------------------------------------
diff --git a/examples/jsf-managedBean-and-ejb/pom.xml b/examples/jsf-managedBean-and-ejb/pom.xml
index 91b6023..8e22853 100644
--- a/examples/jsf-managedBean-and-ejb/pom.xml
+++ b/examples/jsf-managedBean-and-ejb/pom.xml
@@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/lookup-of-ejbs-with-descriptor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/lookup-of-ejbs-with-descriptor/pom.xml b/examples/lookup-of-ejbs-with-descriptor/pom.xml
index e88a29d..4bc7b7b 100644
--- a/examples/lookup-of-ejbs-with-descriptor/pom.xml
+++ b/examples/lookup-of-ejbs-with-descriptor/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/lookup-of-ejbs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/lookup-of-ejbs/pom.xml b/examples/lookup-of-ejbs/pom.xml
index 1065d2f..2419c73 100644
--- a/examples/lookup-of-ejbs/pom.xml
+++ b/examples/lookup-of-ejbs/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/mbean-auto-registration/pom.xml
----------------------------------------------------------------------
diff --git a/examples/mbean-auto-registration/pom.xml b/examples/mbean-auto-registration/pom.xml
index 662475d..badb193 100755
--- a/examples/mbean-auto-registration/pom.xml
+++ b/examples/mbean-auto-registration/pom.xml
@@ -24,7 +24,7 @@
<name>OpenEJB :: Examples :: MBean Auto Registration</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <openejb.version>5.0.0-SNAPSHOT</openejb.version>
+ <openejb.version>7.0.0-SNAPSHOT</openejb.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>mbean-annotation-api</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/moviefun-rest/pom.xml
----------------------------------------------------------------------
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index 0331c06..9cbc441 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -22,9 +22,9 @@
<name>OpenEJB :: Web Examples :: Moviefun Rest</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>2.0.0-SNAPSHOT</tomee.version>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
<version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
- <version.openejb>5.0.0-SNAPSHOT</version.openejb>
+ <version.openejb>7.0.0-SNAPSHOT</version.openejb>
</properties>
<repositories>
<repository>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/moviefun/pom.xml
----------------------------------------------------------------------
diff --git a/examples/moviefun/pom.xml b/examples/moviefun/pom.xml
index 635f138..6ded4e4 100644
--- a/examples/moviefun/pom.xml
+++ b/examples/moviefun/pom.xml
@@ -22,7 +22,7 @@
<name>OpenEJB :: Web Examples :: Moviefun</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>2.0.0-SNAPSHOT</tomee.version>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
<version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
</properties>
<repositories>
@@ -99,7 +99,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<configuration>
<tomeeClassifier>plus</tomeeClassifier>
<args>-Xmx512m -XX:PermSize=256m</args>
@@ -149,7 +149,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -167,7 +167,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-embedded</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<!--<classifier>uber</classifier> -->
<scope>test</scope>
</dependency>
@@ -191,7 +191,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/movies-complete-meta/pom.xml
----------------------------------------------------------------------
diff --git a/examples/movies-complete-meta/pom.xml b/examples/movies-complete-meta/pom.xml
index 8b15e47..a83eb7e 100644
--- a/examples/movies-complete-meta/pom.xml
+++ b/examples/movies-complete-meta/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/movies-complete/pom.xml
----------------------------------------------------------------------
diff --git a/examples/movies-complete/pom.xml b/examples/movies-complete/pom.xml
index e48258c..5711b39 100644
--- a/examples/movies-complete/pom.xml
+++ b/examples/movies-complete/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
[2/6] tomee git commit: updating versions to 7.0.0-SNAPSHOT
Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-util/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-util/pom.xml b/tomee/tomee-util/pom.xml
index 636fcf7..07fcfb6 100644
--- a/tomee/tomee-util/pom.xml
+++ b/tomee/tomee-util/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-webaccess/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml
index e4001c7..45c984a 100644
--- a/tomee/tomee-webaccess/pom.xml
+++ b/tomee/tomee-webaccess/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>tomee-webaccess</artifactId>
<packaging>war</packaging>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index 0f5efd3..4c4e480 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-webapp</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-webservices/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-webservices/pom.xml b/tomee/tomee-webservices/pom.xml
index ba8ff5f..1970881 100644
--- a/tomee/tomee-webservices/pom.xml
+++ b/tomee/tomee-webservices/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-webservices</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/utils/openejb-core-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/utils/openejb-core-eclipselink/pom.xml b/utils/openejb-core-eclipselink/pom.xml
index c6497e1..c2d9272 100644
--- a/utils/openejb-core-eclipselink/pom.xml
+++ b/utils/openejb-core-eclipselink/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>utils</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/utils/openejb-core-hibernate/pom.xml
----------------------------------------------------------------------
diff --git a/utils/openejb-core-hibernate/pom.xml b/utils/openejb-core-hibernate/pom.xml
index 0ef8bb4..03cb053 100644
--- a/utils/openejb-core-hibernate/pom.xml
+++ b/utils/openejb-core-hibernate/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>utils</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/utils/openejb-mockito/pom.xml
----------------------------------------------------------------------
diff --git a/utils/openejb-mockito/pom.xml b/utils/openejb-mockito/pom.xml
index a29a424..8cfb7b9 100644
--- a/utils/openejb-mockito/pom.xml
+++ b/utils/openejb-mockito/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>utils</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/utils/openejb-provisionning/pom.xml
----------------------------------------------------------------------
diff --git a/utils/openejb-provisionning/pom.xml b/utils/openejb-provisionning/pom.xml
index 5b2d5eb..14b6769 100644
--- a/utils/openejb-provisionning/pom.xml
+++ b/utils/openejb-provisionning/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>utils</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index c43fc6a..cee2872 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>openejb</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>utils</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/utils/webdeployer/pom.xml
----------------------------------------------------------------------
diff --git a/utils/webdeployer/pom.xml b/utils/webdeployer/pom.xml
index f88fe73..d7dbc7b 100644
--- a/utils/webdeployer/pom.xml
+++ b/utils/webdeployer/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>utils</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[5/6] tomee git commit: Merge branch 'master' into fb_tomee2_owb16
Posted by st...@apache.org.
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/fb_tomee2_owb16
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
----------------------------------------------------------------------
[3/6] tomee git commit: updating versions to 7.0.0-SNAPSHOT
Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/mtom/pom.xml
----------------------------------------------------------------------
diff --git a/examples/mtom/pom.xml b/examples/mtom/pom.xml
index ba1d9d8..5984943 100644
--- a/examples/mtom/pom.xml
+++ b/examples/mtom/pom.xml
@@ -28,7 +28,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.openejb>5.0.0-SNAPSHOT</version.openejb>
+ <version.openejb>7.0.0-SNAPSHOT</version.openejb>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/multi-jpa-provider-testing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/multi-jpa-provider-testing/pom.xml b/examples/multi-jpa-provider-testing/pom.xml
index 2f62025..8d09fcc 100644
--- a/examples/multi-jpa-provider-testing/pom.xml
+++ b/examples/multi-jpa-provider-testing/pom.xml
@@ -29,7 +29,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <openejb.version>5.0.0-SNAPSHOT</openejb.version>
+ <openejb.version>7.0.0-SNAPSHOT</openejb.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/multiple-arquillian-adapters/pom.xml
----------------------------------------------------------------------
diff --git a/examples/multiple-arquillian-adapters/pom.xml b/examples/multiple-arquillian-adapters/pom.xml
index 2f5d6e1..b4b8499 100644
--- a/examples/multiple-arquillian-adapters/pom.xml
+++ b/examples/multiple-arquillian-adapters/pom.xml
@@ -29,8 +29,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>2.0.0-SNAPSHOT</tomee.version>
- <openejb.version>5.0.0-SNAPSHOT</openejb.version>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
+ <openejb.version>7.0.0-SNAPSHOT</openejb.version>
<arquillian.version>1.1.5.Final</arquillian.version>
</properties>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/multiple-tomee-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/examples/multiple-tomee-arquillian/pom.xml b/examples/multiple-tomee-arquillian/pom.xml
index a3207cd..2cc6d25 100644
--- a/examples/multiple-tomee-arquillian/pom.xml
+++ b/examples/multiple-tomee-arquillian/pom.xml
@@ -27,7 +27,7 @@
<name>OpenEJB :: Examples :: Multiple TomEE with Arquillian</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>2.0.0-SNAPSHOT</tomee.version>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -104,7 +104,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>ziplock</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/myfaces-codi-demo/pom.xml
----------------------------------------------------------------------
diff --git a/examples/myfaces-codi-demo/pom.xml b/examples/myfaces-codi-demo/pom.xml
index a642adf..1e4bb01 100644
--- a/examples/myfaces-codi-demo/pom.xml
+++ b/examples/myfaces-codi-demo/pom.xml
@@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/persistence-fragment/pom.xml
----------------------------------------------------------------------
diff --git a/examples/persistence-fragment/pom.xml b/examples/persistence-fragment/pom.xml
index 4a97bed..b5f5745 100644
--- a/examples/persistence-fragment/pom.xml
+++ b/examples/persistence-fragment/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/pojo-webservice/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pojo-webservice/pom.xml b/examples/pojo-webservice/pom.xml
index 3559cb8..fb7a257 100644
--- a/examples/pojo-webservice/pom.xml
+++ b/examples/pojo-webservice/pom.xml
@@ -25,7 +25,7 @@
<name>OpenEJB :: Web Examples :: Pojo WS</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>2.0.0-SNAPSHOT</tomee.version>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
</properties>
<repositories>
<repository>
@@ -62,7 +62,7 @@
<plugin> <!-- http://localhost:8080/pojo-webservice?wsdl -->
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<configuration>
<tomeeVersion>${tomee.version}</tomeeVersion>
<tomeeClassifier>plus</tomeeClassifier>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/polling-parent/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/pom.xml b/examples/polling-parent/pom.xml
index 8c419c1..1d7d624 100644
--- a/examples/polling-parent/pom.xml
+++ b/examples/polling-parent/pom.xml
@@ -164,8 +164,8 @@
<properties>
<xbean.version>4.0</xbean.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.tomee>2.0.0-SNAPSHOT</version.tomee>
- <version.openejb>5.0.0-SNAPSHOT</version.openejb>
+ <version.tomee>7.0.0-SNAPSHOT</version.tomee>
+ <version.openejb>7.0.0-SNAPSHOT</version.openejb>
</properties>
<!--
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pom.xml b/examples/pom.xml
index 52088d3..b762d90 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>openejb</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>examples</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/projectstage-demo/pom.xml
----------------------------------------------------------------------
diff --git a/examples/projectstage-demo/pom.xml b/examples/projectstage-demo/pom.xml
index f9dae22..e5b2d36 100644
--- a/examples/projectstage-demo/pom.xml
+++ b/examples/projectstage-demo/pom.xml
@@ -27,7 +27,7 @@
<name>OpenEJB :: Examples :: DeltaSpike ProjectStage</name>
<properties>
- <tomee.version>2.0.0-SNAPSHOT</tomee.version>
+ <tomee.version>7.0.0-SNAPSHOT</tomee.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/quartz-app/pom.xml
----------------------------------------------------------------------
diff --git a/examples/quartz-app/pom.xml b/examples/quartz-app/pom.xml
index e0ae3f3..a3726be 100644
--- a/examples/quartz-app/pom.xml
+++ b/examples/quartz-app/pom.xml
@@ -25,7 +25,7 @@
<name>OpenEJB :: Examples :: Quartz</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.openejb>5.0.0-SNAPSHOT</version.openejb>
+ <version.openejb>7.0.0-SNAPSHOT</version.openejb>
</properties>
<modules>
<module>quartz-ra</module>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/realm-in-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/examples/realm-in-tomee/pom.xml b/examples/realm-in-tomee/pom.xml
index 0ab77d1..fe5977a 100644
--- a/examples/realm-in-tomee/pom.xml
+++ b/examples/realm-in-tomee/pom.xml
@@ -46,7 +46,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/reload-persistence-unit-properties/pom.xml
----------------------------------------------------------------------
diff --git a/examples/reload-persistence-unit-properties/pom.xml b/examples/reload-persistence-unit-properties/pom.xml
index cce3e84..ad990b0 100644
--- a/examples/reload-persistence-unit-properties/pom.xml
+++ b/examples/reload-persistence-unit-properties/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/resources-declared-in-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/examples/resources-declared-in-webapp/pom.xml b/examples/resources-declared-in-webapp/pom.xml
index 8eb10ed..88700e4 100644
--- a/examples/resources-declared-in-webapp/pom.xml
+++ b/examples/resources-declared-in-webapp/pom.xml
@@ -26,7 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <openejb.version>5.0.0-SNAPSHOT</openejb.version>
+ <openejb.version>7.0.0-SNAPSHOT</openejb.version>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/resources-jmx-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/resources-jmx-example/pom.xml b/examples/resources-jmx-example/pom.xml
index 0b668c5..69c05bf 100644
--- a/examples/resources-jmx-example/pom.xml
+++ b/examples/resources-jmx-example/pom.xml
@@ -30,8 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.openejb>5.0.0-SNAPSHOT</version.openejb>
- <version.tomee>2.0.0-SNAPSHOT</version.tomee>
+ <version.openejb>7.0.0-SNAPSHOT</version.openejb>
+ <version.tomee>7.0.0-SNAPSHOT</version.tomee>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/rest-applicationcomposer-mockito/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-applicationcomposer-mockito/pom.xml b/examples/rest-applicationcomposer-mockito/pom.xml
index 2de721f..f88ac52 100644
--- a/examples/rest-applicationcomposer-mockito/pom.xml
+++ b/examples/rest-applicationcomposer-mockito/pom.xml
@@ -75,19 +75,19 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-mockito</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/rest-applicationcomposer/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-applicationcomposer/pom.xml b/examples/rest-applicationcomposer/pom.xml
index 2e7e9b7..bb96b82 100644
--- a/examples/rest-applicationcomposer/pom.xml
+++ b/examples/rest-applicationcomposer/pom.xml
@@ -75,13 +75,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/rest-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml
index eac6d3c..b8fbdcd 100644
--- a/examples/rest-cdi/pom.xml
+++ b/examples/rest-cdi/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/rest-example-with-application/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-example-with-application/pom.xml b/examples/rest-example-with-application/pom.xml
index 8f1e1c4..1b06dc4 100644
--- a/examples/rest-example-with-application/pom.xml
+++ b/examples/rest-example-with-application/pom.xml
@@ -25,8 +25,8 @@
<name>OpenEJB :: Web Examples :: REST Example With Application</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <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>
</properties>
<repositories>
<repository>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/rest-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml
index a4600a1..681623b 100644
--- a/examples/rest-example/pom.xml
+++ b/examples/rest-example/pom.xml
@@ -26,8 +26,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <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>
<version.openjpa>2.3.0</version.openjpa>
</properties>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/rest-jaas/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-jaas/pom.xml b/examples/rest-jaas/pom.xml
index acf538e..cc8807d 100644
--- a/examples/rest-jaas/pom.xml
+++ b/examples/rest-jaas/pom.xml
@@ -51,7 +51,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<configuration>
<systemVariables>
<java.security.auth.login.config>${project.build.directory}/apache-tomee/conf/login.config</java.security.auth.login.config>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/rest-on-ejb/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml
index 5b04902..ad820b9 100644
--- a/examples/rest-on-ejb/pom.xml
+++ b/examples/rest-on-ejb/pom.xml
@@ -28,7 +28,7 @@
<name>OpenEJB :: Examples :: REST and EJB</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <openejb.version>5.0.0-SNAPSHOT</openejb.version>
+ <openejb.version>7.0.0-SNAPSHOT</openejb.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/rest-xml-json/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-xml-json/pom.xml b/examples/rest-xml-json/pom.xml
index 12a52bb..ae4456b 100644
--- a/examples/rest-xml-json/pom.xml
+++ b/examples/rest-xml-json/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/scala-basic/build.sbt
----------------------------------------------------------------------
diff --git a/examples/scala-basic/build.sbt b/examples/scala-basic/build.sbt
index 173f7f2..81b7919 100644
--- a/examples/scala-basic/build.sbt
+++ b/examples/scala-basic/build.sbt
@@ -27,8 +27,8 @@ resolvers ++= Seq(
)
libraryDependencies ++= Seq(
- "org.apache.openejb" % "javaee-api" % "6.0-6",
- "org.apache.openejb" % "openejb-core" % "5.0.0-SNAPSHOT" % "test",
+ "org.apache.openejb" % "javaee-api" % "7.0-SNAPSHOT",
+ "org.apache.openejb" % "openejb-core" % "7.0.0-SNAPSHOT" % "test",
"org.scalatest" %% "scalatest_2.11" % "2.2.0" % "test"
)
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/scala-basic/pom.xml
----------------------------------------------------------------------
diff --git a/examples/scala-basic/pom.xml b/examples/scala-basic/pom.xml
index 48f6936..92ef204 100644
--- a/examples/scala-basic/pom.xml
+++ b/examples/scala-basic/pom.xml
@@ -136,7 +136,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/schedule-events/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schedule-events/pom.xml b/examples/schedule-events/pom.xml
index 5358fc8..b0f9d90 100644
--- a/examples/schedule-events/pom.xml
+++ b/examples/schedule-events/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/schedule-expression/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schedule-expression/pom.xml b/examples/schedule-expression/pom.xml
index 88df8c2..cf2f81b 100644
--- a/examples/schedule-expression/pom.xml
+++ b/examples/schedule-expression/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/schedule-methods-meta/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schedule-methods-meta/pom.xml b/examples/schedule-methods-meta/pom.xml
index d6e3509..8648197 100644
--- a/examples/schedule-methods-meta/pom.xml
+++ b/examples/schedule-methods-meta/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/schedule-methods/pom.xml
----------------------------------------------------------------------
diff --git a/examples/schedule-methods/pom.xml b/examples/schedule-methods/pom.xml
index f69817b..17939f2 100644
--- a/examples/schedule-methods/pom.xml
+++ b/examples/schedule-methods/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/server-events/pom.xml
----------------------------------------------------------------------
diff --git a/examples/server-events/pom.xml b/examples/server-events/pom.xml
index a117256..81644ec 100644
--- a/examples/server-events/pom.xml
+++ b/examples/server-events/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-openejb-embedded-5</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-cdi-interceptor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-cdi-interceptor/pom.xml b/examples/simple-cdi-interceptor/pom.xml
index 4a66c08..f617be7 100644
--- a/examples/simple-cdi-interceptor/pom.xml
+++ b/examples/simple-cdi-interceptor/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-cmp2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-cmp2/pom.xml b/examples/simple-cmp2/pom.xml
index a221757..b321906 100644
--- a/examples/simple-cmp2/pom.xml
+++ b/examples/simple-cmp2/pom.xml
@@ -28,7 +28,7 @@
<name>OpenEJB :: Examples :: Simple CMP2 Entity</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <openejb.version>5.0.0-SNAPSHOT</openejb.version>
+ <openejb.version>7.0.0-SNAPSHOT</openejb.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-mdb-and-cdi/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-mdb-and-cdi/pom.xml b/examples/simple-mdb-and-cdi/pom.xml
index ba25237..bcfe407 100644
--- a/examples/simple-mdb-and-cdi/pom.xml
+++ b/examples/simple-mdb-and-cdi/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-mdb-with-descriptor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-mdb-with-descriptor/pom.xml b/examples/simple-mdb-with-descriptor/pom.xml
index 26f39ec..9146ec3 100644
--- a/examples/simple-mdb-with-descriptor/pom.xml
+++ b/examples/simple-mdb-with-descriptor/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-mdb/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-mdb/pom.xml b/examples/simple-mdb/pom.xml
index 8c3194e..bc1a490 100644
--- a/examples/simple-mdb/pom.xml
+++ b/examples/simple-mdb/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-rest/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-rest/pom.xml b/examples/simple-rest/pom.xml
index 84726c3..29983bb 100644
--- a/examples/simple-rest/pom.xml
+++ b/examples/simple-rest/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf-rs</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-singleton/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-singleton/pom.xml b/examples/simple-singleton/pom.xml
index f99b71a..e157184 100644
--- a/examples/simple-singleton/pom.xml
+++ b/examples/simple-singleton/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-stateful-callbacks/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-stateful-callbacks/pom.xml b/examples/simple-stateful-callbacks/pom.xml
index 5c067fa..71e64fb 100644
--- a/examples/simple-stateful-callbacks/pom.xml
+++ b/examples/simple-stateful-callbacks/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-stateful/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-stateful/pom.xml b/examples/simple-stateful/pom.xml
index 7ecbac1..e1cc569 100644
--- a/examples/simple-stateful/pom.xml
+++ b/examples/simple-stateful/pom.xml
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-stateless-callbacks/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-stateless-callbacks/pom.xml b/examples/simple-stateless-callbacks/pom.xml
index 970230f..743de3e 100644
--- a/examples/simple-stateless-callbacks/pom.xml
+++ b/examples/simple-stateless-callbacks/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-stateless-with-descriptor/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-stateless-with-descriptor/pom.xml b/examples/simple-stateless-with-descriptor/pom.xml
index 8fe2890..e3650f0 100644
--- a/examples/simple-stateless-with-descriptor/pom.xml
+++ b/examples/simple-stateless-with-descriptor/pom.xml
@@ -71,13 +71,13 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-jee-accessors</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-stateless/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-stateless/pom.xml b/examples/simple-stateless/pom.xml
index 7bd04d7..70e884c 100644
--- a/examples/simple-stateless/pom.xml
+++ b/examples/simple-stateless/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-webservice-without-interface/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-webservice-without-interface/pom.xml b/examples/simple-webservice-without-interface/pom.xml
index 9272adc..15ee618 100644
--- a/examples/simple-webservice-without-interface/pom.xml
+++ b/examples/simple-webservice-without-interface/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/simple-webservice/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-webservice/pom.xml b/examples/simple-webservice/pom.xml
index e7439e7..34a9f7d 100644
--- a/examples/simple-webservice/pom.xml
+++ b/examples/simple-webservice/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/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 5728e2f..2df60c5 100644
--- a/examples/spring-data-proxy-meta/pom.xml
+++ b/examples/spring-data-proxy-meta/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/spring-data-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/examples/spring-data-proxy/pom.xml b/examples/spring-data-proxy/pom.xml
index da1cf7f..6ece58f 100644
--- a/examples/spring-data-proxy/pom.xml
+++ b/examples/spring-data-proxy/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/telephone-stateful/pom.xml
----------------------------------------------------------------------
diff --git a/examples/telephone-stateful/pom.xml b/examples/telephone-stateful/pom.xml
index aaee261..95becae 100644
--- a/examples/telephone-stateful/pom.xml
+++ b/examples/telephone-stateful/pom.xml
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- END SNIPPET: openejbdep -->
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/testcase-injection/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testcase-injection/pom.xml b/examples/testcase-injection/pom.xml
index 4da83eb..25279db 100644
--- a/examples/testcase-injection/pom.xml
+++ b/examples/testcase-injection/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/testing-security-2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-security-2/pom.xml b/examples/testing-security-2/pom.xml
index 9acebba..22200f2 100644
--- a/examples/testing-security-2/pom.xml
+++ b/examples/testing-security-2/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/testing-security-3/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-security-3/pom.xml b/examples/testing-security-3/pom.xml
index 626c3fb..f9625fa 100644
--- a/examples/testing-security-3/pom.xml
+++ b/examples/testing-security-3/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/testing-security-4/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-security-4/pom.xml b/examples/testing-security-4/pom.xml
index 72c8a01..0bd55d0 100644
--- a/examples/testing-security-4/pom.xml
+++ b/examples/testing-security-4/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/testing-security-meta/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-security-meta/pom.xml b/examples/testing-security-meta/pom.xml
index c03c996..2f1bbb7 100644
--- a/examples/testing-security-meta/pom.xml
+++ b/examples/testing-security-meta/pom.xml
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/testing-security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-security/pom.xml b/examples/testing-security/pom.xml
index a03c309..5200ef0 100644
--- a/examples/testing-security/pom.xml
+++ b/examples/testing-security/pom.xml
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/testing-transactions-bmt/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-transactions-bmt/pom.xml b/examples/testing-transactions-bmt/pom.xml
index cc80684..82492a1 100644
--- a/examples/testing-transactions-bmt/pom.xml
+++ b/examples/testing-transactions-bmt/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/testing-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/examples/testing-transactions/pom.xml b/examples/testing-transactions/pom.xml
index 6ba81f7..3502672 100644
--- a/examples/testing-transactions/pom.xml
+++ b/examples/testing-transactions/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/tomee-jersey-eclipselink/pom.xml
----------------------------------------------------------------------
diff --git a/examples/tomee-jersey-eclipselink/pom.xml b/examples/tomee-jersey-eclipselink/pom.xml
index 58358d4..5494189 100644
--- a/examples/tomee-jersey-eclipselink/pom.xml
+++ b/examples/tomee-jersey-eclipselink/pom.xml
@@ -92,7 +92,7 @@
<plugin>
<groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<configuration>
<systemVariables>
<com.sun.jersey.server.impl.cdi.lookupExtensionInBeanManager>true</com.sun.jersey.server.impl.cdi.lookupExtensionInBeanManager>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/transaction-rollback/pom.xml
----------------------------------------------------------------------
diff --git a/examples/transaction-rollback/pom.xml b/examples/transaction-rollback/pom.xml
index b10c30e..2911dbd 100644
--- a/examples/transaction-rollback/pom.xml
+++ b/examples/transaction-rollback/pom.xml
@@ -68,7 +68,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/troubleshooting/pom.xml
----------------------------------------------------------------------
diff --git a/examples/troubleshooting/pom.xml b/examples/troubleshooting/pom.xml
index e5711e6..6959dcd 100644
--- a/examples/troubleshooting/pom.xml
+++ b/examples/troubleshooting/pom.xml
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/webservice-attachments/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-attachments/pom.xml b/examples/webservice-attachments/pom.xml
index a560c6e..29e05c1 100644
--- a/examples/webservice-attachments/pom.xml
+++ b/examples/webservice-attachments/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/webservice-handlerchain/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-handlerchain/pom.xml b/examples/webservice-handlerchain/pom.xml
index 927f968..66c51b5 100644
--- a/examples/webservice-handlerchain/pom.xml
+++ b/examples/webservice-handlerchain/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/webservice-holder/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-holder/pom.xml b/examples/webservice-holder/pom.xml
index 6776edd..08203c4 100644
--- a/examples/webservice-holder/pom.xml
+++ b/examples/webservice-holder/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/webservice-inheritance/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-inheritance/pom.xml b/examples/webservice-inheritance/pom.xml
index 0286251..de0b177 100644
--- a/examples/webservice-inheritance/pom.xml
+++ b/examples/webservice-inheritance/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/webservice-security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-security/pom.xml b/examples/webservice-security/pom.xml
index 7cca9ac..5ba8351 100644
--- a/examples/webservice-security/pom.xml
+++ b/examples/webservice-security/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/webservice-ws-security/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-ws-security/pom.xml b/examples/webservice-ws-security/pom.xml
index 8a92efc..723c2e9 100644
--- a/examples/webservice-ws-security/pom.xml
+++ b/examples/webservice-ws-security/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/examples/webservice-ws-with-resources-config/pom.xml
----------------------------------------------------------------------
diff --git a/examples/webservice-ws-with-resources-config/pom.xml b/examples/webservice-ws-with-resources-config/pom.xml
index 29b2b5c..4e4432d 100644
--- a/examples/webservice-ws-with-resources-config/pom.xml
+++ b/examples/webservice-ws-with-resources-config/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-cxf</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/itests/failover-ejb/pom.xml
----------------------------------------------------------------------
diff --git a/itests/failover-ejb/pom.xml b/itests/failover-ejb/pom.xml
index 4181ddd..e965c7c 100644
--- a/itests/failover-ejb/pom.xml
+++ b/itests/failover-ejb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openejb.itests</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/itests/failover/pom.xml
----------------------------------------------------------------------
diff --git a/itests/failover/pom.xml b/itests/failover/pom.xml
index 19d69e2..74e07fb 100644
--- a/itests/failover/pom.xml
+++ b/itests/failover/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openejb.itests</groupId>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>arquillian-tomee-common</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/itests/legacy-client/pom.xml
----------------------------------------------------------------------
diff --git a/itests/legacy-client/pom.xml b/itests/legacy-client/pom.xml
index d120ead..3a13a6d 100644
--- a/itests/legacy-client/pom.xml
+++ b/itests/legacy-client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/itests/legacy-server/pom.xml
----------------------------------------------------------------------
diff --git a/itests/legacy-server/pom.xml b/itests/legacy-server/pom.xml
index d804889..aa66b37 100644
--- a/itests/legacy-server/pom.xml
+++ b/itests/legacy-server/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/itests/openejb-itests-app/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-app/pom.xml b/itests/openejb-itests-app/pom.xml
index 6062a78..246f0a8 100644
--- a/itests/openejb-itests-app/pom.xml
+++ b/itests/openejb-itests-app/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-itests-app</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/itests/openejb-itests-beans/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-beans/pom.xml b/itests/openejb-itests-beans/pom.xml
index 9c11dab..f229f6f 100644
--- a/itests/openejb-itests-beans/pom.xml
+++ b/itests/openejb-itests-beans/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/itests/openejb-itests-client/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-client/pom.xml b/itests/openejb-itests-client/pom.xml
index a7d4cfc..eafa988 100644
--- a/itests/openejb-itests-client/pom.xml
+++ b/itests/openejb-itests-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-itests-client</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/itests/openejb-itests-interceptor-beans/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-interceptor-beans/pom.xml b/itests/openejb-itests-interceptor-beans/pom.xml
index f233031..092196f 100644
--- a/itests/openejb-itests-interceptor-beans/pom.xml
+++ b/itests/openejb-itests-interceptor-beans/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.openejb</groupId>
<artifactId>itests</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>openejb-itests-interceptor-beans</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/itests/openejb-itests-servlets/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-servlets/pom.xml b/itests/openejb-itests-servlets/pom.xml
index 4aede7c..20bbed9 100644
--- a/itests/openejb-itests-servlets/pom.xml
+++ b/itests/openejb-itests-servlets/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-itests-servlets</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/itests/openejb-itests-web/pom.xml
----------------------------------------------------------------------
diff --git a/itests/openejb-itests-web/pom.xml b/itests/openejb-itests-web/pom.xml
index 2a07ee5..fb75864 100644
--- a/itests/openejb-itests-web/pom.xml
+++ b/itests/openejb-itests-web/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-itests-web</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index dd26e82..4801aa5 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>openejb</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/maven/applicationcomposer-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven/applicationcomposer-maven-plugin/pom.xml b/maven/applicationcomposer-maven-plugin/pom.xml
index 32e171b..b749698 100644
--- a/maven/applicationcomposer-maven-plugin/pom.xml
+++ b/maven/applicationcomposer-maven-plugin/pom.xml
@@ -22,13 +22,13 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.openejb.maven</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>applicationcomposer-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<name>OpenEJB :: Maven Plugins :: ApplicationComposer Maven Plugin</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/maven/jarstxt-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven/jarstxt-maven-plugin/pom.xml b/maven/jarstxt-maven-plugin/pom.xml
index 9c62958..7df3e74 100644
--- a/maven/jarstxt-maven-plugin/pom.xml
+++ b/maven/jarstxt-maven-plugin/pom.xml
@@ -21,12 +21,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.openejb.maven</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jarstxt-maven-plugin</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>OpenEJB :: Maven Plugins :: jars.txt Maven Plugin</name>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/maven/maven-util/pom.xml
----------------------------------------------------------------------
diff --git a/maven/maven-util/pom.xml b/maven/maven-util/pom.xml
index a9e2fdc..ff3d4aa 100644
--- a/maven/maven-util/pom.xml
+++ b/maven/maven-util/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.openejb.maven</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/maven/openejb-embedded-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven/openejb-embedded-maven-plugin/pom.xml b/maven/openejb-embedded-maven-plugin/pom.xml
index 557e4d8..b26a26c 100644
--- a/maven/openejb-embedded-maven-plugin/pom.xml
+++ b/maven/openejb-embedded-maven-plugin/pom.xml
@@ -22,13 +22,13 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.openejb.maven</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-embedded-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<name>OpenEJB :: Maven Plugins :: OpenEJB Embedded Maven Plugin</name>
<dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/maven/pom.xml
----------------------------------------------------------------------
diff --git a/maven/pom.xml b/maven/pom.xml
index fcc8e0d..c566921 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -23,11 +23,11 @@
<parent>
<artifactId>openejb</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.openejb.maven</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<artifactId>maven</artifactId>
<packaging>pom</packaging>
<name>OpenEJB :: Maven Plugins</name>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/maven/tomee-embedded-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven/tomee-embedded-maven-plugin/pom.xml b/maven/tomee-embedded-maven-plugin/pom.xml
index 826aeec..0cc8652 100644
--- a/maven/tomee-embedded-maven-plugin/pom.xml
+++ b/maven/tomee-embedded-maven-plugin/pom.xml
@@ -24,11 +24,11 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.openejb.maven</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>tomee-embedded-maven-plugin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>OpenEJB :: Maven Plugins :: TomEE Embedded Maven Plugin</name>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/maven/tomee-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/pom.xml b/maven/tomee-maven-plugin/pom.xml
index 5404e56..5c92d54 100644
--- a/maven/tomee-maven-plugin/pom.xml
+++ b/maven/tomee-maven-plugin/pom.xml
@@ -24,11 +24,11 @@
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.openejb.maven</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>tomee-maven-plugin</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>OpenEJB :: Maven Plugins :: TomEE Maven Plugin</name>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
index 6149ce2..37f556a 100644
--- a/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
+++ b/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
@@ -360,8 +360,7 @@ public abstract class AbstractTomEEMojo extends AbstractAddressMojo {
fixConfig();
if ("-1".equals(tomeeVersion)) {
- final String version = OpenEjbVersion.get().getVersion();
- tomeeVersion = (Integer.parseInt(Character.toString(version.charAt(0))) - 3) + version.substring(1, version.length());
+ tomeeVersion = OpenEjbVersion.get().getVersion();
}
if (!tomeeAlreadyInstalled) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
----------------------------------------------------------------------
diff --git a/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java b/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
index b8d4e48..f8c8504 100644
--- a/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
+++ b/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
@@ -181,7 +181,7 @@ public class TomEEMavenPluginRule implements MethodRule {
// our well known web profile ;)
tomEEMojo.tomeeGroupId = "org.apache.openejb";
tomEEMojo.tomeeArtifactId = "apache-tomee";
- tomEEMojo.tomeeVersion = "2" + OpenEjbVersion.get().getVersion().substring(1);
+ tomEEMojo.tomeeVersion = OpenEjbVersion.get().getVersion();
tomEEMojo.tomeeClassifier = "webprofile";
tomEEMojo.tomeeType = "zip";
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/maven/tomee-webapp-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/maven/tomee-webapp-archetype/pom.xml b/maven/tomee-webapp-archetype/pom.xml
index 253f0e1..84d5e5d 100644
--- a/maven/tomee-webapp-archetype/pom.xml
+++ b/maven/tomee-webapp-archetype/pom.xml
@@ -21,7 +21,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.openejb.maven</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c063d78..a14c842 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<artifactId>openejb</artifactId>
<packaging>pom</packaging>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<name>Apache OpenEJB</name>
<description>Apache OpenEJB is an open source, modular, configurable and extensible EJB Container System and EJB Server.</description>
@@ -91,8 +91,8 @@
</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>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-activemq/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-activemq/pom.xml b/server/openejb-activemq/pom.xml
index c1e694f..f59d904 100644
--- a/server/openejb-activemq/pom.xml
+++ b/server/openejb-activemq/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-activemq</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-axis/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-axis/pom.xml b/server/openejb-axis/pom.xml
index cb7a05d..88ed063 100644
--- a/server/openejb-axis/pom.xml
+++ b/server/openejb-axis/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-axis</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-bonecp/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-bonecp/pom.xml b/server/openejb-bonecp/pom.xml
index c855020..febec50 100644
--- a/server/openejb-bonecp/pom.xml
+++ b/server/openejb-bonecp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-client/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml
index f0f5780..eade3d4 100644
--- a/server/openejb-client/pom.xml
+++ b/server/openejb-client/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-client</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-common-cli/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-common-cli/pom.xml b/server/openejb-common-cli/pom.xml
index 687420f..4169923 100644
--- a/server/openejb-common-cli/pom.xml
+++ b/server/openejb-common-cli/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-cxf-rs/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml
index 0aba913..b46656b 100644
--- a/server/openejb-cxf-rs/pom.xml
+++ b/server/openejb-cxf-rs/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-cxf-transport/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-transport/pom.xml b/server/openejb-cxf-transport/pom.xml
index 1d2d04a..dfe1e00 100644
--- a/server/openejb-cxf-transport/pom.xml
+++ b/server/openejb-cxf-transport/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-cxf/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index 5f1e8a4..5fbf789 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-daemon/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-daemon/pom.xml b/server/openejb-daemon/pom.xml
index a54922d..4f40951 100644
--- a/server/openejb-daemon/pom.xml
+++ b/server/openejb-daemon/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-daemon</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-derbynet/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-derbynet/pom.xml b/server/openejb-derbynet/pom.xml
index c0af3e3..331cfc4 100644
--- a/server/openejb-derbynet/pom.xml
+++ b/server/openejb-derbynet/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-derbynet</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-ejbd/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-ejbd/pom.xml b/server/openejb-ejbd/pom.xml
index 41e2d9b..eb06dab 100644
--- a/server/openejb-ejbd/pom.xml
+++ b/server/openejb-ejbd/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-ejbd</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-hessian/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-hessian/pom.xml b/server/openejb-hessian/pom.xml
index e47cd19..cd4f298 100644
--- a/server/openejb-hessian/pom.xml
+++ b/server/openejb-hessian/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<artifactId>openejb-hessian</artifactId>
@@ -35,7 +35,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-http</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-hsql/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-hsql/pom.xml b/server/openejb-hsql/pom.xml
index a2f1c3c..773a6d1 100644
--- a/server/openejb-hsql/pom.xml
+++ b/server/openejb-hsql/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-hsql</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-http/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-http/pom.xml b/server/openejb-http/pom.xml
index 815d8dc..a6b3d5d 100644
--- a/server/openejb-http/pom.xml
+++ b/server/openejb-http/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-http</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-multicast/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-multicast/pom.xml b/server/openejb-multicast/pom.xml
index 181e7f2..8506821 100644
--- a/server/openejb-multicast/pom.xml
+++ b/server/openejb-multicast/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-multicast</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-rest/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-rest/pom.xml b/server/openejb-rest/pom.xml
index 7823a28..2cf3917 100644
--- a/server/openejb-rest/pom.xml
+++ b/server/openejb-rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-server/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml
index 2e68c1f..84356a4 100644
--- a/server/openejb-server/pom.xml
+++ b/server/openejb-server/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-server</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-ssh/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-ssh/pom.xml b/server/openejb-ssh/pom.xml
index 89f5068..83d6b0b 100644
--- a/server/openejb-ssh/pom.xml
+++ b/server/openejb-ssh/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/openejb-webservices/pom.xml
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/pom.xml b/server/openejb-webservices/pom.xml
index 7bdf10f..fcf46d0 100644
--- a/server/openejb-webservices/pom.xml
+++ b/server/openejb-webservices/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>server</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-webservices</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index e66ad27..f609a28 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>openejb</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>server</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tck/bval-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml
index 29f356e..16e15b9 100644
--- a/tck/bval-embedded/pom.xml
+++ b/tck/bval-embedded/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>tck</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tck/bval-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml
index 506a088..ac4c92b 100644
--- a/tck/bval-tomee/pom.xml
+++ b/tck/bval-tomee/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>tck</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tck/cdi-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index 89b2a48..4f61d8d 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -20,13 +20,13 @@
<parent>
<artifactId>tck</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cdi-embedded</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: TCK :: CDI Embedded</name>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tck/cdi-tomee-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee-embedded/pom.xml b/tck/cdi-tomee-embedded/pom.xml
index d8319a5..b918999 100644
--- a/tck/cdi-tomee-embedded/pom.xml
+++ b/tck/cdi-tomee-embedded/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>tck</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cdi-tomee-embedded</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tck/cdi-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index ba4345a..aa2f102 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>tck</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/pom.xml b/tck/pom.xml
index d697f08..7551168 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>openejb</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tck</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tck/tck-common/pom.xml
----------------------------------------------------------------------
diff --git a/tck/tck-common/pom.xml b/tck/tck-common/pom.xml
index a4fcaf0..e45d254 100644
--- a/tck/tck-common/pom.xml
+++ b/tck/tck-common/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>tck</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tck-common</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/apache-tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 8348a22..1dcfb02 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/pom.xml b/tomee/pom.xml
index 2999cac..df97b38 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -24,17 +24,17 @@
<parent>
<artifactId>openejb</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>OpenEJB :: TomEE</name>
<properties>
- <version.openejb>5.0.0-SNAPSHOT</version.openejb>
+ <version.openejb>7.0.0-SNAPSHOT</version.openejb>
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-catalina/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/pom.xml b/tomee/tomee-catalina/pom.xml
index 7e39b2b..224dd6c 100644
--- a/tomee/tomee-catalina/pom.xml
+++ b/tomee/tomee-catalina/pom.xml
@@ -24,7 +24,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
index e707ec4..1a30f1a 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/ServerListener.java
@@ -188,8 +188,7 @@ public class ServerListener implements LifecycleListener {
acc = field.isAccessible();
final int slash = value.indexOf('/');
field.setAccessible(true);
- final String version = OpenEjbVersion.get().getVersion();
- final String tomeeVersion = (Integer.parseInt(Character.toString(version.charAt(0))) - 3) + version.substring(1, version.length());
+ final String tomeeVersion = OpenEjbVersion.get().getVersion();
final int modifiers = field.getModifiers();
if (Modifier.isFinal(modifiers)) {
final Field modifiersField = Field.class.getDeclaredField("modifiers");
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-common/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/pom.xml b/tomee/tomee-common/pom.xml
index f39aee4..087c07f 100644
--- a/tomee/tomee-common/pom.xml
+++ b/tomee/tomee-common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-common</artifactId>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-deb/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-deb/pom.xml b/tomee/tomee-deb/pom.xml
index dda41e1..12ffb6d 100644
--- a/tomee/tomee-deb/pom.xml
+++ b/tomee/tomee-deb/pom.xml
@@ -17,7 +17,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-embedded/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml
index e000f66..d55311b 100644
--- a/tomee/tomee-embedded/pom.xml
+++ b/tomee/tomee-embedded/pom.xml
@@ -25,14 +25,14 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-embedded</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: TomEE :: TomEE Embedded</name>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-jaxrs/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-jaxrs/pom.xml b/tomee/tomee-jaxrs/pom.xml
index c3276f2..3386a38 100644
--- a/tomee/tomee-jaxrs/pom.xml
+++ b/tomee/tomee-jaxrs/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-jdbc/pom.xml b/tomee/tomee-jdbc/pom.xml
index cf066fc..17118c6 100644
--- a/tomee/tomee-jdbc/pom.xml
+++ b/tomee/tomee-jdbc/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-juli/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-juli/pom.xml b/tomee/tomee-juli/pom.xml
index 5418bf0..9e6a669 100644
--- a/tomee/tomee-juli/pom.xml
+++ b/tomee/tomee-juli/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-loader/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-loader/pom.xml b/tomee/tomee-loader/pom.xml
index 0fe583b..080a8b5 100644
--- a/tomee/tomee-loader/pom.xml
+++ b/tomee/tomee-loader/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-mojarra/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-mojarra/pom.xml b/tomee/tomee-mojarra/pom.xml
index 4821564..459de68 100644
--- a/tomee/tomee-mojarra/pom.xml
+++ b/tomee/tomee-mojarra/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-myfaces/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-myfaces/pom.xml b/tomee/tomee-myfaces/pom.xml
index 7585944..66d25c2 100644
--- a/tomee/tomee-myfaces/pom.xml
+++ b/tomee/tomee-myfaces/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-overlay-runner/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-overlay-runner/pom.xml b/tomee/tomee-overlay-runner/pom.xml
index ad55db0..34e8d98 100644
--- a/tomee/tomee-overlay-runner/pom.xml
+++ b/tomee/tomee-overlay-runner/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-plume-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 1cd73ca..d525287 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/tomee/blob/ff024a2c/tomee/tomee-plus-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index d927a83..cba6c9a 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>tomee</artifactId>
<groupId>org.apache.openejb</groupId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>7.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[6/6] tomee git commit: TOMEE-1572 add a ThreadBindingListener to
prevent mem leaks in async servlet requests
Posted by st...@apache.org.
TOMEE-1572 add a ThreadBindingListener to prevent mem leaks in async servlet requests
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c8c7f5c9
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c8c7f5c9
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c8c7f5c9
Branch: refs/heads/fb_tomee2_owb16
Commit: c8c7f5c91a94ed3c40f42b8e635cb0e6bb9aaae5
Parents: ac291b9
Author: Mark Struberg <st...@apache.org>
Authored: Thu May 14 18:50:14 2015 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Thu May 14 18:50:14 2015 +0200
----------------------------------------------------------------------
.../tomee/catalina/TomcatWebAppBuilder.java | 8 +++
.../cdi/WebBeansThreadBindingListener.java | 56 ++++++++++++++++++++
2 files changed, 64 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c8c7f5c9/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
index 8137673..a64dab3 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
@@ -79,6 +79,7 @@ import org.apache.openejb.assembler.classic.WebAppBuilder;
import org.apache.openejb.assembler.classic.WebAppInfo;
import org.apache.openejb.assembler.classic.event.NewEjbAvailableAfterApplicationCreated;
import org.apache.openejb.cdi.CdiBuilder;
+import org.apache.openejb.cdi.OWBContextThreadListener;
import org.apache.openejb.cdi.OpenEJBLifecycle;
import org.apache.openejb.cdi.Proxys;
import org.apache.openejb.config.AppModule;
@@ -118,6 +119,7 @@ import org.apache.tomcat.util.descriptor.web.FilterMap;
import org.apache.tomcat.util.descriptor.web.ResourceBase;
import org.apache.tomcat.util.scan.StandardJarScanFilter;
import org.apache.tomee.catalina.cdi.ServletContextHandler;
+import org.apache.tomee.catalina.cdi.WebBeansThreadBindingListener;
import org.apache.tomee.catalina.cluster.ClusterObserver;
import org.apache.tomee.catalina.cluster.TomEEClusterListener;
import org.apache.tomee.catalina.environment.Hosts;
@@ -1678,6 +1680,12 @@ public class TomcatWebAppBuilder implements WebAppBuilder, ContextListener, Pare
newLifecycleListeners[newLifecycleListeners.length - 1] = endWebBeansListener;
standardContext.setApplicationLifecycleListeners(newLifecycleListeners);
}
+
+ // also add the ThreadBindingListener to clean up async thread executions
+ {
+ WebBeansThreadBindingListener webBeansThreadBindingListener = new WebBeansThreadBindingListener(webBeansContext, standardContext.getThreadBindingListener());
+ standardContext.setThreadBindingListener(webBeansThreadBindingListener);
+ }
} else {
// just add the end listener to be able to stack tasks to execute at the request end
final EndWebBeansListener endWebBeansListener = new EndWebBeansListener(webBeansContext);
http://git-wip-us.apache.org/repos/asf/tomee/blob/c8c7f5c9/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.java
new file mode 100644
index 0000000..10bb76a
--- /dev/null
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/cdi/WebBeansThreadBindingListener.java
@@ -0,0 +1,56 @@
+/**
+ * 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.tomee.catalina.cdi;
+
+import javax.enterprise.context.RequestScoped;
+
+import org.apache.catalina.ThreadBindingListener;
+import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.spi.ContextsService;
+
+/**
+ * For Tomcat we need to implement a ThreadBindingListener to
+ * release the ServletRequest in case of Async requests.
+ * Tomcat only sends the requestDestroyed event only when the 'final'
+ * detached response gets rendered. But this happens on a totally
+ * different Thread.
+ * Thus in order to release e.g. locks on Conversations and prevent mem leaks
+ * we need to end the request on unbind() as well.
+ * Note that the ContextsService will do nothing if the Request was already
+ * properly destroyed in standard synchronous Servlet Requests.
+ */
+public class WebBeansThreadBindingListener implements ThreadBindingListener {
+
+ private final ContextsService contextsService;
+ private final ThreadBindingListener delegate;
+
+ public WebBeansThreadBindingListener(WebBeansContext webBeansContext, ThreadBindingListener delegate) {
+ this.contextsService = webBeansContext.getContextsService();
+ this.delegate = delegate;
+ }
+
+ @Override
+ public void bind() {
+ delegate.bind();
+ }
+
+ @Override
+ public void unbind() {
+ contextsService.endContext(RequestScoped.class, null);
+ delegate.unbind();
+ }
+}