You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2014/05/14 22:50:22 UTC
svn commit: r1594711 - in /tomee/tomee/trunk: ./ examples/
examples/polling-parent/ examples/quartz-app/
examples/quartz-app/quartz-beans/ examples/quartz-app/quartz-ra/
examples/simple-osgi/simple-osgi-core/ shade/
Author: dblevins
Date: Wed May 14 20:50:21 2014
New Revision: 1594711
URL: http://svn.apache.org/r1594711
Log:
Use the external quartz shade jar
Removed:
tomee/tomee/trunk/shade/
Modified:
tomee/tomee/trunk/examples/polling-parent/pom.xml
tomee/tomee/trunk/examples/pom.xml
tomee/tomee/trunk/examples/quartz-app/pom.xml
tomee/tomee/trunk/examples/quartz-app/quartz-beans/pom.xml
tomee/tomee/trunk/examples/quartz-app/quartz-ra/pom.xml
tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml
tomee/tomee/trunk/pom.xml
Modified: tomee/tomee/trunk/examples/polling-parent/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/polling-parent/pom.xml?rev=1594711&r1=1594710&r2=1594711&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/polling-parent/pom.xml (original)
+++ tomee/tomee/trunk/examples/polling-parent/pom.xml Wed May 14 20:50:21 2014
@@ -51,10 +51,10 @@
</build>
<repositories>
- <repository>
+ <repository>
<id>patch-openjpa</id>
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
- <releases>
+ <releases>
<enabled>true</enabled>
</releases>
</repository>
@@ -62,14 +62,14 @@
<id>apache-m2-snapshot</id>
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
- </repository>
+ </repository>
</repositories>
-
+
<pluginRepositories>
- <pluginRepository>
+ <pluginRepository>
<id>patch-openjpa-plugin</id>
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
- <releases>
+ <releases>
<enabled>true</enabled>
</releases>
</pluginRepository>
Modified: tomee/tomee/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/pom.xml?rev=1594711&r1=1594710&r2=1594711&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/pom.xml (original)
+++ tomee/tomee/trunk/examples/pom.xml Wed May 14 20:50:21 2014
@@ -156,6 +156,15 @@
<module>moviefun</module>
<module>moviefun-rest</module>
</modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb.patch</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <version>${openjpa.version}</version>
+ </dependency>
+ </dependencies>
+
<profiles>
<profile>
<id>apache-release</id>
Modified: tomee/tomee/trunk/examples/quartz-app/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/quartz-app/pom.xml?rev=1594711&r1=1594710&r2=1594711&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/quartz-app/pom.xml (original)
+++ tomee/tomee/trunk/examples/quartz-app/pom.xml Wed May 14 20:50:21 2014
@@ -61,10 +61,18 @@
</build>
<dependencyManagement>
<dependencies>
+ <!--
+ TomEE/OpenEJB uses a shaded version of quartz
+ allowing users to use their own version of quartz
+ and avoid version conflicts.
+
+ This example shows an application that uses its
+ own version of quartz.
+ -->
<dependency>
- <groupId>org.apache.openejb.shade</groupId>
- <artifactId>openejb-shade-quartz</artifactId>
- <version>${version.openejb}</version>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: tomee/tomee/trunk/examples/quartz-app/quartz-beans/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/quartz-app/quartz-beans/pom.xml?rev=1594711&r1=1594710&r2=1594711&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/quartz-app/quartz-beans/pom.xml (original)
+++ tomee/tomee/trunk/examples/quartz-app/quartz-beans/pom.xml Wed May 14 20:50:21 2014
@@ -34,8 +34,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.shade</groupId>
- <artifactId>openejb-shade-quartz</artifactId>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/quartz-app/quartz-ra/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/quartz-app/quartz-ra/pom.xml?rev=1594711&r1=1594710&r2=1594711&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/quartz-app/quartz-ra/pom.xml (original)
+++ tomee/tomee/trunk/examples/quartz-app/quartz-ra/pom.xml Wed May 14 20:50:21 2014
@@ -32,8 +32,8 @@
</description>
<dependencies>
<dependency>
- <groupId>org.apache.openejb.shade</groupId>
- <artifactId>openejb-shade-quartz</artifactId>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml?rev=1594711&r1=1594710&r2=1594711&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml (original)
+++ tomee/tomee/trunk/examples/simple-osgi/simple-osgi-core/pom.xml Wed May 14 20:50:21 2014
@@ -70,26 +70,26 @@
</plugin>
</plugins>
</build>
-
+
<repositories>
- <repository>
+ <repository>
<id>patch-openjpa</id>
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
- <releases>
+ <releases>
<enabled>true</enabled>
</releases>
</repository>
- </repositories>
+ </repositories>
<pluginRepositories>
- <pluginRepository>
+ <pluginRepository>
<id>patch-openjpa-plugin</id>
<url>https://repository.apache.org/content/repositories/orgapachetomee-1022/</url>
- <releases>
+ <releases>
<enabled>true</enabled>
</releases>
</pluginRepository>
- </pluginRepositories>
+ </pluginRepositories>
<dependencies>
<dependency>
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1594711&r1=1594710&r2=1594711&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Wed May 14 20:50:21 2014
@@ -161,7 +161,7 @@
<bval.version>0.5</bval.version>
<org.apache.activemq.version>5.9.1</org.apache.activemq.version>
- <quartz.version>2.2.1</quartz.version>
+ <quartz.version>2.2.1-SNAPSHOT</quartz.version>
<org.springframework.version>3.1.4.RELEASE</org.springframework.version>
<junit.version>4.11</junit.version>
<org.apache.axis2.version>1.4.1</org.apache.axis2.version>
@@ -406,7 +406,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>shade</module>
<module>itests</module>
<module>maven</module>
<module>container</module>
@@ -423,7 +422,6 @@
<id>quick</id>
<modules>
<module>maven</module>
- <module>shade</module>
<module>container</module>
<module>server</module>
<module>assembly</module>
@@ -435,7 +433,6 @@
<profile>
<id>openejb</id>
<modules>
- <module>shade</module>
<module>itests</module>
<module>container</module>
<module>server</module>
@@ -1521,27 +1518,25 @@
<artifactId>tomcat-catalina</artifactId>
<version>${tomcat.version}</version>
</dependency>
- <!-- we now use our shade
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>${quartz.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
+ <dependency>
+ <groupId>quartz-openejb-shade</groupId>
+ <artifactId>quartz-openejb-shade</artifactId>
+ <version>${quartz.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>