Permalink
Browse files

Closes GH-186 examples should use the JARs produced by sharelib

  • Loading branch information...
1 parent 849c772 commit 482084ff0ccfbf81278d2fae686d4a1b46a51add @tucu00 tucu00 committed Nov 5, 2010
Showing with 16 additions and 39 deletions.
  1. +6 −34 examples/pom.xml
  2. +1 −0 release-log.txt
  3. +5 −5 src/main/assemblies/examples.xml
  4. +4 −0 src/main/assemblies/sharelib.xml
View
@@ -51,6 +51,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.yahoo.oozie</groupId> <!-- OOZIE_GROUP_ID -->
+ <artifactId>oozie-sharelib</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>${hadoopGroupId}</groupId>
<artifactId>hadoop-core</artifactId>
<version>${hadoopVersion}</version>
@@ -64,40 +70,6 @@
</dependency>
<dependency>
<groupId>${hadoopGroupId}</groupId>
- <artifactId>hadoop-streaming</artifactId>
- <version>${hadoopVersion}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>${hadoopGroupId}</groupId>
- <artifactId>hadoop-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>${pigGroupId}</groupId>
- <artifactId>${pigArtifactId}</artifactId>
- <version>${pigVersion}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>${hadoopGroupId}</groupId>
- <artifactId>hadoop-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>${hadoopGroupId}</groupId>
<artifactId>hadoop-test</artifactId>
<version>${hadoopVersion}</version>
<scope>test</scope>
View
@@ -1,5 +1,6 @@
-- Oozie 2.3.0 release
+GH-0186 examples should use the JARs produced by sharelib
GH-0181 application path is resolved incorrectly to the URI of the workflow.xml
GH-0173 Add SecurityAuth.audit file to .gitignore
GH-0152 classpath of actions contains all JARs twice
@@ -114,11 +114,11 @@
<dependencySet>
<outputDirectory>/examples/apps/examples-lib</outputDirectory>
<unpack>false</unpack>
- <includes>
- <include>${pigGroupId}:${pigArtifactId}</include>
- <include>jline:jline</include>
- <include>${hadoopGroupId}:hadoop-streaming</include>
- </includes>
+ <excludes>
+ <exclude>${project.groupId}:oozie-examples</exclude>
+ <exclude>${project.groupId}:oozie-sharelib</exclude>
+ </excludes>
+ <useTransitiveDependencies/>
</dependencySet>
</dependencySets>
@@ -31,6 +31,10 @@
<dependencySet>
<outputDirectory>/share/lib</outputDirectory>
<unpack>false</unpack>
+ <excludes>
+ <exclude>${project.groupId}:oozie-sharelib</exclude>
+ </excludes>
+ <useTransitiveDependencies/>
</dependencySet>
</dependencySets>

0 comments on commit 482084f

Please sign in to comment.