diff --git a/.gitignore b/.gitignore index 1d9351de..77b14185 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,6 @@ repo gradle.properties target *.class -examples/Example.java \ No newline at end of file +examples/Example.java +.classpath +settings.json diff --git a/.project b/.project new file mode 100644 index 00000000..4ec66320 --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + sendgrid-java + Project sendgrid-java created by Buildship. + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.buildship.core.gradleprojectnature + org.eclipse.jdt.core.javanature + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 55ffa558..98a6eae0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 684993b1..afec15ab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 ``` diff --git a/README.md b/README.md index cdd75dbd..1b9de22c 100644 --- a/README.md +++ b/README.md @@ -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 { @@ -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.*; diff --git a/build.gradle b/build.gradle index 324bbf30..a54a4d13 100644 --- a/build.gradle +++ b/build.gradle @@ -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 { @@ -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' } diff --git a/pom.xml b/pom.xml index e40fb8d8..dee48fc2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.sendgrid sendgrid-java SendGrid Java helper library - 3.2.1 + 3.2.2 This Java module allows you to quickly and easily send emails through SendGrid using Java. https://github.com/sendgrid/sendgrid-java @@ -94,17 +94,17 @@ com.fasterxml.jackson.core jackson-core - 2.5.3 + 2.9.5 com.fasterxml.jackson.core jackson-annotations - 2.5.3 + 2.9.5 com.fasterxml.jackson.core jackson-databind - 2.5.3 + 2.9.5 junit diff --git a/src/main/java/com/sendgrid/helpers/README.md b/src/main/java/com/sendgrid/helpers/README.md index 4c829e4a..a8b19ebe 100644 --- a/src/main/java/com/sendgrid/helpers/README.md +++ b/src/main/java/com/sendgrid/helpers/README.md @@ -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