Skip to content

Commit 753400d

Browse files
committed
Merged commit for Upgrade issue6 branch against the latest version 2.3.3.
2 parents ff5bb26 + 728dbf9 commit 753400d

File tree

10 files changed

+376
-376
lines changed

10 files changed

+376
-376
lines changed

.github/ISSUE_TEMPLATE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ Any other information you want to share that is relevant to the issue being repo
1414
#### Technical details:
1515

1616
* java-http-client Version: master (latest commit: [commit number])
17-
* Node.js Version: 1.7.0_60
17+
* Java Version: X.X

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ repo/
1919
# JetBrains IDEs
2020
*.iml
2121
**/.idea/
22+
/.settings/
23+
/.classpath
24+
/.project

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file.
33

44
This project adheres to [Semantic Versioning](http://semver.org/).
55

6+
## [2.3.3] - 2016-08-08
7+
### Added
8+
- Pull request [#11](https://github.com/sendgrid/java-http-client/pull/11)
9+
- Solves [issue #10](https://github.com/sendgrid/java-http-client/issues/10): Improve Error Handling
10+
- Now error messages are passed through from the server
11+
- BIG thanks to [shuron](https://github.com/shuron) / [Alexander Holbreich](https://github.com/aholbreich) for the pull request!
12+
13+
## [2.3.2] - 2016-07-18
14+
### Fixed
15+
- 2.3.1 did not upload correctly
16+
617
## [2.3.1] - 2016-07-08
718
### Fixed
819
- [Fix charset: Use "UTF-8" charset instead of default "ISO-8859-1"](https://github.com/sendgrid/java-http-client/pull/5)

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ We welcome direct contributions to the java-http-client code base. Thank you!
6464

6565
##### Prerequisites #####
6666

67-
- Java 1.7 and up
67+
- Java version Oracle JDK 7, 8 or OpenJDK 7
6868
- Please see [build.gradle](https://github.com/sendgrid/java-http-client/blob/master/build.gradle)
6969

7070
##### Initial setup: #####
@@ -89,7 +89,7 @@ source ./sendgrid.env
8989
```bash
9090
./gradlew build
9191
cd examples
92-
javac -classpath ./commons-logging-1.2.jar:./httpcore-4.4.4.jar:./httpclient-4.5.2.jar:./jackson-databind-2.7.3.jar:./jackson-annotations-2.7.0.jar:./jackson-core-2.7.3.jar:../repo/com/sendgrid/2.3.0/sendgrid-java-http-client-2.3.0-jar.jar:. Example.java && java -classpath ./commons-logging-1.2.jar:./httpcore-4.4.4.jar:./httpclient-4.5.2.jar:./jackson-databind-2.7.3.jar:./jackson-annotations-2.7.0.jar:./jackson-core-2.7.3.jar:../repo/com/sendgrid/2.3.0/sendgrid-java-http-client-2.3.0-jar.jar:. Example
92+
javac -classpath ./commons-logging-1.2.jar:./httpcore-4.4.4.jar:./httpclient-4.5.2.jar:./jackson-databind-2.7.3.jar:./jackson-annotations-2.7.0.jar:./jackson-core-2.7.3.jar:../repo/com/sendgrid/2.3.2/sendgrid-java-http-client-2.3.2-jar.jar:. Example.java && java -classpath ./commons-logging-1.2.jar:./httpcore-4.4.4.jar:./httpclient-4.5.2.jar:./jackson-databind-2.7.3.jar:./jackson-annotations-2.7.0.jar:./jackson-core-2.7.3.jar:../repo/com/sendgrid/2.3.2/sendgrid-java-http-client-2.3.2-jar.jar:. Example
9393
```
9494

9595
<a name="understanding_the_codebase"></a>

README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,17 @@ All updates to this project is documented in our [CHANGELOG](https://github.com/
1010

1111
# Installation
1212

13-
## via Maven w/ Gradle
13+
## Prerequisites
14+
15+
- Java version Oracle JDK 7, 8 or OpenJDK 7
16+
17+
## Install via Maven w/ Gradle
1418

1519
```groovy
1620
...
1721
dependencies {
1822
...
19-
compile 'com.sendgrid:java-http-client:2.3.1'
23+
compile 'com.sendgrid:java-http-client:2.3.3'
2024
}
2125
2226
repositories {
@@ -25,21 +29,21 @@ repositories {
2529
...
2630
```
2731

28-
## Maven
32+
### Maven
2933

3034
```xml
3135
<dependency>
3236
<groupId>com.sendgrid</groupId>
3337
<artifactId>java-http-client</artifactId>
34-
<version>2.3.1</version>
38+
<version>2.3.3</version>
3539
</dependency>
3640
```
3741

3842
`mvn install`
3943

40-
## Fat Jar
44+
## Install via Fat Jar
4145

42-
[Download](http://repo1.maven.org/maven2/com/sendgrid/java-http-client/2.3.1/java-http-client-2.3.1-jar.jar)
46+
[Download](http://repo1.maven.org/maven2/com/sendgrid/java-http-client/2.3.3/java-http-client-2.3.3-jar.jar)
4347

4448
## Dependencies
4549

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ apply plugin: 'maven'
1717
apply plugin: 'signing'
1818

1919
group = 'com.sendgrid'
20-
version = '2.3.1'
20+
version = '2.3.3'
2121
ext.packaging = 'jar'
2222

2323
allprojects {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<packaging>jar</packaging>
1212
<name>A simple HTTP client</name>
1313
<description>HTTP REST client, simplified for Java</description>
14-
<version>2.3.1</version>
14+
<version>2.3.3</version>
1515
<url>https://github.com/sendgrid/java-http-client</url>
1616
<licenses>
1717
<license>

0 commit comments

Comments
 (0)