From dbaee8f81eae3a2381b394d58cf955a57a4a1f58 Mon Sep 17 00:00:00 2001 From: Jeff Tsay Date: Tue, 8 Sep 2015 02:51:39 -0700 Subject: [PATCH] Upgrade to 2015 versions of dependencies Upgrade of Scala needed so that it compiles with Java 8. --- pom.xml | 22 +++++++++---------- .../com/gravity/goose/Configuration.scala | 2 +- .../scala/com/gravity/goose/GooseTest.scala | 2 -- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 9fef84cba..50a01a16e 100644 --- a/pom.xml +++ b/pom.xml @@ -16,50 +16,50 @@ junit junit - 4.8.1 + 4.12 test org.slf4j slf4j-api - 1.6.1 + 1.7.12 jar compile org.slf4j slf4j-log4j12 - 1.6.1 + 1.7.12 test org.jsoup jsoup - 1.5.2 + 1.8.3 commons-io commons-io - 2.0.1 + 2.4 org.scala-lang scala-compiler - 2.9.0-1 + 2.11.7 compile org.scala-lang scala-library - 2.9.0-1 + 2.11.7 org.apache.httpcomponents httpclient - 4.1.2 + 4.5 commons-lang @@ -76,7 +76,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.6 + 2.18.1 false true @@ -91,7 +91,7 @@ org.scala-tools maven-scala-plugin - 2.14.3 + 2.15.2 UTF-8 @@ -125,7 +125,7 @@ org.apache.maven.plugins maven-source-plugin - 2.1.2 + 2.4 attach-sources diff --git a/src/main/scala/com/gravity/goose/Configuration.scala b/src/main/scala/com/gravity/goose/Configuration.scala index 20ce4653a..fdf3499d0 100644 --- a/src/main/scala/com/gravity/goose/Configuration.scala +++ b/src/main/scala/com/gravity/goose/Configuration.scala @@ -21,7 +21,7 @@ package com.gravity.goose import network.{HtmlFetcher, AbstractHtmlFetcher} import org.jsoup.nodes.Element import java.util.Date -import reflect.BeanProperty +import scala.beans.BeanProperty import com.gravity.goose.extractors.{StandardContentExtractor, ContentExtractor, AdditionalDataExtractor, PublishDateExtractor} diff --git a/src/test/scala/com/gravity/goose/GooseTest.scala b/src/test/scala/com/gravity/goose/GooseTest.scala index 7235a34ef..42f0a3807 100644 --- a/src/test/scala/com/gravity/goose/GooseTest.scala +++ b/src/test/scala/com/gravity/goose/GooseTest.scala @@ -2,8 +2,6 @@ package com.gravity.goose import org.junit.Test import org.junit.Assert._ -import scala.actors.Future -import scala.actors.Futures._ /** * Created by Jim Plush