From d4d332faa34abf02c657c74842e496a8024a865a Mon Sep 17 00:00:00 2001 From: kebeda Date: Wed, 8 Nov 2023 06:21:13 -0600 Subject: [PATCH 01/12] =?UTF-8?q?=F0=9F=93=A6=EF=B8=8F=20chore(deps):=20up?= =?UTF-8?q?dates=20bouncy=20castle=20to=201.75=20(latest=201.7x)=20(#741)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This mitigates CVE-2023-33201. ref. https://github.com/bcgit/bc-java/wiki/CVE-2023-33201 Co-authored-by: shrutiburman <87537688+shrutiburman@users.noreply.github.com> --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index bb404261..ee6657ae 100644 --- a/pom.xml +++ b/pom.xml @@ -293,8 +293,8 @@ org.bouncycastle - bcprov-jdk15on - 1.70 + bcprov-jdk18on + 1.75 @@ -306,4 +306,4 @@ - \ No newline at end of file + From 8c5607f9dc1d566956d2d1ecea3738feb4549283 Mon Sep 17 00:00:00 2001 From: Matt Dziuban Date: Wed, 8 Nov 2023 08:44:57 -0500 Subject: [PATCH 02/12] Update bouncycastle to latest 1.76 (#744) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee6657ae..c131cfa5 100644 --- a/pom.xml +++ b/pom.xml @@ -294,7 +294,7 @@ org.bouncycastle bcprov-jdk18on - 1.75 + 1.76 From 1692a4ed9115af6de0c4dcb055370931b2fe4ebe Mon Sep 17 00:00:00 2001 From: Twilio Date: Fri, 17 Nov 2023 10:32:39 +0000 Subject: [PATCH 03/12] [Librarian] Version Bump --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7293f35..50e27d1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Change Log All notable changes to this project will be documented in this file. +[2023-11-17] Version 4.10.1 +--------------------------- +**Library - Chore** +- [PR #744](https://github.com/sendgrid/sendgrid-java/pull/744): updates bouncy castle to 1.76 (latest 1.7x). Thanks to [@mrdziuban](https://github.com/mrdziuban)! +- [PR #741](https://github.com/sendgrid/sendgrid-java/pull/741): updates bouncy castle to 1.75 (latest 1.7x). Thanks to [@kebeda](https://github.com/kebeda)! + + [2023-11-06] Version 4.10.0 --------------------------- **Library - Feature** From 511e7f7f09db9fdaed832b49f779d53a7f54781f Mon Sep 17 00:00:00 2001 From: Twilio Date: Fri, 17 Nov 2023 10:32:39 +0000 Subject: [PATCH 04/12] Release 4.10.1 --- 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 77fc2389..78483f31 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.0/sendgrid-4.10.0-jar.jar:. Example.java && java -classpath ../repo/com/sendgrid/4.10.0/sendgrid-4.10.0-jar.jar:. Example +javac -classpath ../repo/com/sendgrid/4.10.1/sendgrid-4.10.1-jar.jar:. Example.java && java -classpath ../repo/com/sendgrid/4.10.1/sendgrid-4.10.1-jar.jar:. Example ``` diff --git a/README.md b/README.md index 64a8aee5..b3a3851b 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.0' + implementation 'com.sendgrid:sendgrid-java:4.10.1' } 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.0/sendgrid-java.jar) +[sendgrid-java.jar](https://github.com/sendgrid/sendgrid-java/releases/download/4.10.1/sendgrid-java.jar) ## Dependencies diff --git a/pom.xml b/pom.xml index c131cfa5..742055bb 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.sendgrid sendgrid-java Twilio SendGrid Java helper library - 4.10.0 + 4.10.1 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.0 + 4.10.1 @@ -306,4 +306,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 163490a9..9be558c4 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.0"; + private static final String VERSION = "4.10.1"; 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 6e137eb8..84d4c19d 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.0"); + Assert.assertEquals(sg.getLibraryVersion(), "4.10.1"); } @Test From e5443e3213fcfa982bf56365fc7511afe58af9ea Mon Sep 17 00:00:00 2001 From: Shubham Date: Thu, 18 Jan 2024 14:04:18 +0530 Subject: [PATCH 05/12] chore: update jackson version and licence year (#745) * chore: upgraded the jackson version to 2.14.0 * chore: changed licence year to 2024 --- LICENSE | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 3154774a..d703157e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (C) 2023, Twilio SendGrid, Inc. +Copyright (C) 2024, Twilio SendGrid, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/pom.xml b/pom.xml index 742055bb..ca72a7aa 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ - 2.13.3 + 2.14.0 https://github.com/sendgrid/sendgrid-java @@ -306,4 +306,4 @@ - \ No newline at end of file + From e9d0e9d4f475630b2a734afdc307484dbb283c0d Mon Sep 17 00:00:00 2001 From: Twilio Date: Wed, 14 Feb 2024 08:35:49 +0000 Subject: [PATCH 06/12] [Librarian] Version Bump --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50e27d1f..0afa2205 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-02-14] Version 4.10.2 +--------------------------- +**Library - Chore** +- [PR #745](https://github.com/sendgrid/sendgrid-java/pull/745): update jackson version and licence year. Thanks to [@tiwarishubham635](https://github.com/tiwarishubham635)! + + [2023-11-17] Version 4.10.1 --------------------------- **Library - Chore** From 472b4df35a719b99db96e8e0a8bf1ea552feb686 Mon Sep 17 00:00:00 2001 From: Twilio Date: Wed, 14 Feb 2024 08:35:49 +0000 Subject: [PATCH 07/12] Release 4.10.2 --- 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 78483f31..a5973600 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.1/sendgrid-4.10.1-jar.jar:. Example.java && java -classpath ../repo/com/sendgrid/4.10.1/sendgrid-4.10.1-jar.jar:. Example +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 ``` diff --git a/README.md b/README.md index b3a3851b..f1f3a0b8 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.1' + implementation 'com.sendgrid:sendgrid-java:4.10.2' } 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.1/sendgrid-java.jar) +[sendgrid-java.jar](https://github.com/sendgrid/sendgrid-java/releases/download/4.10.2/sendgrid-java.jar) ## Dependencies diff --git a/pom.xml b/pom.xml index ca72a7aa..541f1964 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.sendgrid sendgrid-java Twilio SendGrid Java helper library - 4.10.1 + 4.10.2 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.1 + 4.10.2 @@ -306,4 +306,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 9be558c4..100f235c 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.1"; + private static final String VERSION = "4.10.2"; 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 84d4c19d..9c0d3063 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.1"); + Assert.assertEquals(sg.getLibraryVersion(), "4.10.2"); } @Test From 8e59d61b8778b975129261075efe69022415bb9c Mon Sep 17 00:00:00 2001 From: Shubham Date: Tue, 10 Sep 2024 10:33:34 +0530 Subject: [PATCH 08/12] 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 09/12] [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 10/12] 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 From fa9bb12f73d2dfc10c7ea5a41bc2850be6fdd962 Mon Sep 17 00:00:00 2001 From: sbansla <104902068+sbansla@users.noreply.github.com> Date: Mon, 30 Jun 2025 13:19:45 +0530 Subject: [PATCH 11/12] chore: migrate ossrh to central publishing repo (#777) * chore: migrate ossrh to central publishing repo * updated license versiob --- LICENSE | 2 +- pom.xml | 16 +++++----------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/LICENSE b/LICENSE index d703157e..126ceb1a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (C) 2024, Twilio SendGrid, Inc. +Copyright (C) 2025, Twilio SendGrid, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/pom.xml b/pom.xml index dad3a41a..0d8ec8ef 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,6 @@ 4.0.0 - - org.sonatype.oss - oss-parent - 7 - com.sendgrid sendgrid-java Twilio SendGrid Java helper library @@ -39,14 +34,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.8 + org.sonatype.central + central-publishing-maven-plugin + 0.8.0 true - ossrh - https://oss.sonatype.org/ - true + central + true From 9f65fcf2109ca7860d6b8a1428da346fec555413 Mon Sep 17 00:00:00 2001 From: sbansla <104902068+sbansla@users.noreply.github.com> Date: Mon, 30 Jun 2025 15:53:01 +0530 Subject: [PATCH 12/12] chore: Migrate ossrh to central (#778) * changing server-id to central --- .github/workflows/test-and-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml index 111591a6..0a31274e 100644 --- a/.github/workflows/test-and-deploy.yml +++ b/.github/workflows/test-and-deploy.yml @@ -53,7 +53,7 @@ jobs: with: java-version: 8 distribution: temurin - server-id: ossrh + server-id: central server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}