Merge 21b3593 into 9a94fba

Makefile

@@ -1,7 +1,7 @@
 GO := go
 NAME := pochi
 POCHIC := $(NAME)c
-VERSION := 2.0.0
+VERSION := 2.1.0
 DIST := $(NAME)-$(VERSION)
 DESTINATION := target
 

README.md

@@ -2,10 +2,10 @@
 [![Coverage Status](https://coveralls.io/repos/github/tamada/pochi/badge.svg?branch=master)](https://coveralls.io/github/tamada/pochi?branch=master)
 [![codebeat badge](https://codebeat.co/badges/7d4be5b9-c604-4bf9-b67b-d6d20f703ab9)](https://codebeat.co/projects/github-com-tamada-pochi)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg?style=flat)](https://github.com/tamada/pochi/blob/master/LICENSE)
-[![Version](https://img.shields.io/badge/Version-2.0.0-yellowgreen.svg)](https://github.com/tamada/pochi/releases/tag/v2.0.0)
+[![Version](https://img.shields.io/badge/Version-2.1.0-yellowgreen.svg)](https://github.com/tamada/pochi/releases/tag/v2.1.0)
 
 [![Gitter](https://img.shields.io/badge/chat-on%20gitter-green?logo=gitter)](https://gitter.im/pochi-birthmark/)
-[![Javadoc](https://img.shields.io/static/v1?label=javadoc&message=v2.0.0&color=blue&logo=java)](https://tamada.github.io/pochi/apidocs)
+[![Javadoc](https://img.shields.io/static/v1?label=javadoc&message=v2.1.0&color=blue&logo=java)](https://tamada.github.io/pochi/apidocs)
 [![Docker](https://img.shields.io/badge/docker-tamada%2Fpochi%3A2.0.0-blue?logo=docker&style=social)](https://hub.docker.com/r/tamada/pochi)
 
 # :dog: pochi

cmd/pochi/main.go

@@ -18,7 +18,7 @@ const (
 	CONFIG_PATH = "POCHI_CONFIG_PATH"
 	LIB_DIR     = "lib"
 )
-const VERSION = "2.0.0"
+const VERSION = "2.1.0"
 
 type pochiRunner struct {
 	prog string

kunai2/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>jp.cafebabe</groupId>
     <artifactId>pochi</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

kunai2/src/test/java/jp/cafebabe/kunai/entries/ClassNameTest.java

@@ -1,6 +1,6 @@
 package jp.cafebabe.kunai.entries;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 
 import org.hamcrest.Matchers;

kunai2/src/test/java/jp/cafebabe/kunai/entries/NameTest.java

@@ -1,6 +1,6 @@
 package jp.cafebabe.kunai.entries;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 
 import org.hamcrest.Matchers;

kunai2/src/test/java/jp/cafebabe/kunai/sink/DirectoryDataSinkTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.kunai.sink;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

kunai2/src/test/java/jp/cafebabe/kunai/sink/DirectoryMakerTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.kunai.sink;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;

kunai2/src/test/java/jp/cafebabe/kunai/sink/JarFileDataSinkTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.kunai.sink;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.Files;
 import java.nio.file.Path;

kunai2/src/test/java/jp/cafebabe/kunai/sink/factories/DefaultDataSinkFactoryTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.Files;
 import java.nio.file.Paths;

kunai2/src/test/java/jp/cafebabe/kunai/source/AbstractDataSourceTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.kunai.source;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.Paths;
 

kunai2/src/test/java/jp/cafebabe/kunai/source/ClassFileDataSourceTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.kunai.source;
 
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

kunai2/src/test/java/jp/cafebabe/kunai/source/DirectoryDataSourceTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.kunai.source;
 
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

kunai2/src/test/java/jp/cafebabe/kunai/source/DirectoryTraverserTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.kunai.source;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

kunai2/src/test/java/jp/cafebabe/kunai/source/FilteredDataSourceTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.kunai.source;
 
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

kunai2/src/test/java/jp/cafebabe/kunai/source/JarFileDataSourceTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.kunai.source;
 
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

kunai2/src/test/java/jp/cafebabe/kunai/source/WarFileDataSourceTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.kunai.source;
 
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

kunai2/src/test/java/jp/cafebabe/kunai/source/factories/ClassFileDataSourceFactoryTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.kunai.source.factories;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.nio.file.Path;

kunai2/src/test/java/jp/cafebabe/kunai/source/factories/DataSourceFactoriesTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static jp.cafebabe.kunai.util.Assert.assertThrows;
 
 import java.io.IOException;

kunai2/src/test/java/jp/cafebabe/kunai/source/factories/DefaultDataSourceFactoryTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.kunai.source.factories;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;

kunai2/src/test/java/jp/cafebabe/kunai/source/factories/DirectoryDataSourceFactoryTest.java

@@ -2,7 +2,7 @@
 
 import static jp.cafebabe.kunai.util.Assert.assertThrows;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.nio.file.Path;

kunai2/src/test/java/jp/cafebabe/kunai/source/factories/JarFileDataSourceFactoryTest.java

@@ -2,7 +2,7 @@
 
 import static jp.cafebabe.kunai.util.Assert.assertThrows;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.nio.file.Path;

kunai2/src/test/java/jp/cafebabe/kunai/source/factories/PlainFileDataSourceFactoryTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.File;
 import java.nio.file.Path;

kunai2/src/test/java/jp/cafebabe/kunai/util/HelpersTest.java

@@ -3,7 +3,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import jp.cafebabe.kunai.sink.DirectoryMaker;
 import org.junit.Test;

pochi-api/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>jp.cafebabe</groupId>
     <artifactId>pochi</artifactId>
-    <version>2.0.0</version>
+    <version>2.1.0</version>
   </parent>
 
   <groupId>jp.cafebabe.pochi</groupId>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>jp.cafebabe.pochi</groupId>
       <artifactId>kunai2</artifactId>
-      <version>2.0.0</version>
+      <version>2.1.0</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

pochi-api/src/test/java/jp/cafebabe/birthmarks/ParserTypeTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.hamcrest.Matchers;
 import org.junit.Test;

pochi-api/src/test/java/jp/cafebabe/birthmarks/comparators/ComparatorTypeTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.hamcrest.Matchers;
 import org.junit.Test;

pochi-api/src/test/java/jp/cafebabe/birthmarks/comparators/ComparisonTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.Matchers.closeTo;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.URI;
 import java.net.URISyntaxException;

pochi-api/src/test/java/jp/cafebabe/birthmarks/comparators/SimilarityTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.birthmarks.comparators;
 
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Test;
 

pochi-api/src/test/java/jp/cafebabe/birthmarks/config/ConfigurationTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.birthmarks.config;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.URL;
 import java.util.Optional;

pochi-api/src/test/java/jp/cafebabe/birthmarks/config/ItemTest.java

@@ -3,7 +3,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Test;
 

pochi-api/src/test/java/jp/cafebabe/birthmarks/entities/BirthmarkTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.birthmarks.entities;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.URI;
 import java.util.ArrayList;

pochi-api/src/test/java/jp/cafebabe/birthmarks/entities/BirthmarkTypeTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;

pochi-api/src/test/java/jp/cafebabe/birthmarks/entities/BirthmarksTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.birthmarks.entities;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.URI;
 import java.util.ArrayList;

pochi-api/src/test/java/jp/cafebabe/birthmarks/entities/CoupleTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.ArrayList;
 import java.util.List;

pochi-api/src/test/java/jp/cafebabe/birthmarks/entities/ElementTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.birthmarks.entities;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Test;
 

pochi-api/src/test/java/jp/cafebabe/birthmarks/entities/ElementsTest.java

@@ -3,7 +3,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.ArrayList;
 import java.util.List;

pochi-api/src/test/java/jp/cafebabe/birthmarks/entities/MetadataTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.birthmarks.entities;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.URI;
 

pochi-api/src/test/java/jp/cafebabe/birthmarks/entities/PairTest.java

@@ -3,7 +3,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import jp.cafebabe.birthmarks.entities.Pair;
 import org.junit.Test;

pochi-api/src/test/java/jp/cafebabe/birthmarks/pairs/PairMakerTypeTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;

pochi-api/src/test/java/jp/cafebabe/birthmarks/rules/RuleTest.java

@@ -1,6 +1,6 @@
 package jp.cafebabe.birthmarks.rules;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.is;
 
 import org.junit.Test;

pochi-api/src/test/java/jp/cafebabe/birthmarks/rules/RulesTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.birthmarks.rules;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.stream.Stream;
 

pochi-api/src/test/java/jp/cafebabe/birthmarks/rules/SnippetTest.java

@@ -1,7 +1,7 @@
 package jp.cafebabe.birthmarks.rules;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.Objects;