Merge branch 'master' into min-delay-after-download

.travis.yml

@@ -1,7 +1,7 @@
 language: java
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 env:
   - TERM=dumb

CHANGELOG.md

@@ -23,14 +23,15 @@
 - Upgrade gradle-node-plugin to version 1.3.1
 - Upgrade npm version to 6.10.2
 - Upgrade ache-dashboard npm dependencies
+- Upgrade gradle wrapper to version 5.6.1
+- Update Dockerfile to use openjdk:11-jdk (Java 11)
 - Minimum delay between request now considers the time when the dowload is
   actually finihsed, not the time when the URL was initially scheduled to be
   downloaded (which disregards other processing times between scheduling and actual download)
 - Refactoring of FethcedResultHandler to simply notify the LinkStorage that
   the download finished and to delegate data processing to other handlers
   for the appropriate link type
 
-
 ## Version 0.11.0
 
 - Removed dependency on Weka and reimplemented all machine-learning code using SMILE.

Dockerfile

@@ -3,14 +3,14 @@
 #
 # https://github.com/ViDA-NYU/ache
 #
-FROM openjdk:8-jdk
+FROM openjdk:11-jdk
 
 ADD . /ache-src
 WORKDIR /ache-src
 RUN /ache-src/gradlew installDist && mv /ache-src/build/install/ache /ache && rm -rf /ache-src/ /root/.gradle
 
 # Makes JVM aware of memory limit available to the container (cgroups)
-ENV JAVA_OPTS='-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap'
+ENV JAVA_OPTS='-XX:+UseContainerSupport -XX:MaxRAMPercentage=80'
 
 ENTRYPOINT ["/ache/bin/ache"]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Jan 08 17:48:37 EST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip

gradlew

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

src/main/java/focusedCrawler/link/backlink/MozAuthenticator.java

@@ -3,11 +3,11 @@
 import java.net.URLEncoder;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
+import java.util.Base64;
 import java.util.Date;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
-import javax.xml.bind.DatatypeConverter;
 
 public class MozAuthenticator {
 
@@ -29,10 +29,6 @@ public class MozAuthenticator {
      */
     private long expiresInterval = 300;
 
-    public MozAuthenticator() {
-
-    }
-
     /**
      * Constructor to set all the variables
      * 
@@ -83,7 +79,7 @@ public String getAuthenticationStr() {
 
         // base64-encode the hmac
         @SuppressWarnings("deprecation")
-        String urlSafeSignature = URLEncoder.encode(EncodeBase64(rawHmac));
+        String urlSafeSignature = URLEncoder.encode(encodeBase64(rawHmac));
 
         String authenticationStr = "AccessID=" + accessID + "&Expires=" + expires + "&Signature="
                 + urlSafeSignature;
@@ -97,8 +93,8 @@ public String getAuthenticationStr() {
      * @param rawData
      * @return
      */
-    public String EncodeBase64(byte[] rawData) {
-        return DatatypeConverter.printBase64Binary(rawData);
+    private String encodeBase64(byte[] rawData) {
+        return Base64.getEncoder().encodeToString(rawData);
     }
 
     /**