Author: ecki
Date: Sun Jan 11 05:33:16 2015
New Revision: 1650874
URL: http://svn.apache.org/r1650874
Log:
[VFS-530][hdfs] Update hadoop-commons etc to 2.6.0
Modified:
commons/proper/vfs/trunk/core/pom.xml
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTest.java
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java
commons/proper/vfs/trunk/pom.xml
Modified: commons/proper/vfs/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/pom.xml?rev=1650874&r1=1650873&r2=1650874&view=diff
==============================================================================
--- commons/proper/vfs/trunk/core/pom.xml (original)
+++ commons/proper/vfs/trunk/core/pom.xml Sun Jan 11 05:33:16 2015
@@ -29,6 +29,7 @@
<artifactId>commons-vfs2</artifactId>
<version>2.1-SNAPSHOT</version>
<description>Apache Commons VFS is a Virtual File System
library.</description>
+ <url>http://commons.apache.org/proper/commons-vfs/</url>
<parent>
<groupId>org.apache.commons</groupId>
@@ -77,6 +78,7 @@
<artifactId>jsch</artifactId>
<optional>true</optional>
</dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -132,21 +134,34 @@
<scope>test</scope>
</dependency>
<!-- Test HDFS with Apache Hadoop -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Test HDFS with Apache Hadoop -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<properties>
@@ -158,9 +173,11 @@
<resource>
<directory>src/main/java</directory>
<excludes>
+ <exclude>**/*.html</exclude>
<exclude>**/*.java</exclude>
</excludes>
</resource>
+ <!-- include NOTICE/LICENSE in generated jar -->
<resource>
<directory>${vfs.parent.dir}</directory>
<targetPath>META-INF</targetPath>
@@ -171,11 +188,12 @@
</resource>
</resources>
- <!-- include NOTICE/LICENSE in generated test jar -->
+
<testResources>
<testResource>
<directory>src/test/resources</directory>
</testResource>
+ <!-- include NOTICE/LICENSE in generated test jar -->
<testResource>
<directory>${vfs.parent.dir}</directory>
<targetPath>META-INF</targetPath>
@@ -185,6 +203,7 @@
</includes>
</testResource>
</testResources>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -197,6 +216,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -210,7 +230,6 @@
failonerror="false">
<fileset dir="${project.build.testOutputDirectory}/code" />
</move>
-
</target>
</configuration>
<goals>
@@ -238,29 +257,15 @@
</excludes>
</configuration>
</plugin>
-
</plugins>
</build>
+
<profiles>
<profile>
<id>webdav</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.5</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.5</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
<build>
<plugins>
<plugin>
@@ -268,8 +273,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <test.basedir>target/test-classes/test-data</test.basedir>
- <test.basedir.res>test-data</test.basedir.res>
<test.webdav.uri>${test.webdav.uri}</test.webdav.uri>
</systemPropertyVariables>
</configuration>
@@ -277,6 +280,7 @@
</plugins>
</build>
</profile>
+
<profile>
<id>ftp</id>
<activation>
@@ -289,8 +293,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <test.basedir>target/test-classes/test-data</test.basedir>
- <test.basedir.res>test-data</test.basedir.res>
<test.ftp.uri>${test.ftp.uri}</test.ftp.uri>
</systemPropertyVariables>
</configuration>
@@ -298,6 +300,7 @@
</plugins>
</build>
</profile>
+
<profile>
<id>sftp</id>
<activation>
@@ -310,8 +313,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <test.basedir>target/test-classes/test-data</test.basedir>
- <test.basedir.res>test-data</test.basedir.res>
<test.sftp.uri>${test.sftp.uri}</test.sftp.uri>
</systemPropertyVariables>
</configuration>
@@ -319,6 +320,7 @@
</plugins>
</build>
</profile>
+
<profile>
<id>http</id>
<activation>
@@ -331,8 +333,6 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <test.basedir>target/test-classes/test-data</test.basedir>
- <test.basedir.res>test-data</test.basedir.res>
<test.http.uri>${test.http.uri}</test.http.uri>
</systemPropertyVariables>
</configuration>
@@ -340,9 +340,10 @@
</plugins>
</build>
</profile>
+
<!-- On Windows we disable hdfs tests by default. -->
<profile>
- <id>no-hdfs</id>
+ <id>no-test-hdfs</id>
<activation>
<activeByDefault>false</activeByDefault>
<os>
@@ -365,4 +366,5 @@
</build>
</profile>
</profiles>
+
</project>
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTest.java?rev=1650874&r1=1650873&r2=1650874&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTest.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTest.java
Sun Jan 11 05:33:16 2015
@@ -92,7 +92,7 @@ public class HdfsFileProviderTest
conf = new Configuration();
conf.set(FileSystem.FS_DEFAULT_NAME_KEY, HDFS_URI);
conf.set("hadoop.security.token.service.use_ip", "true");
- conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 1024 * 100); // 100K
blocksize
+ conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 1024 * 1024); // 1M
blocksize
setUmask(conf);
Modified:
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java?rev=1650874&r1=1650873&r2=1650874&view=diff
==============================================================================
---
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java
(original)
+++
commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs2/provider/hdfs/test/HdfsFileProviderTestCase.java
Sun Jan 11 05:33:16 2015
@@ -102,7 +102,7 @@ public class HdfsFileProviderTestCase ex
conf = new Configuration();
conf.set(FileSystem.FS_DEFAULT_NAME_KEY, HDFS_URI);
conf.set("hadoop.security.token.service.use_ip", "true");
- conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 1024 * 100); //
100K blocksize
+ conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 1024 * 1024); // 1M
blocksize
HdfsFileProviderTest.setUmask(conf);
Modified: commons/proper/vfs/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/vfs/trunk/pom.xml?rev=1650874&r1=1650873&r2=1650874&view=diff
==============================================================================
--- commons/proper/vfs/trunk/pom.xml (original)
+++ commons/proper/vfs/trunk/pom.xml Sun Jan 11 05:33:16 2015
@@ -383,11 +383,6 @@
<version>1.6.5</version>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>0.1.51</version>
@@ -489,21 +484,58 @@
<!-- HDFS dependencies -->
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>1.1.2</version>
+ <artifactId>hadoop-common</artifactId>
+ <version>2.6.0</version>
<scope>provided</scope>
- <exclusions>
- <exclusion> <!-- drags in dead repo, so avoid it -->
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- </exclusion>
- </exclusions>
+ <!-- exclude uneeded dependency to avoid dragging in broken
glassfish repo -->
+ <exclusions>
+ <exclusion>
+ <artifactId>jersey-server</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-test</artifactId>
- <version>1.1.2</version>
- <scope>test</scope>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>2.6.0</version>
+ <scope>provided</scope>
+ <!-- exclude uneeded dependency to avoid dragging in broken
glassfish repo -->
+ <exclusions>
+ <exclusion>
+ <artifactId>jersey-server</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- HDFS test dependencies -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>2.6.0</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <!-- exclude uneeded dependency to avoid dragging in broken
glassfish repo -->
+ <exclusions>
+ <exclusion>
+ <artifactId>jersey-server</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <version>2.6.0</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <!-- exclude uneeded dependency to avoid dragging in broken
glassfish repo -->
+ <exclusions>
+ <exclusion>
+ <artifactId>jersey-server</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
@@ -551,4 +583,5 @@
</profile>
</profiles>
+
</project>
