Skip to content

Commit

Permalink
#51 Merge branch '2.1' into 3.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	bucket4j-benchmarks/pom.xml
#	bucket4j-core/pom.xml
#	bucket4j-core/src/main/java/io/github/bucket4j/BucketExceptions.java
#	bucket4j-core/src/main/java/io/github/bucket4j/Refill.java
#	bucket4j-jcache/pom.xml
#	bucket4j-jcache/src/main/java/io/github/bucket4j/grid/jcache/ExecuteProcessor.java
#	bucket4j-parent/pom.xml
#	experimental/pom.xml
#	pom.xml
  • Loading branch information
vladimir-bukhtoyarov committed Sep 23, 2017
1 parent 8bc6cb2 commit 058e59c
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 19 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ use any of them:
<dependency>
<groupId>com.github.vladimir-bukhtoyarov</groupId>
<artifactId>bucket4j-core</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
</dependency>
```
#### You can build Bucket4j from sources
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,6 @@ class DetectionOfIllegalApiUsageSpecification extends Specification {
ex.message == restrictionsNotSpecified().message
}

def "Should detect the high rate of refill"() {
when:
Bucket4j.builder().addLimit(Bandwidth.simple(2, Duration.ofNanos(1)))
then:
IllegalArgumentException ex = thrown()
ex.message == tooHighRefillRate(1, 2).message
}

def "Should check that tokens to consume should be positive"() {
setup:
def bucket = Bucket4j.builder().addLimit(
Expand Down
2 changes: 1 addition & 1 deletion bucket4j-hazelcast/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.github.vladimir-bukhtoyarov</groupId>
<artifactId>bucket4j-parent</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
<relativePath>../bucket4j-parent</relativePath>
</parent>
<artifactId>bucket4j-hazelcast</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bucket4j-ignite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.github.vladimir-bukhtoyarov</groupId>
<artifactId>bucket4j-parent</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
<relativePath>../bucket4j-parent</relativePath>
</parent>
<artifactId>bucket4j-ignite</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion bucket4j-infinispan/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.github.vladimir-bukhtoyarov</groupId>
<artifactId>bucket4j-parent</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
<relativePath>../bucket4j-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion experimental/bucket4j-mysql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.github.vladimir-bukhtoyarov</groupId>
<artifactId>bucket4j-parent</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
<relativePath>../../bucket4j-parent</relativePath>
</parent>
<artifactId>bucket4j-mysql</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion experimental/bucket4j-postgresql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.github.vladimir-bukhtoyarov</groupId>
<artifactId>bucket4j-parent</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
<relativePath>../../bucket4j-parent</relativePath>
</parent>
<artifactId>bucket4j-postgresql</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion experimental/bucket4j-redis/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.github.vladimir-bukhtoyarov</groupId>
<artifactId>bucket4j-parent</artifactId>
<version>3.0.1</version>
<version>3.0.2</version>
<relativePath>../../bucket4j-parent</relativePath>
</parent>
<artifactId>bucket4j-redis</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,4 @@
<maven.deploy.skip>true</maven.deploy.skip>
</properties>

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>

</project>

0 comments on commit 058e59c

Please sign in to comment.