Skip to content

Commit

Permalink
Changed parent's POM dependency relation
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 89dd7db commit a885712
Show file tree
Hide file tree
Showing 7 changed files with 113 additions and 93 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
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.3](https://github.com/infobip/popout/releases/tag/2.0.3) - 2019-04-20

### Changed

- Changed parent's POM dependency relation.

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

### Changed
Expand Down Expand Up @@ -43,6 +49,7 @@ Minor update with set of small fixes and Java 9 support.
Initial release.

### Added

- Created nice FileQueue builder
- FileChannel implementation.
- Mmap implementation.
Expand Down
4 changes: 2 additions & 2 deletions README.md
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.2</version>
<version>2.0.3</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.2'
compile 'org.infobip.lib:popout:2.0.3'
```

### Create a queue
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/pom.xml
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.2</version>
<version>2.0.3</version>
</parent>

<artifactId>benchmarks</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import static org.openjdk.jmh.annotations.Mode.SingleShotTime;

import static java.util.concurrent.TimeUnit.SECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static io.appulse.utils.SizeUnit.MEGABYTES;
import static java.util.Comparator.reverseOrder;
import static org.openjdk.jmh.annotations.Level.Iteration;
Expand All @@ -46,10 +45,8 @@
import org.openjdk.jmh.annotations.Setup;
import org.openjdk.jmh.annotations.State;
import org.openjdk.jmh.annotations.TearDown;
import org.openjdk.jmh.annotations.Threads;
import org.openjdk.jmh.annotations.Warmup;
import org.openjdk.jmh.infra.Blackhole;
import org.openjdk.jmh.infra.ThreadParams;

import lombok.SneakyThrows;
import lombok.val;
Expand Down
184 changes: 100 additions & 84 deletions pom.xml
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.2</version>
<version>2.0.3</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.2</tag>
<tag>2.0.3</tag>
</scm>

<distributionManagement>
Expand Down Expand Up @@ -242,6 +242,60 @@ limitations under the License.
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<fork>true</fork>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<additionalOptions>-Xdoclint:none</additionalOptions>
<additionalparam>-Xdoclint:none</additionalparam>
<breakiterator>true</breakiterator>
<charset>${project.build.sourceEncoding}</charset>
<docencoding>${project.build.sourceEncoding}</docencoding>
<encoding>${project.build.sourceEncoding}</encoding>
<failOnError>true</failOnError>
<show>protected</show>
<source>${java.version}</source>
<version>true</version>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<!-- To release to Maven central -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -278,6 +332,43 @@ limitations under the License.
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<configuration>
<createChecksum>true</createChecksum>
</configuration>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.2.6</version>
<executions>
<execution>
<id>git-infos</id>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<runOnlyOnce>true</runOnlyOnce>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<verbose>false</verbose>
<prefix>git</prefix>
<generateGitPropertiesFilename>
${project.build.outputDirectory}/git.properties
</generateGitPropertiesFilename>
<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
<excludeProperties>
<excludeProperty>git.closest.tag.commit.count</excludeProperty>
<excludeProperty>git.closest.tag.name</excludeProperty>
</excludeProperties>
</configuration>
</plugin>
</plugins>
</pluginManagement>

Expand Down Expand Up @@ -335,93 +426,18 @@ limitations under the License.

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<fork>true</fork>
</configuration>
<artifactId>maven-deploy-plugin</artifactId>
<inherited>false</inherited>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<additionalOptions>-Xdoclint:none</additionalOptions>
<additionalparam>-Xdoclint:none</additionalparam>
<breakiterator>true</breakiterator>
<charset>${project.build.sourceEncoding}</charset>
<docencoding>${project.build.sourceEncoding}</docencoding>
<encoding>${project.build.sourceEncoding}</encoding>
<failOnError>true</failOnError>
<show>protected</show>
<source>${java.version}</source>
<version>true</version>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<phase>package</phase>
</execution>
</executions>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<inherited>false</inherited>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<configuration>
<createChecksum>true</createChecksum>
</configuration>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.2.6</version>
<executions>
<execution>
<id>git-infos</id>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<runOnlyOnce>true</runOnlyOnce>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<verbose>false</verbose>
<prefix>git</prefix>
<generateGitPropertiesFilename>
${project.build.outputDirectory}/git.properties
</generateGitPropertiesFilename>
<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
<excludeProperties>
<excludeProperty>git.closest.tag.commit.count</excludeProperty>
<excludeProperty>git.closest.tag.name</excludeProperty>
</excludeProperties>
</configuration>
<artifactId>maven-gpg-plugin</artifactId>
<inherited>false</inherited>
</plugin>
</plugins>
</build>
Expand Down
3 changes: 1 addition & 2 deletions popout/pom.xml
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.2</version>
<version>2.0.3</version>
</parent>

<artifactId>popout</artifactId>
Expand Down Expand Up @@ -108,7 +108,6 @@ limitations under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import io.appulse.utils.Bytes;
import io.appulse.utils.BytesPool;
import lombok.NonNull;
import lombok.SneakyThrows;
import lombok.experimental.FieldDefaults;
import lombok.val;
Expand Down Expand Up @@ -59,7 +60,7 @@ private ReadWriteBytesPool () {
* @param consumer acquired buffer consumer.
*/
@SneakyThrows
public <T> T borrow (ThrowableBytesConsumer<T> consumer) {
public <T> T borrow (@NonNull ThrowableBytesConsumer<T> consumer) {
val buffer = pool.acquire();
try {
return consumer.consume(buffer);
Expand Down

0 comments on commit a885712

Please sign in to comment.