From 8e59d61b8778b975129261075efe69022415bb9c Mon Sep 17 00:00:00 2001 From: Shubham Date: Tue, 10 Sep 2024 10:33:34 +0530 Subject: [PATCH 1/3] chore: move Bouncy Castle dependency to test scope (#767) * chore: install docker-compose * make bouncycastle test scope --- .github/workflows/test-and-deploy.yml | 5 +++++ pom.xml | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml index b8d847f2..111591a6 100644 --- a/.github/workflows/test-and-deploy.yml +++ b/.github/workflows/test-and-deploy.yml @@ -31,6 +31,11 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_AUTH_TOKEN }} + - name: Install Docker Compose + run: | + sudo apt-get update + sudo apt-get install -y docker-compose + - name: Run Unit Tests run: make test-docker version=${{ matrix.java }} diff --git a/pom.xml b/pom.xml index 541f1964..ea11d878 100644 --- a/pom.xml +++ b/pom.xml @@ -294,7 +294,8 @@ org.bouncycastle bcprov-jdk18on - 1.76 + 1.78.1 + test @@ -306,4 +307,4 @@ - \ No newline at end of file + From ff848fb6f1f001dffc582c9aff2cd2ce2e571eef Mon Sep 17 00:00:00 2001 From: Twilio Date: Wed, 18 Sep 2024 13:17:43 +0000 Subject: [PATCH 2/3] [Librarian] Version Bump --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0afa2205..0419d039 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. +[2024-09-18] Version 4.10.3 +--------------------------- +**Library - Chore** +- [PR #767](https://github.com/sendgrid/sendgrid-java/pull/767): move Bouncy Castle dependency to test scope. Thanks to [@tiwarishubham635](https://github.com/tiwarishubham635)! + + [2024-02-14] Version 4.10.2 --------------------------- **Library - Chore** From 352d3538b187b76ba227ad1968fafbe20469e187 Mon Sep 17 00:00:00 2001 From: Twilio Date: Wed, 18 Sep 2024 13:17:43 +0000 Subject: [PATCH 3/3] Release 4.10.3 --- CONTRIBUTING.md | 2 +- README.md | 4 ++-- pom.xml | 6 +++--- src/main/java/com/sendgrid/BaseInterface.java | 2 +- src/test/java/com/sendgrid/SendGridTest.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a5973600..c97a921f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -69,7 +69,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/4.10.2/sendgrid-4.10.2-jar.jar:. Example.java && java -classpath ../repo/com/sendgrid/4.10.2/sendgrid-4.10.2-jar.jar:. Example +javac -classpath ../repo/com/sendgrid/4.10.3/sendgrid-4.10.3-jar.jar:. Example.java && java -classpath ../repo/com/sendgrid/4.10.3/sendgrid-4.10.3-jar.jar:. Example ``` diff --git a/README.md b/README.md index f1f3a0b8..090a0536 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Add the following to your build.gradle file in the root of your project. ... dependencies { ... - implementation 'com.sendgrid:sendgrid-java:4.10.2' + implementation 'com.sendgrid:sendgrid-java:4.10.3' } repositories { @@ -81,7 +81,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](https://github.com/sendgrid/sendgrid-java/releases/download/4.10.2/sendgrid-java.jar) +[sendgrid-java.jar](https://github.com/sendgrid/sendgrid-java/releases/download/4.10.3/sendgrid-java.jar) ## Dependencies diff --git a/pom.xml b/pom.xml index ea11d878..dad3a41a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.sendgrid sendgrid-java Twilio SendGrid Java helper library - 4.10.2 + 4.10.3 This Java module allows you to quickly and easily send emails through Twilio SendGrid using Java. https://github.com/sendgrid/sendgrid-java @@ -26,7 +26,7 @@ https://github.com/sendgrid/sendgrid-java scm:git:git@github.com:sendgrid/sendgrid-java.git scm:git:git@github.com:sendgrid/sendgrid-java.git - 4.10.2 + 4.10.3 @@ -307,4 +307,4 @@ - + \ No newline at end of file diff --git a/src/main/java/com/sendgrid/BaseInterface.java b/src/main/java/com/sendgrid/BaseInterface.java index 100f235c..7a45cda4 100644 --- a/src/main/java/com/sendgrid/BaseInterface.java +++ b/src/main/java/com/sendgrid/BaseInterface.java @@ -11,7 +11,7 @@ */ public abstract class BaseInterface implements SendGridAPI { - private static final String VERSION = "4.10.2"; + private static final String VERSION = "4.10.3"; private static final String USER_AGENT = "sendgrid/" + VERSION + ";java"; private static final int RATE_LIMIT_RESPONSE_CODE = 429; diff --git a/src/test/java/com/sendgrid/SendGridTest.java b/src/test/java/com/sendgrid/SendGridTest.java index 9c0d3063..8737cbb2 100644 --- a/src/test/java/com/sendgrid/SendGridTest.java +++ b/src/test/java/com/sendgrid/SendGridTest.java @@ -43,7 +43,7 @@ public void testConstructWithClient() throws IOException { @Test public void testLibraryVersion() { SendGrid sg = new SendGrid(SENDGRID_API_KEY); - Assert.assertEquals(sg.getLibraryVersion(), "4.10.2"); + Assert.assertEquals(sg.getLibraryVersion(), "4.10.3"); } @Test