This is an automated email from the ASF dual-hosted git repository.
kmarton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git
The following commit(s) were added to refs/heads/master by this push:
new ca707b2 OOZIE-3401 [test] fix TestPySpark failure (kmarton,
asalamon74)
ca707b2 is described below
commit ca707b23f08e3c4b1df436c07fe25b01261e88ef
Author: Julia Kinga Marton <[email protected]>
AuthorDate: Thu Jan 17 09:09:47 2019 +0100
OOZIE-3401 [test] fix TestPySpark failure (kmarton, asalamon74)
---
release-log.txt | 1 +
sharelib/pom.xml | 15 ---------------
sharelib/spark/pom.xml | 20 ++++++++++++++++++++
3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/release-log.txt b/release-log.txt
index 2839bb6..c502084 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.2.0 release (trunk - unreleased)
+OOZIE-3401 [test] fix TestPySpark failure (kmarton, asalamon74)
OOZIE-3419 [fluent-job] GraphVisualization fails before JDK 1.8.0_u40
(andras.piros via kmarton)
OOZIE-3422 [client] Enhance logging of Oozie client connecting to the Oozie
server (asalamon74 via andras.piros)
OOZIE-3421 [tests] GitServer lifecycle fixes (andras.piros via kmarton)
diff --git a/sharelib/pom.xml b/sharelib/pom.xml
index 55f2c8f..39298d5 100644
--- a/sharelib/pom.xml
+++ b/sharelib/pom.xml
@@ -62,21 +62,6 @@
<goal>resources</goal>
</goals>
</execution>
- <execution>
- <id>copy-resources</id>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
-
<outputDirectory>${basedir}/spark/target/test-classes</outputDirectory>
- <resources>
- <resource>
-
<directory>spark/src/main/resources</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
diff --git a/sharelib/spark/pom.xml b/sharelib/spark/pom.xml
index 66d4080..b26849c 100644
--- a/sharelib/spark/pom.xml
+++ b/sharelib/spark/pom.xml
@@ -393,6 +393,26 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-test-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${basedir}/target/test-classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<finalName>partial-sharelib</finalName>
