Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/nexmo/nexmo-java
Browse files Browse the repository at this point in the history
  • Loading branch information
judy2k committed Oct 19, 2017
2 parents 6715372 + fb8fce8 commit d385812
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[bumpversion]
commit = True
tag = True
current_version = 2.0.2
current_version = 3.0.0
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?
serialize =
{major}.{minor}.{patch}
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## In Development
## [3.0.0] - 2017-10-19

### Changed
- `ModifyCallPayload.action` is now a value of the enum `ModifyCallPayload.Action`.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ repositories {
}
dependencies {
compile 'com.nexmo:client:2.0.2'
compile 'com.nexmo:client:3.0.0'
}
```

Expand All @@ -41,7 +41,7 @@ Add the following to the correct place in your project's POM file:
<dependency>
<groupId>com.nexmo</groupId>
<artifactId>client</artifactId>
<version>2.0.2</version>
<version>3.0.0</version>
</dependency>
```

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ apply plugin: 'eclipse'

group = "com.nexmo"
archivesBaseName = "client"
version = "2.0.2"
version = "3.0.0"
sourceCompatibility = "1.7"
targetCompatibility = "1.7"

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/nexmo/client/HttpWrapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ protected HttpClient createHttpClient() {

return HttpClientBuilder.create()
.setConnectionManager(connectionManager)
.setUserAgent("nexmo-java/2.0.2")
.setUserAgent("nexmo-java/3.0.0")
.setDefaultRequestConfig(requestConfig)
.build();
}
Expand Down

0 comments on commit d385812

Please sign in to comment.