Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Torstein Krause Johansen
2016-06-28 12:43:11 +02:00
280 changed files with 12936 additions and 2567 deletions

View File

@@ -91,14 +91,14 @@
<artifactId>common-io</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>com.twelvemonkeys.common</groupId>
<artifactId>common-lang</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<classifier>tests</classifier>
<type>test-jar</type>
</dependency>
<dependency>

View File

@@ -44,14 +44,14 @@
<groupId>com.twelvemonkeys.common</groupId>
<artifactId>common-io</artifactId>
<scope>test</scope>
<classifier>tests</classifier>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>com.twelvemonkeys.common</groupId>
<artifactId>common-lang</artifactId>
<scope>test</scope>
<classifier>tests</classifier>
<type>test-jar</type>
</dependency>
</dependencies>

View File

@@ -72,14 +72,14 @@
<groupId>com.twelvemonkeys.common</groupId>
<artifactId>common-io</artifactId>
<scope>test</scope>
<classifier>tests</classifier>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>com.twelvemonkeys.common</groupId>
<artifactId>common-lang</artifactId>
<scope>test</scope>
<classifier>tests</classifier>
<type>test-jar</type>
</dependency>
</dependencies>