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 2013/12/05 10:10:26 UTC
svn commit: r1548048 - in /tomee/tomee/trunk:
arquillian/arquillian-tomee-common/pom.xml
arquillian/arquillian-tomee-webapp-remote/pom.xml
examples/quartz-app/pom.xml server/openejb-server/pom.xml
Author: rmannibucau
Date: Thu Dec 5 09:10:26 2013
New Revision: 1548048
URL: http://svn.apache.org/r1548048
Log:
TOMEE-1092 shade quartz + some more pom cleanup
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
tomee/tomee/trunk/examples/quartz-app/pom.xml
tomee/tomee/trunk/server/openejb-server/pom.xml
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml?rev=1548048&r1=1548047&r2=1548048&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-common/pom.xml Thu Dec 5 09:10:26 2013
@@ -202,8 +202,8 @@
<groupId>wsdl4j</groupId>
</exclusion>
<exclusion>
- <artifactId>quartz</artifactId>
- <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz-openejb-shade</artifactId>
+ <groupId>org.apache.openejb.shade</groupId>
</exclusion>
<exclusion>
<artifactId>openwebbeans-impl</artifactId>
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1548048&r1=1548047&r2=1548048&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-webapp-remote/pom.xml Thu Dec 5 09:10:26 2013
@@ -226,8 +226,8 @@
<groupId>wsdl4j</groupId>
</exclusion>
<exclusion>
- <artifactId>quartz</artifactId>
- <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz-openejb-shade</artifactId>
+ <groupId>org.apache.openejb.shade</groupId>
</exclusion>
<!-- <exclusion>
<artifactId>openwebbeans-impl</artifactId>
Modified: tomee/tomee/trunk/examples/quartz-app/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/quartz-app/pom.xml?rev=1548048&r1=1548047&r2=1548048&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/quartz-app/pom.xml (original)
+++ tomee/tomee/trunk/examples/quartz-app/pom.xml Thu Dec 5 09:10:26 2013
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.1.3</version>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: tomee/tomee/trunk/server/openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-server/pom.xml?rev=1548048&r1=1548047&r2=1548048&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-server/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-server/pom.xml Thu Dec 5 09:10:26 2013
@@ -279,9 +279,9 @@
org.omg.CORBA,
org.osgi.framework;version="[1.5,2)",
org.osgi.util.tracker;version="[1.4,2)",
- org.quartz;resolution:=optional,
- org.quartz.impl;resolution:=optional,
- org.quartz.spi;resolution:=optional,
+ org.apache.openejb.quartz;resolution:=optional,
+ org.apache.openejb.quartz.impl;resolution:=optional,
+ org.apache.openejb.quartz.spi;resolution:=optional,
org.slf4j;version="[1.6,4)",
org.w3c.dom,
org.w3c.dom.ls,