From 6c2480c861c4ae970f6c11935b35eb97caea4adc Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Mon, 24 Jan 2022 19:37:01 +0000 Subject: [PATCH] Security Upgrades (#15) * Remove dependency upon camel-api * Override and upgrade jackson-database to 2.13.1 * Overrider and upgrade httpmime to 4.5.13 * github: build against JDK 17 * Version set to 2.0.1 --- .github/workflows/build-maven.yml | 2 +- pom.xml | 32 ++++++++++++++++--- .../java/net/kemitix/trello/LoadCard.java | 4 +-- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-maven.yml b/.github/workflows/build-maven.yml index 71d3bb3..3a98c0f 100644 --- a/.github/workflows/build-maven.yml +++ b/.github/workflows/build-maven.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ 11, 15 ] + java: [ 11, 17 ] steps: - uses: kamiazya/setup-graphviz@v1 - uses: actions/checkout@v2.3.4 diff --git a/pom.xml b/pom.xml index 62c40b4..8838d6c 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ kemitix-trello - 2.0.0 + 2.0.1 2.18 @@ -20,7 +20,6 @@ 0.14 1.18.22 - 3.12.0 5.8.2 3.18.1 @@ -36,11 +35,34 @@ com.taskadapter trello-java-wrapper ${trello-java-wrapper.version} + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-annotations + + + org.apache.httpcomponents + httpmime + + - org.apache.camel - camel-api - ${camel-api.version} + com.fasterxml.jackson.core + jackson-databind + 2.13.1 + + + org.apache.httpcomponents + httpmime + 4.5.13 diff --git a/src/main/java/net/kemitix/trello/LoadCard.java b/src/main/java/net/kemitix/trello/LoadCard.java index 618783e..cbab3f2 100644 --- a/src/main/java/net/kemitix/trello/LoadCard.java +++ b/src/main/java/net/kemitix/trello/LoadCard.java @@ -1,7 +1,5 @@ package net.kemitix.trello; -import org.apache.camel.Header; - import java.util.Objects; public class LoadCard { @@ -12,7 +10,7 @@ public class LoadCard { this.trelloBoard = trelloBoard; } - public TrelloCard loadCard(@Header("SlushyCardId") String cardId) { + public TrelloCard loadCard(String cardId) { return Objects.requireNonNull( trelloBoard.getCard(cardId), "Card Not Found"