Skip to content

Commit

Permalink
Reviewed dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
@EdDuarte
EdDuarte committed Jul 1, 2016
1 parent f3bbdd7 commit 601ef27
Show file tree
Hide file tree
Showing 13 changed files with 273 additions and 259 deletions.
52 changes: 0 additions & 52 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,57 +168,5 @@
<version>4.11</version>
</dependency>


<!-- mutable string -->
<dependency>
<groupId>it.unimi.dsi</groupId>
<artifactId>dsiutils</artifactId>
<version>2.2.2</version>
</dependency>


<!-- json utils -->
<dependency>
<groupId>net.arnx</groupId>
<artifactId>jsonic</artifactId>
<version>1.3.6</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.8.1</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.2</version>
</dependency>


<!-- collections -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>


<!-- data model bindings-->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>

</dependencies>
</project>
123 changes: 34 additions & 89 deletions vokter-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,20 +178,41 @@

<dependencies>

<!-- logger -->
<!-- mutable string -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.7.7</version>
<groupId>it.unimi.dsi</groupId>
<artifactId>dsiutils</artifactId>
<version>2.2.2</version>
</dependency>


<!-- json utils -->
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>1.8.1</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.2</version>
</dependency>


<!-- MediaType class -->
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.1.3.GA</version>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<version>${jersey.version}</version>
</dependency>


<!-- string parsing -->
<!-- sentence splitting parsing -->
<dependency>
<groupId>com.aliasi</groupId>
<artifactId>lingpipe</artifactId>
Expand Down Expand Up @@ -226,6 +247,11 @@


<!-- other utils -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>18.0</version>
</dependency>
<dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
Expand Down Expand Up @@ -260,86 +286,5 @@
<version>0.5</version>
</dependency>


<!-- jersey -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.jvnet.mimepull</groupId>
<artifactId>mimepull</artifactId>
<version>1.9.6</version>
</dependency>


<!-- jetty embedded server-->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jsp</artifactId>
<version>7.6.7.v20120910</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jsp-2.1</artifactId>
<version>7.5.4.v20111024</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>7.6.7.v20120910</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>7.6.7.v20120910</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlets</artifactId>
<version>7.6.7.v20120910</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jsp-2.1-glassfish</artifactId>
<version>2.1.v20100127</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>7.6.7.v20120910</version>
</dependency>


<!-- swagger -->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jersey2-jaxrs</artifactId>
<scope>compile</scope>
<version>${swagger-version}</version>
</dependency>

</dependencies>
</project>
2 changes: 1 addition & 1 deletion vokter-core/src/main/java/com/edduarte/vokter/diff/DiffMatcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.edduarte.vokter.stemmer.Stemmer;
import com.edduarte.vokter.stopper.FileStopper;
import com.edduarte.vokter.stopper.Stopper;
import com.edduarte.vokter.util.ConcurrentHashSet;
import com.edduarte.vokter.util.OSGiManager;
import com.google.common.base.Optional;
import com.google.common.base.Stopwatch;
Expand All @@ -33,7 +34,6 @@
import com.optimaize.langdetect.text.TextObject;
import com.optimaize.langdetect.text.TextObjectFactory;
import it.unimi.dsi.lang.MutableString;
import org.eclipse.jetty.util.ConcurrentHashSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
5 changes: 3 additions & 2 deletions vokter-core/src/main/java/com/edduarte/vokter/document/DocumentBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.edduarte.vokter.util.OSGiManager;
import com.google.common.base.Stopwatch;
import com.optimaize.langdetect.LanguageDetector;
import org.apache.tools.ant.filters.StringInputStream;
import org.apache.commons.io.input.ReaderInputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -31,6 +31,7 @@
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.io.InputStream;
import java.io.StringReader;
import java.util.function.Supplier;

/**
Expand Down Expand Up @@ -126,7 +127,7 @@ public static DocumentBuilder fromString(final String url,
MediaType mediaType = MediaType.valueOf(contentType);
return new DocumentInput(
url,
new StringInputStream(text),
new ReaderInputStream(new StringReader(text)),
mediaType.getType() + "/" + mediaType.getSubtype()
);
});
Expand Down
5 changes: 2 additions & 3 deletions vokter-core/src/main/java/com/edduarte/vokter/job/JobManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ void timeoutDetectionJob(String documentUrl, String documentContentType) {
handler.removeExistingDifferences(documentUrl, documentContentType);
logger.info("Timed out detection job for document '{}' ({}).",
documentUrl, documentContentType);
} catch (SchedulerException | JsonProcessingException ex) {
} catch (SchedulerException ex) {
logger.error(ex.getMessage(), ex);
}
}
Expand Down Expand Up @@ -585,8 +585,7 @@ final Keyword callBuildKeyword(String keywordInput,
final boolean sendTimeoutToClient(final String documentUrl,
final String documentContentType,
final String clientUrl,
final String clientContentType)
throws JsonProcessingException {
final String clientContentType) {
return handler.sendTimeoutToClient(
documentUrl, documentContentType,
clientUrl, clientContentType
Expand Down
9 changes: 0 additions & 9 deletions vokter-core/src/main/java/com/edduarte/vokter/keyword/KeywordBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@ public final class KeywordBuilder {
private boolean ignoreCase;


private int slop;


private KeywordBuilder(final String keywordInput) {
this.keywordInput = keywordInput;
this.isStoppingEnabled = false;
Expand All @@ -81,12 +78,6 @@ public KeywordBuilder withLanguageDetector(final LanguageDetector langDetector)
}


public KeywordBuilder withSlop(final int slop) {
this.slop = slop;
return this;
}


public KeywordBuilder withStopwords() {
this.isStoppingEnabled = true;
return this;
Expand Down
48 changes: 0 additions & 48 deletions vokter-core/src/main/java/com/edduarte/vokter/keyword/KeywordSerializer.java
View file

This file was deleted.

Loading

0 comments on commit 601ef27

Please sign in to comment.