You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ro...@apache.org on 2013/06/14 21:53:49 UTC
svn commit: r1493227 - in /oozie/trunk: release-log.txt tools/pom.xml
webapp/pom.xml
Author: rohini
Date: Fri Jun 14 19:53:49 2013
New Revision: 1493227
URL: http://svn.apache.org/r1493227
Log:
OOZIE-1412 Webapp contains all sharedlib dependencies after launcher refactor (rohini)
Modified:
oozie/trunk/release-log.txt
oozie/trunk/tools/pom.xml
oozie/trunk/webapp/pom.xml
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1493227&r1=1493226&r2=1493227&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Jun 14 19:53:49 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1412 Webapp contains all sharedlib dependencies after launcher refactor (rohini)
OOZIE-1414 Configuring Oozie for HTTPS still allows HTTP connections to all resources (rkanter)
OOZIE-1410 V2 servlets are missing from ssl-web.xml (rkanter, rohini via rkanter)
OOZIE-1349 oozieCLI -Doozie.auth.token.cache doesn't work (bowenzhangusa via tucu)
Modified: oozie/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/tools/pom.xml?rev=1493227&r1=1493226&r2=1493227&view=diff
==============================================================================
--- oozie/trunk/tools/pom.xml (original)
+++ oozie/trunk/tools/pom.xml Fri Jun 14 19:53:49 2013
@@ -61,6 +61,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
Modified: oozie/trunk/webapp/pom.xml
URL: http://svn.apache.org/viewvc/oozie/trunk/webapp/pom.xml?rev=1493227&r1=1493226&r2=1493227&view=diff
==============================================================================
--- oozie/trunk/webapp/pom.xml (original)
+++ oozie/trunk/webapp/pom.xml Fri Jun 14 19:53:49 2013
@@ -93,43 +93,43 @@
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-sharelib-pig</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-sharelib-hive</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-sharelib-sqoop</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-sharelib-streaming</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-sharelib-oozie</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-sharelib-hcatalog</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-sharelib-distcp</artifactId>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
@@ -162,6 +162,28 @@
</descriptors>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>
+ oozie-sharelib-pig,oozie-sharelib-hive,oozie-sharelib-sqoop,oozie-sharelib-streaming,
+ oozie-sharelib-oozie,oozie-sharelib-hcatalog,oozie-sharelib-distcp
+ </includeArtifactIds>
+ <excludeTransitive>true</excludeTransitive>
+ <outputDirectory>${project.build.directory}/oozie-webapp-${project.version}/WEB-INF/lib</outputDirectory>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>