Merge branch 'release/1.3.0'

Author: idio-devops

.gitignore

@@ -4,3 +4,5 @@ target/
 .settings/
 .DS_STORE
 javadoc
+.idea/
+json-wikipedia.iml

.travis.yml

@@ -1,11 +1,13 @@
 language: java
 jdk:
-- oraclejdk7
+- openjdk8
 
 cache:
   directories:
   - $HOME/.m2
 
+script: make test
+
 notifications:
   email: false
   hipchat:

Makefile

@@ -0,0 +1,14 @@
+default:
+
+test:
+	mvn -U test
+
+build:
+	mvn clean test assembly:assembly
+
+clean:
+	mvn clean
+
+# phonies
+
+.PHONY: default test build clean

VERSION

@@ -1 +1 @@
-1.2.3
+1.3.0

pom.xml

@@ -15,8 +15,8 @@
     <properties>
         <project.source.charset>UTF-8</project.source.charset>
         <project.source.encoding>UTF-8</project.source.encoding>
-        <java.version.source>1.6</java.version.source>
-        <java.version.target>1.6</java.version.target>
+        <java.version.source>1.8</java.version.source>
+        <java.version.target>1.8</java.version.target>
         <project.customVersion>${project.version}</project.customVersion>
     </properties>
     <developers>
@@ -33,19 +33,14 @@
             <scope> test </scope>
         </dependency>
         <dependency>
-            <groupId>com.github.idio</groupId>
-            <artifactId>bliki</artifactId>
-            <version>3.1.1</version>
+            <groupId>info.bliki.wiki</groupId>
+            <artifactId>bliki-core</artifactId>
+            <version>3.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>com.github.idio</groupId>
+            <groupId>com.github.diegoceccarelli</groupId>
             <artifactId>hpc-utils</artifactId>
-            <version>0.0.7</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-core</artifactId>
-            <version>4.3.0</version>
+            <version>-b47808d4d9-1</version>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
@@ -77,16 +72,40 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.1</version>
         </dependency>
-
+        <dependency>
+            <groupId>de.tudarmstadt.ukp.wikipedia</groupId>
+            <artifactId>de.tudarmstadt.ukp.wikipedia.api</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>de.tudarmstadt.ukp.wikipedia</groupId>
+            <artifactId>de.tudarmstadt.ukp.wikipedia.parser</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>de.tudarmstadt.ukp.wikipedia</groupId>
+            <artifactId>de.tudarmstadt.ukp.wikipedia.datamachine</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>de.tudarmstadt.ukp.wikipedia</groupId>
+            <artifactId>de.tudarmstadt.ukp.wikipedia.revisionmachine</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>de.tudarmstadt.ukp.wikipedia</groupId>
+            <artifactId>de.tudarmstadt.ukp.wikipedia.timemachine</artifactId>
+            <version>1.1.0</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
-            <artifactId>spark-core_2.10</artifactId>
-            <version>1.3.1</version>
+            <artifactId>spark-core_2.11</artifactId>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>
             <artifactId>scala-library</artifactId>
-            <version>2.10.4</version>
+            <version>2.11.8</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -171,11 +190,28 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>dropbox</id>
+            <url>https://dl.dropboxusercontent.com/u/4663256/mvn-repository/</url>
+        </repository>
+        <repository>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </repository>
+        <repository>
+            <id>de.tudarmstadt.ukp.wikipedia</id>
+            <url>http://zoidberg.ukp.informatik.tu-darmstadt.de/artifactory/public-snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+            </snapshots>
+        </repository>
     </repositories>
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
                 <configuration>
                     <charset>${project.source.charset}</charset>
                     <encoding>${project.source.encoding}</encoding>
@@ -205,6 +241,7 @@
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
                 <artifactId>scala-maven-plugin</artifactId>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>scala-compile-first</id>