Skip to content

Commit

Permalink
Version Bump v3.2.2: Update to latest Jackson recommended dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkingserious committed May 8, 2018
1 parent 719a66f commit 02f1562
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 13 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ repo
gradle.properties
target
*.class
examples/Example.java
examples/Example.java
.classpath
settings.json
23 changes: 23 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>sendgrid-java</name>
<comment>Project sendgrid-java created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Change Log
All notable changes to this project will be documented in this file.

## [3.2.2] - 2018-05-08
### Security Fix
- Update to latest Jackson recommended dependency, based on [this article](https://medium.com/@cowtowncoder/on-jackson-cves-dont-panic-here-is-what-you-need-to-know-54cd0d6e8062).

## [3.2.1] - 2017-04-13
### Added
- PR #175
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ touch Example.java
Add the example you want to test to Example.java, including the headers at the top of the file.

``` bash
javac -classpath ../repo/com/sendgrid/3.2.1/sendgrid-3.2.1-jar.jar:. Example.java && java -classpath ../repo/com/sendgrid/3.2.1/sendgrid-3.2.1-jar.jar:. Example
javac -classpath ../repo/com/sendgrid/3.2.2/sendgrid-3.2.2-jar.jar:. Example.java && java -classpath ../repo/com/sendgrid/3.2.2/sendgrid-3.2.2-jar.jar:. Example
```

<a name="understanding_the_codebase"></a>
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Add the following to your build.gradle file in the root of your project.
...
dependencies {
...
compile 'com.sendgrid:sendgrid-java:3.2.1'
compile 'com.sendgrid:sendgrid-java:3.2.2'
}
repositories {
Expand All @@ -78,7 +78,7 @@ mvn install

You can just drop the jar file in. It's a fat jar - it has all the dependencies built in.

[sendgrid-java.jar](http://repo1.maven.org/maven2/com/sendgrid/sendgrid-java/3.2.1/sendgrid-java-3.2.1-jar.jar)
[sendgrid-java.jar](https://github.com/sendgrid/sendgrid-java/releases/download/v3.2.2/sendgrid-java.jar)

```java
import com.sendgrid.*;
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ apply plugin: 'maven'
apply plugin: 'signing'

group = 'com.sendgrid'
version = '3.2.1'
version = '3.2.2'
ext.packaging = 'jar'

allprojects {
Expand Down Expand Up @@ -46,9 +46,9 @@ buildscript {

dependencies {
compile 'com.sendgrid:java-http-client:2.3.4'
compile 'com.fasterxml.jackson.core:jackson-core:2.5.3'
compile 'com.fasterxml.jackson.core:jackson-annotations:2.5.3'
compile 'com.fasterxml.jackson.core:jackson-databind:2.5.3'
compile 'com.fasterxml.jackson.core:jackson-core:2.9.5'
compile 'com.fasterxml.jackson.core:jackson-annotations:2.9.5'
compile 'com.fasterxml.jackson.core:jackson-databind:2.9.5'
testCompile group: 'junit', name: 'junit', version: '4.12'
}

Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<groupId>com.sendgrid</groupId>
<artifactId>sendgrid-java</artifactId>
<name>SendGrid Java helper library</name>
<version>3.2.1</version>
<version>3.2.2</version>
<description>This Java module allows you to quickly and easily send emails through SendGrid using Java.</description>
<url>https://github.com/sendgrid/sendgrid-java</url>
<licenses>
Expand Down Expand Up @@ -94,17 +94,17 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.5.3</version>
<version>2.9.5</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.5.3</version>
<version>2.9.5</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.5.3</version>
<version>2.9.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/sendgrid/helpers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Run the [example](https://github.com/sendgrid/sendgrid-java/tree/master/examples

```bash
cd examples/mail
javac -classpath ../../build/libs/sendgrid-3.2.0-jar.jar:. Example.java && java -classpath ../examples/jackson-core-2.7.3.jar:../../build/libs/sendgrid-3.2.0-jar.jar:. Example
javac -classpath ../../build/libs/sendgrid-3.2.2-jar.jar:. Example.java && java -classpath ../examples/jackson-core-2.9.5.jar:../../build/libs/sendgrid-3.2.2-jar.jar:. Example
```

## Usage
Expand Down

0 comments on commit 02f1562

Please sign in to comment.