diff --git a/.travis.yml b/.travis.yml index b9c117d..330e403 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,7 @@ branches: dist: trusty jdk: - - oraclejdk8 \ No newline at end of file + - oraclejdk8 + +after_success: + - mvn clean test jacoco:report coveralls:report \ No newline at end of file diff --git a/pom.xml b/pom.xml index a46ca0b..1a10e27 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,28 @@ 8 + + + + org.eluder.coveralls + coveralls-maven-plugin + 4.3.0 + + + + + org.jacoco + jacoco-maven-plugin + 0.8.5 + + + prepare-agent + + prepare-agent + + + + diff --git a/src/main/java/com/zman/scuttlebutt/example/AsyncScuttlebutt.java b/src/main/java/com/zman/scuttlebutt/AsyncScuttlebutt.java similarity index 92% rename from src/main/java/com/zman/scuttlebutt/example/AsyncScuttlebutt.java rename to src/main/java/com/zman/scuttlebutt/AsyncScuttlebutt.java index b6ee100..ffc0a14 100644 --- a/src/main/java/com/zman/scuttlebutt/example/AsyncScuttlebutt.java +++ b/src/main/java/com/zman/scuttlebutt/AsyncScuttlebutt.java @@ -1,4 +1,4 @@ -package com.zman.scuttlebutt.example; +package com.zman.scuttlebutt; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/com/zman/scuttlebutt/example/Duplex.java b/src/main/java/com/zman/scuttlebutt/Duplex.java similarity index 98% rename from src/main/java/com/zman/scuttlebutt/example/Duplex.java rename to src/main/java/com/zman/scuttlebutt/Duplex.java index c618f69..b485ecd 100644 --- a/src/main/java/com/zman/scuttlebutt/example/Duplex.java +++ b/src/main/java/com/zman/scuttlebutt/Duplex.java @@ -1,4 +1,4 @@ -package com.zman.scuttlebutt.example; +package com.zman.scuttlebutt; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/zman/scuttlebutt/example/EventEmitter.java b/src/main/java/com/zman/scuttlebutt/EventEmitter.java similarity index 93% rename from src/main/java/com/zman/scuttlebutt/example/EventEmitter.java rename to src/main/java/com/zman/scuttlebutt/EventEmitter.java index 167c78f..037c4ce 100644 --- a/src/main/java/com/zman/scuttlebutt/example/EventEmitter.java +++ b/src/main/java/com/zman/scuttlebutt/EventEmitter.java @@ -1,4 +1,4 @@ -package com.zman.scuttlebutt.example; +package com.zman.scuttlebutt; import java.util.*; import java.util.function.Consumer; diff --git a/src/main/java/com/zman/scuttlebutt/example/SbStream.java b/src/main/java/com/zman/scuttlebutt/SbStream.java similarity index 97% rename from src/main/java/com/zman/scuttlebutt/example/SbStream.java rename to src/main/java/com/zman/scuttlebutt/SbStream.java index 24d2242..383579b 100644 --- a/src/main/java/com/zman/scuttlebutt/example/SbStream.java +++ b/src/main/java/com/zman/scuttlebutt/SbStream.java @@ -1,6 +1,6 @@ -package com.zman.scuttlebutt.example; +package com.zman.scuttlebutt; -import com.zman.scuttlebutt.example.Scuttlebutt.Update; +import com.zman.scuttlebutt.Scuttlebutt.Update; import lombok.ToString; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/zman/scuttlebutt/example/Scuttlebutt.java b/src/main/java/com/zman/scuttlebutt/Scuttlebutt.java similarity index 95% rename from src/main/java/com/zman/scuttlebutt/example/Scuttlebutt.java rename to src/main/java/com/zman/scuttlebutt/Scuttlebutt.java index 8df0236..92a7524 100644 --- a/src/main/java/com/zman/scuttlebutt/example/Scuttlebutt.java +++ b/src/main/java/com/zman/scuttlebutt/Scuttlebutt.java @@ -1,4 +1,4 @@ -package com.zman.scuttlebutt.example; +package com.zman.scuttlebutt; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; @@ -8,7 +8,6 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import java.util.concurrent.locks.ReentrantLock; @Slf4j public abstract class Scuttlebutt extends EventEmitter{ diff --git a/src/main/java/com/zman/scuttlebutt/example/basic/BizData.java b/src/main/java/com/zman/scuttlebutt/basic/BizData.java similarity index 79% rename from src/main/java/com/zman/scuttlebutt/example/basic/BizData.java rename to src/main/java/com/zman/scuttlebutt/basic/BizData.java index c3fa8f1..eada0ca 100644 --- a/src/main/java/com/zman/scuttlebutt/example/basic/BizData.java +++ b/src/main/java/com/zman/scuttlebutt/basic/BizData.java @@ -1,4 +1,4 @@ -package com.zman.scuttlebutt.example.basic; +package com.zman.scuttlebutt.basic; import lombok.AllArgsConstructor; import lombok.ToString; diff --git a/src/main/java/com/zman/scuttlebutt/example/basic/Model.java b/src/main/java/com/zman/scuttlebutt/basic/Model.java similarity index 94% rename from src/main/java/com/zman/scuttlebutt/example/basic/Model.java rename to src/main/java/com/zman/scuttlebutt/basic/Model.java index b0e1fea..b7f1d89 100644 --- a/src/main/java/com/zman/scuttlebutt/example/basic/Model.java +++ b/src/main/java/com/zman/scuttlebutt/basic/Model.java @@ -1,7 +1,7 @@ -package com.zman.scuttlebutt.example.basic; +package com.zman.scuttlebutt.basic; -import com.zman.scuttlebutt.example.Duplex; -import com.zman.scuttlebutt.example.Scuttlebutt; +import com.zman.scuttlebutt.Duplex; +import com.zman.scuttlebutt.Scuttlebutt; import lombok.extern.slf4j.Slf4j; import java.util.HashMap; diff --git a/src/main/java/com/zman/scuttlebutt/example/basic/async/AsyncModel.java b/src/main/java/com/zman/scuttlebutt/basic/async/AsyncModel.java similarity index 92% rename from src/main/java/com/zman/scuttlebutt/example/basic/async/AsyncModel.java rename to src/main/java/com/zman/scuttlebutt/basic/async/AsyncModel.java index 06d3823..3dddf9d 100644 --- a/src/main/java/com/zman/scuttlebutt/example/basic/async/AsyncModel.java +++ b/src/main/java/com/zman/scuttlebutt/basic/async/AsyncModel.java @@ -1,8 +1,8 @@ -package com.zman.scuttlebutt.example.basic.async; +package com.zman.scuttlebutt.basic.async; -import com.zman.scuttlebutt.example.AsyncScuttlebutt; -import com.zman.scuttlebutt.example.Duplex; -import com.zman.scuttlebutt.example.basic.BizData; +import com.zman.scuttlebutt.Duplex; +import com.zman.scuttlebutt.basic.BizData; +import com.zman.scuttlebutt.AsyncScuttlebutt; import lombok.ToString; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index f07acd5..053b33f 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -8,7 +8,7 @@ - + diff --git a/src/test/java/RelationshipBetweenInstanceAndClass.java b/src/test/java/RelationshipBetweenInstanceAndClass.java index 4f01f44..e68c480 100644 --- a/src/test/java/RelationshipBetweenInstanceAndClass.java +++ b/src/test/java/RelationshipBetweenInstanceAndClass.java @@ -1,6 +1,6 @@ -import com.zman.scuttlebutt.example.AsyncScuttlebutt; -import com.zman.scuttlebutt.example.Scuttlebutt; -import com.zman.scuttlebutt.example.basic.Model; +import com.zman.scuttlebutt.AsyncScuttlebutt; +import com.zman.scuttlebutt.Scuttlebutt; +import com.zman.scuttlebutt.basic.Model; import org.junit.Test; import java.util.Map;