OOZIE-2778 Copy only jetty.version related server dependencies to distro (asasvari via abhishekbafna)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/b90e4532 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/b90e4532 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/b90e4532 Branch: refs/heads/oya Commit: b90e45328e9bb35f88ce068729c390f672c24f3d Parents: a8c3392 Author: abhisek bafna <aba...@hortonworks.com> Authored: Wed Feb 8 10:22:54 2017 +0530 Committer: abhisek bafna <aba...@hortonworks.com> Committed: Wed Feb 8 10:22:54 2017 +0530 ---------------------------------------------------------------------- release-log.txt | 3 ++- server/pom.xml | 8 ++++++++ src/main/assemblies/distro.xml | 3 +-- 3 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/b90e4532/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 4d2b4bd..955771b 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,9 +1,10 @@ -- Oozie 4.4.0 release (trunk - unreleased) +OOZIE-2778 Copy only jetty.version related server dependencies to distro (asasvari via abhishekbafna) OOZIE-2786 Pass Oozie workflow ID and settings to Spark application configuration (zhengxb2005 via rkanter) OOZIE-2790 log4j configuration is not passed to spark executors (satishsaley) OOZIE-2787 Oozie distributes application jar twice making the spark job fail (satishsaley) -OOZIE-2789 Maven complains about checkstyle error during build (xzheng via abhishekbafna) +OOZIE-2789 Maven complains about checkstyle error during build (zhengxb2005 via abhishekbafna) OOZIE-2777 Config-default.xml longer than 64k results in java.io.UTFDataFormatException (gezapeti via harsh) OOZIE-2782 Input logic wait documentation is confusing (puru) OOZIE-2781 HCat partition available notification is not sent to coordinator actions if coordinator job is using a different hostname (cname, IP address, etc. ) for HCat URL (puru) http://git-wip-us.apache.org/repos/asf/oozie/blob/b90e4532/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index a336aa8..dae6594 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -89,6 +89,10 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-util</artifactId> </exclusion> + <exclusion> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -125,6 +129,10 @@ <groupId>org.eclipse.jetty.aggregate</groupId> <artifactId>jetty-all</artifactId> </exclusion> + <exclusion> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + </exclusion> </exclusions> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/b90e4532/src/main/assemblies/distro.xml ---------------------------------------------------------------------- diff --git a/src/main/assemblies/distro.xml b/src/main/assemblies/distro.xml index fa733cc..da1bd2e 100644 --- a/src/main/assemblies/distro.xml +++ b/src/main/assemblies/distro.xml @@ -82,13 +82,12 @@ <outputDirectory>/embedded-oozie-server</outputDirectory> <includes> <include>oozie-server*.jar</include> - <include>**/jetty*.jar</include> + <include>**/jetty*-${jetty.version}.jar</include> <include>**/*jsp*.jar</include> <include>**/mail*.jar</include> <include>**/apache*.jar</include> <include>**/commons-el*.jar</include> <include>**/javax.servlet-api-3.1.0.jar</include> - <include>**/jasper*jar</include> <include>**/taglibs-*jar</include> <include>**/org.eclipse.jdt.core-*jar</include> </includes>
