Skip to content

Commit

Permalink
Merge branch 'master' into PR/halt-on-error
Browse files Browse the repository at this point in the history
# Conflicts:
#	crawler4j/src/main/java/edu/uci/ics/crawler4j/crawler/CrawlConfig.java
#	crawler4j/src/main/java/edu/uci/ics/crawler4j/crawler/CrawlController.java
#	crawler4j/src/main/java/edu/uci/ics/crawler4j/crawler/WebCrawler.java
  • Loading branch information
pgalbraith committed Dec 13, 2018
2 parents 6ce5f9b + 1a0df4d commit b1bad18
Show file tree
Hide file tree
Showing 23 changed files with 1,851 additions and 617 deletions.
8 changes: 8 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# https://EditorConfig.org

# top-most EditorConfig file
root = true

[*]
indent_style = space
indent_size = 4
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties

# Exclude maven wrapper
!/.mvn/wrapper/maven-wrapper.jar
# Local Maven config
.mvn

### Eclipse template

.metadata
Expand All @@ -80,6 +80,8 @@ local.properties
.settings/
.loadpath
.recommenders
.checkstyle
.groovy

# External tool builders
.externalToolBuilders/
Expand Down
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ language: java

jdk:
- oraclejdk8
- openjdk11

services:
- docker
Expand Down
1 change: 1 addition & 0 deletions crawler4j-examples/crawler4j-examples-base/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/frontier/
10 changes: 0 additions & 10 deletions crawler4j-examples/crawler4j-examples-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,12 @@
<url>https://github.com/yasserg/crawler4j</url>
<modelVersion>4.0.0</modelVersion>

<properties>
<guava.version>24.0-jre</guava.version>
</properties>

<dependencies>
<dependency>
<groupId>edu.uci.ics</groupId>
<artifactId>crawler4j</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<!-- Google's core Java libraries -->
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
</dependencies>

</project>
8 changes: 7 additions & 1 deletion crawler4j-examples/crawler4j-examples-postgres/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
A sample shows how to save crawled page into a JDBC repository.

Shamelessy grabbed with rzo1's permission, from [the original repo](https://github.com/rzo1/crawler4j-postgres-sample).
Shamelessy grabbed with rzo1's permission, from [the original repo](https://github.com/rzo1/crawler4j-postgres-sample).

If your surefire tests are failing on Windows due to docker.exe or docker-compose.exe not found, then create a local ``.mvn/maven.config`` file at the project root (i.e two levels higher than this project folder) with the following contents (_note that the odd use of quotes here looks wrong but actually works, at least for Maven 3.5.4_):

"-Ddocker.location=C:\Program Files\Docker Toolbox\docker.exe "-Ddocker.compose.location=C:\Program Files\Docker Toolbox\docker-compose.exe

Make sure the paths are correct for your system.
45 changes: 45 additions & 0 deletions crawler4j-examples/crawler4j-examples-postgres/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,49 @@
<version>0.33.0</version>
</dependency>
</dependencies>

<profiles>
<profile>
<id>custom-docker-location</id>
<activation>
<property>
<name>docker.location</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<environmentVariables>
<DOCKER_LOCATION>${docker.location}</DOCKER_LOCATION>
</environmentVariables>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>custom-docker-compose-location</id>
<activation>
<property>
<name>docker.compose.location</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<environmentVariables>
<DOCKER_COMPOSE_LOCATION>${docker.compose.location}</DOCKER_COMPOSE_LOCATION>
</environmentVariables>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
25 changes: 17 additions & 8 deletions crawler4j/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
<slf4j.version>1.7.22</slf4j.version>
<logback.version>1.1.7</logback.version>
<apache.http.components.version>4.5.5</apache.http.components.version>
<je.version>5.0.84</je.version>
<je.version>18.3.12</je.version>
<apache.tika.version>1.17</apache.tika.version>
<guava.version>26.0-jre</guava.version>
<public.suffix.list.version>2.2.0</public.suffix.list.version>
<!--test dependency versions -->
<junit.version>4.12</junit.version>
<wiremock.version>2.14.0</wiremock.version>
<spock.version>1.0-groovy-2.4</spock.version>
<groovy.version>2.4.12</groovy.version>
<groovy.version>2.5.4</groovy.version>
</properties>

<profiles>
Expand Down Expand Up @@ -112,8 +114,8 @@
<goal>addTestSources</goal>
<goal>generateStubs</goal>
<goal>compile</goal>
<goal>testGenerateStubs</goal>
<goal>testCompile</goal>
<goal>generateTestStubs</goal>
<goal>compileTests</goal>
<goal>removeStubs</goal>
<goal>removeTestStubs</goal>
</goals>
Expand Down Expand Up @@ -187,10 +189,6 @@
<artifactId>tika-parsers</artifactId>
<version>${apache.tika.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
Expand Down Expand Up @@ -369,6 +367,16 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>de.malkusch.whois-server-list</groupId>
<artifactId>public-suffix-list</artifactId>
<version>${public.suffix.list.version}</version>
</dependency>

<!-- Test Dependencies -->
<dependency>
Expand All @@ -387,6 +395,7 @@
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
<type>pom</type>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Loading

0 comments on commit b1bad18

Please sign in to comment.