Author: rkanter
Date: Mon Jul 1 20:03:48 2013
New Revision: 1498654
URL: http://svn.apache.org/r1498654
Log:
OOZIE-1440 Build fails in certain environments due to xerces OpenJPA issue
(mackrorysd via rkanter)
Modified:
oozie/trunk/client/pom.xml
oozie/trunk/core/pom.xml
oozie/trunk/pom.xml
oozie/trunk/release-log.txt
Modified: oozie/trunk/client/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/client/pom.xml?rev=1498654&r1=1498653&r2=1498654&view=diff
==============================================================================
--- oozie/trunk/client/pom.xml (original)
+++ oozie/trunk/client/pom.xml Mon Jul 1 20:03:48 2013
@@ -97,6 +97,7 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>compile</scope>
+ <version>${xerces.version}</version>
</dependency>
</dependencies>
Modified: oozie/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/pom.xml?rev=1498654&r1=1498653&r2=1498654&view=diff
==============================================================================
--- oozie/trunk/core/pom.xml (original)
+++ oozie/trunk/core/pom.xml Mon Jul 1 20:03:48 2013
@@ -402,6 +402,11 @@
<artifactId>openjpa</artifactId>
<version>${openjpa.version}</version>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>${xerces.version}</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>
Modified: oozie/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/oozie/trunk/pom.xml?rev=1498654&r1=1498653&r2=1498654&view=diff
==============================================================================
--- oozie/trunk/pom.xml (original)
+++ oozie/trunk/pom.xml Mon Jul 1 20:03:48 2013
@@ -97,6 +97,7 @@
<tomcat.version>6.0.36</tomcat.version>
<openjpa.version>2.2.2</openjpa.version>
+ <xerces.version>2.10.0</xerces.version>
</properties>
<modules>
@@ -708,7 +709,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.10.0</version>
+ <version>${xerces.version}</version>
</dependency>
</dependencies>
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1498654&r1=1498653&r2=1498654&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Mon Jul 1 20:03:48 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1440 Build fails in certain environments due to xerces OpenJPA issue
(mackrorysd via rkanter)
OOZIE-1379 Generate SLA end_miss event only after confirming against
persistent store (mona)
OOZIE-1439 Job materialization happening even after coordinator is supposed to
be killed (virag)
OOZIE-1438 parentID is null in job event message of subworkflow action (ryota)
