Skip to content

Commit

Permalink
Fix deps management
Browse files Browse the repository at this point in the history
  • Loading branch information
Artem Labazin authored and Artem Labazin committed Apr 19, 2019
1 parent c0301b9 commit 89dd7db
Show file tree
Hide file tree
Showing 6 changed files with 128 additions and 165 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Add batch write/read (using FileChannel) with customizable batch size;
- Add concurrent access to queue (methods with `synchronized` keyword or based on locks).

## [2.0.2](https://github.com/infobip/popout/releases/tag/2.0.2) - 2019-04-19

### Changed

- Refactored dependencies management.

## [2.0.1](https://github.com/infobip/popout/releases/tag/2.0.1) - 2019-04-17

### Added
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Include the dependency to your project's pom.xml file:
<dependency>
<groupId>org.infobip.lib</groupId>
<artifactId>popout</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
</dependency>
...
</dependencies>
Expand All @@ -55,7 +55,7 @@ Include the dependency to your project's pom.xml file:
or Gradle:

```groovy
compile 'org.infobip.lib:poput:2.0.1'
compile 'org.infobip.lib:poput:2.0.2'
```

### Create a queue
Expand Down
17 changes: 8 additions & 9 deletions benchmarks/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,19 @@ limitations under the License.
<parent>
<groupId>org.infobip.lib</groupId>
<artifactId>parent</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
</parent>

<artifactId>benchmarks</artifactId>
<packaging>jar</packaging>
<name>[popout]: Benchmark tests</name>

<dependencies>
<dependency>
<groupId>io.appulse</groupId>
<artifactId>logging-java</artifactId>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>popout</artifactId>
<version>2.0.1</version>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>com.squareup.tape2</groupId>
<artifactId>tape</artifactId>
Expand All @@ -55,13 +49,18 @@ limitations under the License.
<artifactId>jmh-core</artifactId>
<version>1.21</version>
</dependency>

<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>1.21</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

<build>
Expand Down
90 changes: 0 additions & 90 deletions benchmarks/src/main/java/org/infobip/lib/popout/benchmarks/Main.java
View file

This file was deleted.

123 changes: 61 additions & 62 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ limitations under the License.

<groupId>org.infobip.lib</groupId>
<artifactId>parent</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
<packaging>pom</packaging>

<modules>
Expand Down Expand Up @@ -71,7 +71,7 @@ limitations under the License.
<url>https://github.com/infobip/popout</url>
<connection>scm:git:https://github.com/infobip/popout.git</connection>
<developerConnection>scm:git:https://github.com/infobip/popout.git</developerConnection>
<tag>2.0.1</tag>
<tag>2.0.2</tag>
</scm>

<distributionManagement>
Expand Down Expand Up @@ -103,66 +103,65 @@ limitations under the License.
</developer>
</developers>

<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.6</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.4.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.12.2</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.25.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>2.25.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
<version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>3.1.12</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.appulse</groupId>
<artifactId>utils-java</artifactId>
<version>1.15.0</version>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.6</version>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.4.1</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>5.4.1</version>
</dependency>

<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.12.2</version>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.25.1</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>2.25.1</version>
</dependency>

<dependency>
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<version>3.1.12</version>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<version>3.0.2</version>
</dependency>
</dependencies>
</dependencyManagement>

<build>
<pluginManagement>
Expand Down
53 changes: 51 additions & 2 deletions popout/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ limitations under the License.
<parent>
<groupId>org.infobip.lib</groupId>
<artifactId>parent</artifactId>
<version>2.0.1</version>
<version>2.0.2</version>
</parent>

<artifactId>popout</artifactId>
Expand All @@ -36,7 +36,56 @@ limitations under the License.
<dependency>
<groupId>io.appulse</groupId>
<artifactId>utils-java</artifactId>
<version>1.15.0</version>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>

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

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>net.jcip</groupId>
<artifactId>jcip-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down

0 comments on commit 89dd7db

Please sign in to comment.