Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@essiembre
essiembre committed Apr 26, 2017
2 parents 1188f02 + 8d26505 commit de5a4dd
Show file tree
Hide file tree
Showing 59 changed files with 5,507 additions and 307 deletions.
7 changes: 3 additions & 4 deletions norconex-collector-filesystem/TODO.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
The following are either things to be done, or ideas to consider:

- Wire in SMB/JCIFS dependencies.
- Consider a maxDepth (folder depth).

- Add Commons VFS third party dependencies for ALL supported file systems.

- Add Commons VFS config options for ALL supported file systems.
- Remove org.apache.commosn.vfs.provider.[smb|mime] package and replace with
appropriate Jar dependency when available in a Maven repo.
200 changes: 166 additions & 34 deletions norconex-collector-filesystem/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright 2013-2016 Norconex Inc.
Copyright 2013-2017 Norconex Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -19,13 +19,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.norconex.collectors</groupId>
<artifactId>norconex-collector-filesystem</artifactId>
<version>2.6.1</version>
<version>2.7.0</version>
<name>Norconex Filesystem Collector</name>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<site.baseurl/>
<norconex-commons-lang.version>1.13.0</norconex-commons-lang.version>
</properties>
<inceptionYear>2014</inceptionYear>

Expand Down Expand Up @@ -60,18 +61,36 @@
<dependency>
<groupId>com.norconex.collectors</groupId>
<artifactId>norconex-collector-core</artifactId>
<version>1.7.0</version>
<version>1.8.0</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.9.4</version>
</dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.9.4</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
<version>2.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
<version>2.1</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<!-- Unfortunately Maven does not distribute its VFS-Sandbox lib.
Code has been bundled with this project instead. When made available
in a Maven repo, consider adding this back.
https://github.com/apache/commons-vfs/tree/VFS-2.1
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2</artifactId>
<version>2.1</version>
</dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-vfs2-sandbox</artifactId>
<version>2.1</version>
</dependency>
-->

<!-- Following deps are required for FTP protocol (and probably others), see:
http://stackoverflow.com/questions/30600843/unable-to-resolve-a-dependency-on-urlutil-conflicting-requirements
Expand All @@ -83,20 +102,61 @@
<version>3.1</version>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.5</version>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.5</version>
</dependency>


<!-- This jcifs dep is not distributed due to licensing issue (LGPL 2.1).
It is included here as "optional" so it does not get distributed.
License:
https://jcifs.samba.org/src/LICENSE.txt
Downloadable Jar:
http://central.maven.org/maven2/jcifs/jcifs/1.3.17/jcifs-1.3.17.jar
-->
<dependency>
<groupId>jcifs</groupId>
<artifactId>jcifs</artifactId>
<version>1.3.17</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>

<!-- HDFS deps are optional. There are too many to distribute.
Included here for compilation only.
Use "$HADOOP_HOME/bin/hadoop classpath" to get them.
More info:
https://commons.apache.org/proper/commons-vfs/download.html
-->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>2.6.0</version>
<scope>provided</scope>
<optional>true</optional>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.norconex.commons</groupId>
<artifactId>norconex-commons-lang</artifactId>
<version>${norconex-commons-lang.version}</version>
<classifier>resources</classifier>
<type>zip</type>
<scope>provided</scope>
</dependency>
</dependencies>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.norconex.commons</groupId>
<artifactId>norconex-commons-lang</artifactId>
<version>1.12.3</version>
<version>${norconex-commons-lang.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
Expand All @@ -106,13 +166,53 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.9.2</version>
<version>1.10.2</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>1.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.12</version>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.10</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.12</version>
</dependency>
<dependency>
<groupId>org.tukaani</groupId>
<artifactId>xz</artifactId>
<version>1.5</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand All @@ -122,7 +222,12 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.2</version>
</dependency>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>17.0</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
Expand All @@ -139,6 +244,15 @@
<artifactId>jj2000</artifactId>
<version>5.3</version>
</dependency>
<!-- Ensures correct version, as ooxml-schemas
(required for Visio-XML parsing) brings it down.
-->
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>2.6.0</version>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -247,6 +361,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/dist.xml</descriptor>
Expand Down Expand Up @@ -280,10 +395,12 @@
<link>https://www.norconex.com/collectors/committer-core/latest/apidocs/</link>
<link>https://www.norconex.com/collectors/collector-core/latest/apidocs/</link>
<link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.4/</link>
<link>https://commons.apache.org/proper/commons-collections/apidocs/</link>
<link>https://commons.apache.org/proper/commons-vfs/apidocs/</link>
<link>https://commons.apache.org/proper/commons-configuration/javadocs/v1.10/apidocs/</link>
<link>http://www.joda.org/joda-time/apidocs/</link>
</links>
</links>
<excludePackageNames>org.apache.commons.*</excludePackageNames>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -317,14 +434,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<version>3.0.2</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
</archive>
<excludes>
<exclude>THIRD-PARTY.txt</exclude>
</excludes>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -381,7 +501,28 @@
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>false</autoReleaseAfterClose>
</configuration>
</plugin>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>unpack-shared-resources</id>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<phase>prepare-package</phase>
<configuration>
<classifier>resources</classifier>
<outputDirectory>${project.build.directory}/shared-resources</outputDirectory>
<includeArtifacIds>norconex-commons-lang</includeArtifacIds>
<includeGroupIds>com.norconex.commons</includeGroupIds>
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down Expand Up @@ -458,10 +599,12 @@
<link>https://www.norconex.com/collectors/committer-core/latest/apidocs/</link>
<link>https://www.norconex.com/collectors/collector-core/latest/apidocs/</link>
<link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.4/</link>
<link>https://commons.apache.org/proper/commons-collections/apidocs/</link>
<link>https://commons.apache.org/proper/commons-vfs/apidocs/</link>
<link>https://commons.apache.org/proper/commons-configuration/javadocs/v1.10/apidocs/</link>
<link>http://www.joda.org/joda-time/apidocs/</link>
</links>
</links>
<excludePackageNames>org.apache.commons.*</excludePackageNames>
</configuration>
<reportSets>
<reportSet>
Expand Down Expand Up @@ -506,17 +649,6 @@
</roles>
<timezone>-4</timezone>
</developer>
<developer>
<id>pascaldimassimo</id>
<name>Pascal Dimassimo</name>
<email>[email protected]</email>
<organization>Norconex Inc.</organization>
<organizationUrl>https://www.norconex.com</organizationUrl>
<roles>
<role>developer</role>
</roles>
<timezone>-4</timezone>
</developer>
</developers>
<contributors>
</contributors>
Expand Down
Loading

0 comments on commit de5a4dd

Please sign in to comment.