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/08/23 11:35:08 UTC
[1/2] tomee git commit: Removed MP Health for TomEE 7. It seems that
it requires CDI 2.0.
Repository: tomee
Updated Branches:
refs/heads/tomee-7.1.x ab4bbc8ae -> 2ec8f3bf9
Removed MP Health for TomEE 7. It seems that it requires CDI 2.0.
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/a007c37a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/a007c37a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/a007c37a
Branch: refs/heads/tomee-7.1.x
Commit: a007c37a62da1b5e2386391ee7433198e6eb167c
Parents: eb3305f
Author: Roberto Cortez <ra...@yahoo.com>
Authored: Wed Aug 22 11:42:06 2018 +0100
Committer: Roberto Cortez <ra...@yahoo.com>
Committed: Thu Aug 23 12:05:37 2018 +0100
----------------------------------------------------------------------
tck/microprofile-tck/pom.xml | 4 +++-
tomee/tomee-microprofile-webapp/pom.xml | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/a007c37a/tck/microprofile-tck/pom.xml
----------------------------------------------------------------------
diff --git a/tck/microprofile-tck/pom.xml b/tck/microprofile-tck/pom.xml
index 94efcf9..a96e497 100644
--- a/tck/microprofile-tck/pom.xml
+++ b/tck/microprofile-tck/pom.xml
@@ -33,8 +33,10 @@
<module>config</module>
<module>jwt</module>
<module>fault-tolerance</module>
+ <!--
<module>health</module>
- <!--<module>metrics</module>-->
+ <module>metrics</module>
+ -->
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/a007c37a/tomee/tomee-microprofile-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/tomee/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml
index eb4b252..7b3d9b8 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -77,6 +77,7 @@
<version>${microprofile.fault-tolerance.impl.version}</version>
</dependency>
+ <!-- Health has a beans.xml with CDI 2.0
<dependency>
<groupId>org.eclipse.microprofile.health</groupId>
<artifactId>microprofile-health-api</artifactId>
@@ -88,6 +89,7 @@
<artifactId>geronimo-health</artifactId>
<version>${microprofile.health.impl.version}</version>
</dependency>
+ -->
<!-- Metrics is not working with OWB 1.x. Apparently it requires OWB 2.x
<dependency>
[2/2] tomee git commit: Merge branch 'tomee-7.1.x' of
github.com:radcortez/tomee into tomee-7.1.x
Posted by jg...@apache.org.
Merge branch 'tomee-7.1.x' of github.com:radcortez/tomee into tomee-7.1.x
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2ec8f3bf
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2ec8f3bf
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2ec8f3bf
Branch: refs/heads/tomee-7.1.x
Commit: 2ec8f3bf9b7ac8fbb74792c315808c4cf4dcea00
Parents: ab4bbc8 a007c37
Author: Jonathan Gallimore <jg...@tomitribe.com>
Authored: Thu Aug 23 12:34:41 2018 +0100
Committer: Jonathan Gallimore <jg...@tomitribe.com>
Committed: Thu Aug 23 12:34:41 2018 +0100
----------------------------------------------------------------------
tck/microprofile-tck/pom.xml | 4 +++-
tomee/tomee-microprofile-webapp/pom.xml | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/2ec8f3bf/tck/microprofile-tck/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/2ec8f3bf/tomee/tomee-microprofile-webapp/pom.xml
----------------------------------------------------------------------