Skip to content

Commit

Permalink
Fix Travis build
Browse files Browse the repository at this point in the history
  • Loading branch information
Artem Labazin authored and Artem Labazin committed Apr 17, 2019
1 parent 26e787f commit 658152e
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 24 deletions.
18 changes: 18 additions & 0 deletions .settings.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
Copyright 2019 Infobip Ltd.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
Expand Down
15 changes: 5 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
language: java

cache:
directories:
- $HOME/.m2
language: java

jdk:
- oraclejdk8

before_install:
- echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import
- echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust

install:
mvn --settings .settings.xml clean install -DskipTests=true -Dgpg.skip -Dmaven.javadoc.skip=true -B -V
mvn --settings .settings.xml install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip -B -V

script:
mvn --settings .settings.xml verify -DskipTests=false -Dmaven.javadoc.skip=true -B -U
mvn --settings .settings.xml clean verify -DskipTests=false -Dmaven.javadoc.skip=true -Dgpg.skip -B -U

before_deploy:
- mvn help:evaluate -N -Dexpression=project.version | grep -v '\['
- export project_version=$(mvn help:evaluate -N -Dexpression=project.version | grep -v '\[')
- echo $GPG_SECRET_KEYS | base64 --decode | $GPG_EXECUTABLE --import
- echo $GPG_OWNERTRUST | base64 --decode | $GPG_EXECUTABLE --import-ownertrust
- sed -i -- "s/\${env.SONATYPE_PASSWORD}/$SONATYPE_PASSWORD/g" .settings.xml
- mvn --settings .settings.xml clean deploy -DskipTests=true -Dmaven.javadoc.skip=false -B -U

Expand Down
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,17 @@ 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).

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

### Added

- `Batched` and `synced` file queue implementations.

### Removed

- Working with mmap-files.

## [1.1.0](https://github.com/infobip/popout/releases/tag/1.1.0) - 2018-01-23

Minor update with set of small fixes and Java 9 support.

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.0</version>
<version>2.0.1</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.0'
compile 'org.infobip.lib:poput:2.0.1'
```

### Create a queue
Expand Down
4 changes: 2 additions & 2 deletions 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.0</version>
<version>2.0.1</version>
</parent>

<artifactId>benchmarks</artifactId>
Expand All @@ -41,7 +41,7 @@ limitations under the License.
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>popout</artifactId>
<version>2.0.0</version>
<version>2.0.1</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 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.0</version>
<version>2.0.1</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.0</tag>
<tag>2.0.1</tag>
</scm>

<distributionManagement>
Expand Down
2 changes: 1 addition & 1 deletion 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.0</version>
<version>2.0.1</version>
</parent>

<artifactId>popout</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* The compression files configuration object.
*
* @author Artem Labazin
* @since 2.0.0
* @since 2.0.1
*/
@Value
@Wither
Expand Down
2 changes: 1 addition & 1 deletion popout/src/main/java/org/infobip/lib/popout/FileQueue.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public static <T> BatchedFileQueueBuilder<T> batched () {
* @param <T> the type of elements in this builded queues
*
* @author Artem Labazin
* @since 2.0.0
* @since 2.0.1
*/
@Getter
@SuppressWarnings({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/**
* Singleton pool for read/write bytes buffers.
*
* @since 2.0.0
* @since 2.0.1
* @author Artem Labazin
*/
@FieldDefaults(level = PRIVATE, makeFinal = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* The WAL files configuration object.
*
* @author Artem Labazin
* @since 2.0.0
* @since 2.0.1
*/
@Value
@Wither
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* @param <T> the type of elements in this queue
*
* @author Artem Labazin
* @since 2.0.0
* @since 2.0.1
*/
@Getter
@FieldDefaults(level = PRIVATE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* @param <T> the type of elements in this queue
*
* @author Artem Labazin
* @since 2.0.0
* @since 2.0.1
*/
@Getter
@FieldDefaults(level = PRIVATE)
Expand Down

0 comments on commit 658152e

Please sign in to comment.