You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/08/04 22:35:54 UTC
svn commit: r1615777 - in /tomee/tomee/branches/tomee-1.7.0: ./
examples/myfaces-codi-demo/pom.xml pom.xml
Author: andygumbrecht
Date: Mon Aug 4 20:35:54 2014
New Revision: 1615777
URL: http://svn.apache.org/r1615777
Log:
quartz shade is totally messed up regarding dependencies, ensuring we don't bring the shaded dependency
Modified:
tomee/tomee/branches/tomee-1.7.0/ (props changed)
tomee/tomee/branches/tomee-1.7.0/examples/myfaces-codi-demo/pom.xml
tomee/tomee/branches/tomee-1.7.0/pom.xml
Propchange: tomee/tomee/branches/tomee-1.7.0/
------------------------------------------------------------------------------
Merged /tomee/tomee/branches/tomee-1.7.x:r1615719
Modified: tomee/tomee/branches/tomee-1.7.0/examples/myfaces-codi-demo/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.0/examples/myfaces-codi-demo/pom.xml?rev=1615777&r1=1615776&r2=1615777&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.0/examples/myfaces-codi-demo/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.7.0/examples/myfaces-codi-demo/pom.xml Mon Aug 4 20:35:54 2014
@@ -20,7 +20,7 @@
<packaging>war</packaging>
<properties>
- <myfaces2.version>2.1.15</myfaces2.version>
+ <myfaces2.version>2.2.4</myfaces2.version>
<myfaces.codi.version>1.0.5</myfaces.codi.version>
<extval.version>2.0.8</extval.version>
</properties>
Modified: tomee/tomee/branches/tomee-1.7.0/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.0/pom.xml?rev=1615777&r1=1615776&r2=1615777&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.0/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.7.0/pom.xml Mon Aug 4 20:35:54 2014
@@ -1657,6 +1657,10 @@
<version>2.2.1</version>
<exclusions>
<exclusion>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</exclusion>