Skip to content

Commit

Permalink
updated dependencies for security (stanford-futuredata#275)
Browse files Browse the repository at this point in the history
  • Loading branch information
edgan8 authored Jul 2, 2019
1 parent 6ea84f4 commit 3fe51f4
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
6 changes: 3 additions & 3 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.8.0-beta0</version>
<version>1.8.0-beta4</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
Expand All @@ -33,7 +33,7 @@
<dependency>
<groupId>com.sparkjava</groupId>
<artifactId>spark-core</artifactId>
<version>[2.7.2,)</version>
<version>2.9.1</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
Expand All @@ -43,7 +43,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.8</version>
<version>2.9.9</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
Expand Down
3 changes: 2 additions & 1 deletion legacy/src/test/java/macrobase/conf/MacroBaseConfTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.google.common.collect.Lists;
import io.dropwizard.configuration.ConfigurationFactory;
import io.dropwizard.configuration.YamlConfigurationFactory;
import io.dropwizard.jackson.Jackson;
import macrobase.ingest.CSVIngester;
import macrobase.ingest.DiskCachingIngester;
Expand Down Expand Up @@ -95,7 +96,7 @@ public void missingStringListTest() throws ConfigurationException {

@Test
public void testParsing() throws Exception {
ConfigurationFactory<MacroBaseConf> cfFactory = new ConfigurationFactory<>(MacroBaseConf.class,
ConfigurationFactory<MacroBaseConf> cfFactory = new YamlConfigurationFactory<>(MacroBaseConf.class,
null,
Jackson.newObjectMapper(),
"");
Expand Down
10 changes: 5 additions & 5 deletions lib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,18 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.8.0-beta0</version>
<version>1.8.0-beta4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.8.0-beta0</version>
<version>1.8.0-beta4</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
<version>28.0-jre</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -71,13 +71,13 @@
<dependency>
<groupId>com.univocity</groupId>
<artifactId>univocity-parsers</artifactId>
<version>2.5.9</version>
<version>2.8.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.8</version>
<version>2.9.9</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<dropwizard.version>0.9.1</dropwizard.version>
<dropwizard.version>1.3.12</dropwizard.version>
<protostuff.version>1.0.9</protostuff.version>
</properties>

Expand Down
4 changes: 2 additions & 2 deletions sql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>21.0</version>
<version>28.0-jre</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -70,7 +70,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.8.0-beta0</version>
<version>1.8.0-beta4</version>
</dependency>

<dependency>
Expand Down

0 comments on commit 3fe51f4

Please sign in to comment.