You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/04/17 16:05:03 UTC
tomee git commit: fixing versions + arq.xml
Repository: tomee
Updated Branches:
refs/heads/master ffe9cf764 -> 024ce1a9c
fixing versions + arq.xml
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/024ce1a9
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/024ce1a9
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/024ce1a9
Branch: refs/heads/master
Commit: 024ce1a9c38b6bf124685d815a6b515688653b94
Parents: ffe9cf7
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Fri Apr 17 16:04:55 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Fri Apr 17 16:04:55 2015 +0200
----------------------------------------------------------------------
examples/resources-jmx-example/pom.xml | 14 ++++++--------
.../src/test/resources/arquillian.xml | 4 ++--
2 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/024ce1a9/examples/resources-jmx-example/pom.xml
----------------------------------------------------------------------
diff --git a/examples/resources-jmx-example/pom.xml b/examples/resources-jmx-example/pom.xml
index 62f5d03..0b668c5 100644
--- a/examples/resources-jmx-example/pom.xml
+++ b/examples/resources-jmx-example/pom.xml
@@ -30,9 +30,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.openejb>4.7.2-SNAPSHOT</version.openejb>
- <version.tomee>1.7.2-SNAPSHOT</version.tomee>
- <version.openjpa>2.3.0</version.openjpa>
+ <version.openejb>5.0.0-SNAPSHOT</version.openejb>
+ <version.tomee>2.0.0-SNAPSHOT</version.tomee>
</properties>
<repositories>
@@ -64,8 +63,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
@@ -93,15 +92,14 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-6</version>
+ <version>7.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
- <type>jar</type>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tomee/blob/024ce1a9/examples/resources-jmx-example/resources-jmx-ejb/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/examples/resources-jmx-example/resources-jmx-ejb/src/test/resources/arquillian.xml b/examples/resources-jmx-example/resources-jmx-ejb/src/test/resources/arquillian.xml
index 7466cda..2a16207 100644
--- a/examples/resources-jmx-example/resources-jmx-ejb/src/test/resources/arquillian.xml
+++ b/examples/resources-jmx-example/resources-jmx-ejb/src/test/resources/arquillian.xml
@@ -22,9 +22,9 @@
<configuration>
<property name="classifier">plus</property>
<property name="httpPort">-1</property>
+ <property name="httpsPort">-1</property>
+ <property name="ajpPort">-1</property>
<property name="stopPort">-1</property>
- <property name="tomcatVersion"></property>
- <property name="openejbVersion">${tomee.version}</property>
<property name="dir">target/apache-tomee-remote</property>
<property name="appWorkingDir">target/arquillian-test-working-dir</property>
</configuration>