You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/09/02 20:13:00 UTC
[1/2] tomee git commit: Revert "Release prep"
Repository: tomee
Updated Branches:
refs/heads/tomee-7.1.x 76ed88061 -> d2ac6243c
Revert "Release prep"
This reverts commit 76ed88061a15e6f9dd7a3042a9fdc31e03395a16.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c3532071
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c3532071
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c3532071
Branch: refs/heads/tomee-7.1.x
Commit: c3532071527de66bf1d45d7a2af46347054e0eb6
Parents: 76ed880
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Sun Sep 2 21:11:24 2018 +0100
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Sun Sep 2 21:11:24 2018 +0100
----------------------------------------------------------------------
arquillian/arquillian-tomee-tests/pom.xml | 30 ++++++++++----------
examples/arquillian-jpa/pom.xml | 2 +-
.../bean-validation-design-by-contract/pom.xml | 2 +-
examples/cdi-realm/pom.xml | 2 +-
examples/change-jaxws-url/pom.xml | 2 +-
examples/connector-ear/pom.xml | 2 +-
examples/connector-war/pom.xml | 2 +-
examples/datasource-ciphered-password/pom.xml | 2 +-
examples/datasource-definition/pom.xml | 2 +-
examples/datasource-versioning/pom.xml | 2 +-
examples/deltaspike-fullstack/pom.xml | 2 +-
examples/dynamic-datasource-routing/pom.xml | 2 +-
examples/mbean-auto-registration/pom.xml | 2 +-
examples/moviefun-rest/pom.xml | 2 +-
examples/moviefun/pom.xml | 2 +-
examples/mtom/pom.xml | 2 +-
examples/multi-jpa-provider-testing/pom.xml | 2 +-
examples/multiple-arquillian-adapters/pom.xml | 2 +-
examples/multiple-tomee-arquillian/pom.xml | 2 +-
examples/pojo-webservice/pom.xml | 2 +-
examples/polling-parent/pom.xml | 2 +-
examples/projectstage-demo/pom.xml | 2 +-
examples/quartz-app/pom.xml | 2 +-
examples/resources-declared-in-webapp/pom.xml | 2 +-
examples/resources-jmx-example/pom.xml | 2 +-
examples/rest-example-with-application/pom.xml | 2 +-
examples/rest-example/pom.xml | 2 +-
examples/rest-on-ejb/pom.xml | 2 +-
examples/simple-cmp2/pom.xml | 2 +-
pom.xml | 2 +-
30 files changed, 44 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/arquillian/arquillian-tomee-tests/pom.xml
----------------------------------------------------------------------
diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml
index 346e89b..ed21808 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -161,7 +161,7 @@
<skip>${maven.test.skip}</skip>
<argLine>-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${project.version}/openejb-javaagent-${project.version}.jar</argLine>
<systemPropertyVariables>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<arquillian.launch>tomee-embedded</arquillian.launch>
<openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
</systemPropertyVariables>
@@ -260,7 +260,7 @@
<skip>${skip.remote.webprofile}</skip>
<systemPropertyVariables>
<openejb.arquillian.debug>true</openejb.arquillian.debug>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<tomee.classifier>webprofile</tomee.classifier>
<arquillian.launch>tomee-remote</arquillian.launch>
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
@@ -277,7 +277,7 @@
<skip>${skip.embedded}</skip>
<argLine>-javaagent:${settings.localRepository}/org/apache/tomee/openejb-javaagent/${project.version}/openejb-javaagent-${project.version}.jar -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=768M</argLine>
<systemPropertyVariables>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<arquillian.launch>tomee-embedded</arquillian.launch>
<openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
</systemPropertyVariables>
@@ -293,7 +293,7 @@
<skip>${skip.remote.plume}</skip>
<systemPropertyVariables>
<openejb.arquillian.debug>true</openejb.arquillian.debug>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<tomee.classifier>plume</tomee.classifier>
<arquillian.launch>tomee-remote</arquillian.launch>
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
@@ -313,7 +313,7 @@
<skip>${skip.remote.plus}</skip>
<systemPropertyVariables>
<openejb.arquillian.debug>true</openejb.arquillian.debug>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<tomee.classifier>plus</tomee.classifier>
<arquillian.launch>tomee-remote</arquillian.launch>
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
@@ -329,7 +329,7 @@
<configuration>
<skip>${skip.webapp.webprofile}</skip>
<systemPropertyVariables>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
@@ -346,7 +346,7 @@
<configuration>
<skip>${skip.webapp.plus}</skip>
<systemPropertyVariables>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
@@ -363,7 +363,7 @@
<configuration>
<skip>${skip.webapp.plume}</skip>
<systemPropertyVariables>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-plume-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
@@ -473,7 +473,7 @@
<skip>${maven.test.skip}</skip>
<argLine>-XX:MaxPermSize=768M</argLine>
<systemPropertyVariables>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<arquillian.launch>tomee-embedded</arquillian.launch>
<openejb.arquillian.adapter>tomee-embedded</openejb.arquillian.adapter>
</systemPropertyVariables>
@@ -492,7 +492,7 @@
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<openejb.arquillian.debug>true</openejb.arquillian.debug>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<tomee.classifier>webprofile</tomee.classifier>
<arquillian.launch>tomee-remote</arquillian.launch>
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
@@ -509,7 +509,7 @@
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<openejb.arquillian.debug>true</openejb.arquillian.debug>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<tomee.classifier>plus</tomee.classifier>
<arquillian.launch>tomee-remote</arquillian.launch>
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
@@ -526,7 +526,7 @@
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
<openejb.arquillian.debug>true</openejb.arquillian.debug>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<tomee.classifier>plume</tomee.classifier>
<arquillian.launch>tomee-remote</arquillian.launch>
<openejb.arquillian.adapter>tomee-remote</openejb.arquillian.adapter>
@@ -548,7 +548,7 @@
<configuration>
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
@@ -565,7 +565,7 @@
<configuration>
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-plus-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
@@ -582,7 +582,7 @@
<configuration>
<skip>${maven.test.skip}</skip>
<systemPropertyVariables>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<tomee.tomcatVersion>${tomcat.version}</tomee.tomcatVersion>
<tomee.artifactId>tomee-plume-webapp</tomee.artifactId>
<arquillian.launch>tomee-webapp</arquillian.launch>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/arquillian-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/examples/arquillian-jpa/pom.xml b/examples/arquillian-jpa/pom.xml
index bca3969..b7e51a0 100644
--- a/examples/arquillian-jpa/pom.xml
+++ b/examples/arquillian-jpa/pom.xml
@@ -18,7 +18,7 @@
<properties>
<arquillian.version>1.1.10.Final</arquillian.version>
<arquillian-persistence.version>1.0.0.Alpha7</arquillian-persistence.version>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/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 3560d57..076d9fb 100755
--- a/examples/bean-validation-design-by-contract/pom.xml
+++ b/examples/bean-validation-design-by-contract/pom.xml
@@ -26,7 +26,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/cdi-realm/pom.xml
----------------------------------------------------------------------
diff --git a/examples/cdi-realm/pom.xml b/examples/cdi-realm/pom.xml
index 9ffb73e..6ccdcf8 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>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/change-jaxws-url/pom.xml
----------------------------------------------------------------------
diff --git a/examples/change-jaxws-url/pom.xml b/examples/change-jaxws-url/pom.xml
index 1ae3ea0..ce56d1d 100644
--- a/examples/change-jaxws-url/pom.xml
+++ b/examples/change-jaxws-url/pom.xml
@@ -28,7 +28,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/connector-ear/pom.xml
----------------------------------------------------------------------
diff --git a/examples/connector-ear/pom.xml b/examples/connector-ear/pom.xml
index e407740..d3ca774 100644
--- a/examples/connector-ear/pom.xml
+++ b/examples/connector-ear/pom.xml
@@ -25,7 +25,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<version.shrinkwrap.resolver>2.1.0</version.shrinkwrap.resolver>
</properties>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/connector-war/pom.xml
----------------------------------------------------------------------
diff --git a/examples/connector-war/pom.xml b/examples/connector-war/pom.xml
index 011fe34..3552795 100644
--- a/examples/connector-war/pom.xml
+++ b/examples/connector-war/pom.xml
@@ -21,7 +21,7 @@
<name>OpenEJB :: Connector Examples :: Connector in WAR</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<version.shrinkwrap.resolver>2.1.0</version.shrinkwrap.resolver>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/datasource-ciphered-password/pom.xml
----------------------------------------------------------------------
diff --git a/examples/datasource-ciphered-password/pom.xml b/examples/datasource-ciphered-password/pom.xml
index 13d2e53..1a1ae25 100644
--- a/examples/datasource-ciphered-password/pom.xml
+++ b/examples/datasource-ciphered-password/pom.xml
@@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/datasource-definition/pom.xml
----------------------------------------------------------------------
diff --git a/examples/datasource-definition/pom.xml b/examples/datasource-definition/pom.xml
index 91c013b..3674f70 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>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/datasource-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/examples/datasource-versioning/pom.xml b/examples/datasource-versioning/pom.xml
index 6188cff..9289d2d 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>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/deltaspike-fullstack/pom.xml
----------------------------------------------------------------------
diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml
index a6beb1b..5ff0d06 100644
--- a/examples/deltaspike-fullstack/pom.xml
+++ b/examples/deltaspike-fullstack/pom.xml
@@ -24,7 +24,7 @@
<version.myfaces2>2.2.7</version.myfaces2>
<version.deltaspike>1.3.0</version.deltaspike>
<version.extval>2.0.8</version.extval>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<openjpa.version>2.4.3</openjpa.version>
</properties>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/dynamic-datasource-routing/pom.xml
----------------------------------------------------------------------
diff --git a/examples/dynamic-datasource-routing/pom.xml b/examples/dynamic-datasource-routing/pom.xml
index 0a63893..31d677a 100755
--- a/examples/dynamic-datasource-routing/pom.xml
+++ b/examples/dynamic-datasource-routing/pom.xml
@@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/mbean-auto-registration/pom.xml
----------------------------------------------------------------------
diff --git a/examples/mbean-auto-registration/pom.xml b/examples/mbean-auto-registration/pom.xml
index b63639c..726be41 100755
--- a/examples/mbean-auto-registration/pom.xml
+++ b/examples/mbean-auto-registration/pom.xml
@@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/moviefun-rest/pom.xml
----------------------------------------------------------------------
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index a165860..9792de9 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -23,7 +23,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
</properties>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/moviefun/pom.xml
----------------------------------------------------------------------
diff --git a/examples/moviefun/pom.xml b/examples/moviefun/pom.xml
index 2bfb4b7..1f648ec 100644
--- a/examples/moviefun/pom.xml
+++ b/examples/moviefun/pom.xml
@@ -21,7 +21,7 @@
<name>OpenEJB :: Web Examples :: Moviefun</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/mtom/pom.xml
----------------------------------------------------------------------
diff --git a/examples/mtom/pom.xml b/examples/mtom/pom.xml
index 7abf864..e4af808 100644
--- a/examples/mtom/pom.xml
+++ b/examples/mtom/pom.xml
@@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/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 c2e1be9..fd92a99 100644
--- a/examples/multi-jpa-provider-testing/pom.xml
+++ b/examples/multi-jpa-provider-testing/pom.xml
@@ -28,7 +28,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/multiple-arquillian-adapters/pom.xml
----------------------------------------------------------------------
diff --git a/examples/multiple-arquillian-adapters/pom.xml b/examples/multiple-arquillian-adapters/pom.xml
index cda37f8..04ebbf8 100644
--- a/examples/multiple-arquillian-adapters/pom.xml
+++ b/examples/multiple-arquillian-adapters/pom.xml
@@ -28,7 +28,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<arquillian.version>1.1.10.Final</arquillian.version>
</properties>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/multiple-tomee-arquillian/pom.xml
----------------------------------------------------------------------
diff --git a/examples/multiple-tomee-arquillian/pom.xml b/examples/multiple-tomee-arquillian/pom.xml
index bd60347..e076340 100644
--- a/examples/multiple-tomee-arquillian/pom.xml
+++ b/examples/multiple-tomee-arquillian/pom.xml
@@ -25,7 +25,7 @@
<name>OpenEJB :: Examples :: Multiple TomEE with Arquillian</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
<defaultGoal>install</defaultGoal>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/pojo-webservice/pom.xml
----------------------------------------------------------------------
diff --git a/examples/pojo-webservice/pom.xml b/examples/pojo-webservice/pom.xml
index 538366c..4068e1c 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>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<repositories>
<repository>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/polling-parent/pom.xml
----------------------------------------------------------------------
diff --git a/examples/polling-parent/pom.xml b/examples/polling-parent/pom.xml
index de42621..6fb6f05 100644
--- a/examples/polling-parent/pom.xml
+++ b/examples/polling-parent/pom.xml
@@ -28,7 +28,7 @@
<properties>
<xbean.version>4.4</xbean.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/projectstage-demo/pom.xml
----------------------------------------------------------------------
diff --git a/examples/projectstage-demo/pom.xml b/examples/projectstage-demo/pom.xml
index 433fcd3..d524bfe 100644
--- a/examples/projectstage-demo/pom.xml
+++ b/examples/projectstage-demo/pom.xml
@@ -25,7 +25,7 @@
<name>OpenEJB :: Examples :: DeltaSpike ProjectStage</name>
<properties>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/quartz-app/pom.xml
----------------------------------------------------------------------
diff --git a/examples/quartz-app/pom.xml b/examples/quartz-app/pom.xml
index 390ffa6..82e9ce4 100644
--- a/examples/quartz-app/pom.xml
+++ b/examples/quartz-app/pom.xml
@@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/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 70cf2a5..603950d 100644
--- a/examples/resources-declared-in-webapp/pom.xml
+++ b/examples/resources-declared-in-webapp/pom.xml
@@ -28,7 +28,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/resources-jmx-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/resources-jmx-example/pom.xml b/examples/resources-jmx-example/pom.xml
index b1c5091..9c46192 100644
--- a/examples/resources-jmx-example/pom.xml
+++ b/examples/resources-jmx-example/pom.xml
@@ -29,7 +29,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/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 debaa70..ddd8abb 100644
--- a/examples/rest-example-with-application/pom.xml
+++ b/examples/rest-example-with-application/pom.xml
@@ -28,7 +28,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<repositories>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/rest-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml
index 93963fb..4973f0a 100644
--- a/examples/rest-example/pom.xml
+++ b/examples/rest-example/pom.xml
@@ -28,7 +28,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
<version.openjpa>2.4.0</version.openjpa>
</properties>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/rest-on-ejb/pom.xml
----------------------------------------------------------------------
diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml
index 21d37b2..26ac717 100644
--- a/examples/rest-on-ejb/pom.xml
+++ b/examples/rest-on-ejb/pom.xml
@@ -31,7 +31,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/examples/simple-cmp2/pom.xml
----------------------------------------------------------------------
diff --git a/examples/simple-cmp2/pom.xml b/examples/simple-cmp2/pom.xml
index 17b97ef..b464c15 100644
--- a/examples/simple-cmp2/pom.xml
+++ b/examples/simple-cmp2/pom.xml
@@ -31,7 +31,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>7.1.0-SNAPSHOT</tomee.version>
</properties>
<build>
http://git-wip-us.apache.org/repos/asf/tomee/blob/c3532071/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 75e3781..11b2af2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
<properties>
- <tomee.version>7.1.0</tomee.version>
+ <tomee.version>${project.version}</tomee.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
[2/2] tomee git commit: applying changes from
https://github.com/apache/tomee/pull/135
Posted by jg...@apache.org.
applying changes from https://github.com/apache/tomee/pull/135
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d2ac6243
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d2ac6243
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d2ac6243
Branch: refs/heads/tomee-7.1.x
Commit: d2ac6243cf365dcd3f56c88fb8f58e60c7ec9dbc
Parents: c353207
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Tue Jul 17 06:09:13 2018 -0400
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Sun Sep 2 21:12:43 2018 +0100
----------------------------------------------------------------------
.../assembler/classic/JndiEncBuilder.java | 4 +-
.../core/ivm/naming/MapObjectReference.java | 6 +-
.../apache/openejb/server/cxf/rs/Contexts.java | 3 +
.../cxf/rs/ApplicationRsInjectionTest.java | 65 ++++++++++++++++++++
4 files changed, 76 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2ac6243/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
index 53bcac8..3c287f9 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
@@ -73,6 +73,7 @@ import javax.transaction.UserTransaction;
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
import javax.ws.rs.container.ResourceContext;
+import javax.ws.rs.core.Application;
import javax.ws.rs.core.Configuration;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Request;
@@ -341,10 +342,11 @@ public class JndiEncBuilder {
reference = new ObjectReference(ThreadLocalContextManager.RESOURCE_CONTEXT);
} else if (Configuration.class.equals(type)) {
reference = new ObjectReference(ThreadLocalContextManager.CONFIGURATION);
+ } else if (Application.class.equals(type)) {
+ reference = new ObjectReference(ThreadLocalContextManager.APPLICATION);
} else {
reference = new MapObjectReference(ThreadLocalContextManager.OTHERS, referenceInfo.referenceType);
}
-
bindings.put(normalize(referenceInfo.referenceName), reference);
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2ac6243/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/MapObjectReference.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/MapObjectReference.java b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/MapObjectReference.java
index bbca666..4cf14f4 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/MapObjectReference.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/core/ivm/naming/MapObjectReference.java
@@ -31,6 +31,10 @@ public class MapObjectReference extends Reference {
}
public Object getObject() throws NamingException {
- return obj.get().get(key);
+ final Map<String, Object> theMap = obj.get();
+ if (theMap == null) {
+ return null;
+ }
+ return theMap.get(key);
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2ac6243/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Contexts.java
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Contexts.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Contexts.java
index e1a5411..4fc3211 100644
--- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Contexts.java
+++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/Contexts.java
@@ -178,6 +178,9 @@ public final class Contexts {
} else if (ResourceContext.class.equals(type)) {
final ResourceContext config = JAXRSUtils.createContextValue(exchange.getInMessage(), null, ResourceContext.class);
ThreadLocalContextManager.RESOURCE_CONTEXT.set(config);
+ } else if (Application.class.equals(type)) {
+ final Application config = JAXRSUtils.createContextValue(exchange.getInMessage(), null, Application.class);
+ ThreadLocalContextManager.APPLICATION.set(config);
} else {
final Message message = exchange.getInMessage();
final ContextProvider<?> provider = ProviderFactory.getInstance(message).createContextProvider(type, message);
http://git-wip-us.apache.org/repos/asf/tomee/blob/d2ac6243/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationRsInjectionTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationRsInjectionTest.java b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationRsInjectionTest.java
new file mode 100644
index 0000000..8db7068
--- /dev/null
+++ b/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/ApplicationRsInjectionTest.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.server.cxf.rs;
+
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.EnableServices;
+import org.apache.openejb.testing.RandomPort;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.net.URL;
+
+import static org.junit.Assert.assertEquals;
+
+@Classes(innerClassesAsBean = true)
+@EnableServices("jaxrs")
+@RunWith(ApplicationComposer.class)
+public class ApplicationRsInjectionTest {
+ @RandomPort("http")
+ private URL root;
+
+ @Test
+ public void run() {
+ assertEquals("false", ClientBuilder.newClient().target(root.toExternalForm()).path("/openejb/applicationTest").request().get(String.class));
+ }
+
+ @Path("applicationTest")
+ public static class Dummy {
+
+ // This was null. It should be injected here
+ // https://issues.apache.org/jira/browse/TOMEE-2201
+ @Context
+ private Application application;
+
+ @GET
+ @Produces(MediaType.TEXT_PLAIN)
+ public Response touch() {
+ return Response.ok().entity(this.application == null).type(MediaType.TEXT_PLAIN).build();
+ }
+ }
+
+}