Skip to content
Permalink
Browse files

Merge branch 'hotfix/0.1.12-2' into develop

  • Loading branch information...
hadrienk committed Apr 30, 2019
2 parents a31df35 + 783d513 commit 58de41606e1097e94e822ec7dbb3f16f3a3f4de4
@@ -15,8 +15,16 @@ kept and given NULL value if not present in source dataset
use common identifiers, and not just any identifier.
* Change inner and outer joins as described in the VTL 1.1 specification (1810-1818).

## 0.1.12-2 - 2019-03-21

### Changed

* Update project dependencies

## 0.1.12-1 - 2019-03-05

### Changed

* Update URLs to internal SSB distribution repos

## 0.1.12 - 2018-11-21
@@ -44,18 +44,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
@@ -292,7 +292,7 @@ public void iterator() {
return Stream.of(1, 2, 3);
}
};
assertThat(forwardedStream.iterator()).containsExactly(
assertThat(forwardedStream.iterator()).toIterable().containsExactly(
1, 2, 3
);
}
64 pom.xml
@@ -198,27 +198,6 @@
<build>

<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.9</version>
<executions>
<execution>
<id>pre-unit-test</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>post-unit-test</id>
<phase>test</phase>
<goals>
<goal>report</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>license-maven-plugin</artifactId>
@@ -307,7 +286,7 @@
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<version>4.7</version>
<version>4.7.1</version>
</plugin>

<plugin>
@@ -453,13 +432,13 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>4.7</version>
<version>4.7.2</version>
</dependency>

<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4</artifactId>
<version>4.7</version>
<version>4.7.2</version>
<scope>test</scope>
</dependency>

@@ -484,7 +463,8 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.8.2</version>
<version>2.9.8</version>
<scope>test</scope>
</dependency>

<!-- Test framework -->
@@ -495,41 +475,25 @@
<scope>test</scope>
</dependency>

<!-- Assertion framework -->

<!-- TODO: remove these ones, they are not safe. -->
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.brotli</groupId>
<artifactId>dec</artifactId>
<version>0.1.1</version>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
<version>2.7.2</version>
<scope>test</scope>
</dependency>

<!-- Assertion framework -->
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.6.1</version>
<version>3.12.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-guava</artifactId>
<!-- Use 2.x version if you rely on Java 7 / AssertJ Core 2.x -->
<version>3.1.0</version>
<version>3.2.1</version>
<scope>test</scope>
</dependency>

@@ -542,9 +506,9 @@
</dependency>

<dependency>
<groupId>com.carrotsearch.randomizedtesting</groupId>
<artifactId>randomizedtesting-runner</artifactId>
<version>2.5.0</version>
<groupId>org.brotli</groupId>
<artifactId>dec</artifactId>
<version>0.1.2</version>
<scope>test</scope>
</dependency>

0 comments on commit 58de416

Please sign in to comment.
You can’t perform that action at this time.