From fda54ff5f45b1fcf7ef56f949e6f4dfa9929bfbb Mon Sep 17 00:00:00 2001 From: Paul Flynn <43211074+pflynn-virtru@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:12:07 -0400 Subject: [PATCH 1/3] fix: Maven plugins and vulnerability fix (#32) vulnerability fix GHSA-pfh2-hfmq-phg5, Score: 5.3 Included Maven plugins for generating source JARs, Javadoc JARs, and checksum files across multiple project POMs. Also added a new protobuf Java dependency and updated project URLs in the main POM. These changes enhance build reproducibility and artifact verification. --- nifi-tdf-controller-services-api-nar/pom.xml | 60 ++++++++++++++++++ nifi-tdf-controller-services-api/pom.xml | 64 ++++++++++++++++++++ nifi-tdf-nar/pom.xml | 60 ++++++++++++++++++ nifi-tdf-processors/pom.xml | 64 ++++++++++++++++++++ pom.xml | 13 +++- 5 files changed, 260 insertions(+), 1 deletion(-) diff --git a/nifi-tdf-controller-services-api-nar/pom.xml b/nifi-tdf-controller-services-api-nar/pom.xml index 399a37a..76da359 100644 --- a/nifi-tdf-controller-services-api-nar/pom.xml +++ b/nifi-tdf-controller-services-api-nar/pom.xml @@ -52,6 +52,66 @@ org.apache.nifi nifi-nar-maven-plugin + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + attach-sources + + jar + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.8.0 + + + attach-javadocs + + jar + + + + + + + net.nicoulaj.maven.plugins + checksum-maven-plugin + 1.11 + + + create-checksums + package + + files + + + + MD5 + SHA-1 + SHA-256 + SHA-512 + + true + + + ${project.build.directory} + + *.nar + + + + + + + \ No newline at end of file diff --git a/nifi-tdf-controller-services-api/pom.xml b/nifi-tdf-controller-services-api/pom.xml index 83ad071..0f597ea 100644 --- a/nifi-tdf-controller-services-api/pom.xml +++ b/nifi-tdf-controller-services-api/pom.xml @@ -31,4 +31,68 @@ ${nifi.version} + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + attach-sources + + jar + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.8.0 + + + attach-javadocs + + jar + + + + + + + net.nicoulaj.maven.plugins + checksum-maven-plugin + 1.11 + + + create-checksums + package + + files + + + + MD5 + SHA-1 + SHA-256 + SHA-512 + + true + + + ${project.build.directory} + + *.jar + + + + + + + + + diff --git a/nifi-tdf-nar/pom.xml b/nifi-tdf-nar/pom.xml index 99e8805..13ea5c0 100644 --- a/nifi-tdf-nar/pom.xml +++ b/nifi-tdf-nar/pom.xml @@ -33,6 +33,66 @@ org.apache.nifi nifi-nar-maven-plugin + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + attach-sources + + jar + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.8.0 + + + attach-javadocs + + jar + + + + + + + net.nicoulaj.maven.plugins + checksum-maven-plugin + 1.11 + + + create-checksums + package + + files + + + + MD5 + SHA-1 + SHA-256 + SHA-512 + + true + + + ${project.build.directory} + + *.nar + + + + + + + org.jacoco jacoco-maven-plugin diff --git a/nifi-tdf-processors/pom.xml b/nifi-tdf-processors/pom.xml index abb56c0..7f964e7 100644 --- a/nifi-tdf-processors/pom.xml +++ b/nifi-tdf-processors/pom.xml @@ -97,4 +97,68 @@ test + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + attach-sources + + jar + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.8.0 + + + attach-javadocs + + jar + + + + + + + net.nicoulaj.maven.plugins + checksum-maven-plugin + 1.11 + + + create-checksums + package + + files + + + + MD5 + SHA-1 + SHA-256 + SHA-512 + + true + + + ${project.build.directory} + + *.jar + + + + + + + + + diff --git a/pom.xml b/pom.xml index cd8d93b..3f53b21 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,9 @@ nifi-pom 0.6.0-SNAPSHOT nifi-pom - pom NiFi processors for OpenTDF + https://github.com/opentdf/nifi + pom Clear BSD License @@ -90,6 +91,16 @@ 5.2.0 test + + com.google.protobuf + protobuf-java + 3.25.5 + + + com.jayway.jsonpath + json-path + 2.9.0 + From e5b57fb4946eb156000049710f12be30c766b4b8 Mon Sep 17 00:00:00 2001 From: "opentdf-automation[bot]" <149537512+opentdf-automation[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:24:41 -0400 Subject: [PATCH 2/3] chore(main): release 0.6.0 (#33) :robot: I have created a release *beep* *boop* ---
0.6.0 ## [0.6.0](https://github.com/opentdf/nifi/compare/v0.5.0...v0.6.0) (2024-10-21) ### Bug Fixes * Maven plugins and vulnerability fix ([#32](https://github.com/opentdf/nifi/issues/32)) ([fda54ff](https://github.com/opentdf/nifi/commit/fda54ff5f45b1fcf7ef56f949e6f4dfa9929bfbb))
--- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: opentdf-automation[bot] <149537512+opentdf-automation[bot]@users.noreply.github.com> --- .release-please-manifest.json | 2 +- CHANGELOG.md | 7 +++++++ nifi-tdf-controller-services-api-nar/pom.xml | 4 ++-- nifi-tdf-controller-services-api/pom.xml | 2 +- nifi-tdf-nar/pom.xml | 6 +++--- nifi-tdf-processors/pom.xml | 4 ++-- pom.xml | 2 +- versions.txt | 2 +- 8 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index f1c1e58..bcd0522 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.5.0" + ".": "0.6.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 30c4c2d..7a336be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.6.0](https://github.com/opentdf/nifi/compare/v0.5.0...v0.6.0) (2024-10-21) + + +### Bug Fixes + +* Maven plugins and vulnerability fix ([#32](https://github.com/opentdf/nifi/issues/32)) ([fda54ff](https://github.com/opentdf/nifi/commit/fda54ff5f45b1fcf7ef56f949e6f4dfa9929bfbb)) + ## [0.5.0](https://github.com/opentdf/nifi/compare/v0.4.0...v0.5.0) (2024-10-18) diff --git a/nifi-tdf-controller-services-api-nar/pom.xml b/nifi-tdf-controller-services-api-nar/pom.xml index 76da359..0f056e5 100644 --- a/nifi-tdf-controller-services-api-nar/pom.xml +++ b/nifi-tdf-controller-services-api-nar/pom.xml @@ -5,7 +5,7 @@ io.opentdf.nifi nifi-pom - 0.6.0-SNAPSHOT + 0.6.0 nifi-tdf-controller-services-nar nifi-tdf-controller-services-nar @@ -18,7 +18,7 @@ ${project.groupId} nifi-tdf-controller-services-api - 0.6.0-SNAPSHOT + 0.6.0 org.apache.nifi diff --git a/nifi-tdf-controller-services-api/pom.xml b/nifi-tdf-controller-services-api/pom.xml index 0f597ea..c8c96ed 100644 --- a/nifi-tdf-controller-services-api/pom.xml +++ b/nifi-tdf-controller-services-api/pom.xml @@ -5,7 +5,7 @@ io.opentdf.nifi nifi-pom - 0.6.0-SNAPSHOT + 0.6.0 nifi-tdf-controller-services-api nifi-tdf-controller-services-api diff --git a/nifi-tdf-nar/pom.xml b/nifi-tdf-nar/pom.xml index 13ea5c0..b7dfd5a 100644 --- a/nifi-tdf-nar/pom.xml +++ b/nifi-tdf-nar/pom.xml @@ -5,7 +5,7 @@ io.opentdf.nifi nifi-pom - 0.6.0-SNAPSHOT + 0.6.0 nifi-tdf-nar nifi-tdf-nar @@ -18,12 +18,12 @@ ${project.groupId} nifi-tdf-processors - 0.6.0-SNAPSHOT + 0.6.0 ${project.groupId} nifi-tdf-controller-services-nar - 0.6.0-SNAPSHOT + 0.6.0 nar diff --git a/nifi-tdf-processors/pom.xml b/nifi-tdf-processors/pom.xml index 7f964e7..d7f007b 100644 --- a/nifi-tdf-processors/pom.xml +++ b/nifi-tdf-processors/pom.xml @@ -5,7 +5,7 @@ io.opentdf.nifi nifi-pom - 0.6.0-SNAPSHOT + 0.6.0 nifi-tdf-processors nifi-tdf-processors @@ -19,7 +19,7 @@ ${project.groupId} nifi-tdf-controller-services-api - 0.6.0-SNAPSHOT + 0.6.0 org.apache.nifi diff --git a/pom.xml b/pom.xml index 3f53b21..501d1aa 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.opentdf.nifi nifi-pom - 0.6.0-SNAPSHOT + 0.6.0 nifi-pom NiFi processors for OpenTDF https://github.com/opentdf/nifi diff --git a/versions.txt b/versions.txt index 518f041..2b89896 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -nifi:0.5.0:0.6.0-SNAPSHOT \ No newline at end of file +nifi:0.6.0:0.6.0 \ No newline at end of file From fb3011a8f04ff269d4854323bbc2bb9c5efa47a1 Mon Sep 17 00:00:00 2001 From: "opentdf-automation[bot]" <149537512+opentdf-automation[bot]@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:29:44 -0400 Subject: [PATCH 3/3] chore(main): release 0.7.0-SNAPSHOT (#34) :robot: I have created a release *beep* *boop* ---
0.7.0-SNAPSHOT ### Updating meta-information for bleeding-edge SNAPSHOT release.
--- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: opentdf-automation[bot] <149537512+opentdf-automation[bot]@users.noreply.github.com> --- nifi-tdf-controller-services-api-nar/pom.xml | 4 ++-- nifi-tdf-controller-services-api/pom.xml | 2 +- nifi-tdf-nar/pom.xml | 6 +++--- nifi-tdf-processors/pom.xml | 4 ++-- pom.xml | 2 +- versions.txt | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nifi-tdf-controller-services-api-nar/pom.xml b/nifi-tdf-controller-services-api-nar/pom.xml index 0f056e5..2428b39 100644 --- a/nifi-tdf-controller-services-api-nar/pom.xml +++ b/nifi-tdf-controller-services-api-nar/pom.xml @@ -5,7 +5,7 @@ io.opentdf.nifi nifi-pom - 0.6.0 + 0.7.0-SNAPSHOT nifi-tdf-controller-services-nar nifi-tdf-controller-services-nar @@ -18,7 +18,7 @@ ${project.groupId} nifi-tdf-controller-services-api - 0.6.0 + 0.7.0-SNAPSHOT org.apache.nifi diff --git a/nifi-tdf-controller-services-api/pom.xml b/nifi-tdf-controller-services-api/pom.xml index c8c96ed..59e1a76 100644 --- a/nifi-tdf-controller-services-api/pom.xml +++ b/nifi-tdf-controller-services-api/pom.xml @@ -5,7 +5,7 @@ io.opentdf.nifi nifi-pom - 0.6.0 + 0.7.0-SNAPSHOT nifi-tdf-controller-services-api nifi-tdf-controller-services-api diff --git a/nifi-tdf-nar/pom.xml b/nifi-tdf-nar/pom.xml index b7dfd5a..f22db92 100644 --- a/nifi-tdf-nar/pom.xml +++ b/nifi-tdf-nar/pom.xml @@ -5,7 +5,7 @@ io.opentdf.nifi nifi-pom - 0.6.0 + 0.7.0-SNAPSHOT nifi-tdf-nar nifi-tdf-nar @@ -18,12 +18,12 @@ ${project.groupId} nifi-tdf-processors - 0.6.0 + 0.7.0-SNAPSHOT ${project.groupId} nifi-tdf-controller-services-nar - 0.6.0 + 0.7.0-SNAPSHOT nar diff --git a/nifi-tdf-processors/pom.xml b/nifi-tdf-processors/pom.xml index d7f007b..bf17472 100644 --- a/nifi-tdf-processors/pom.xml +++ b/nifi-tdf-processors/pom.xml @@ -5,7 +5,7 @@ io.opentdf.nifi nifi-pom - 0.6.0 + 0.7.0-SNAPSHOT nifi-tdf-processors nifi-tdf-processors @@ -19,7 +19,7 @@ ${project.groupId} nifi-tdf-controller-services-api - 0.6.0 + 0.7.0-SNAPSHOT org.apache.nifi diff --git a/pom.xml b/pom.xml index 501d1aa..ff353d3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.opentdf.nifi nifi-pom - 0.6.0 + 0.7.0-SNAPSHOT nifi-pom NiFi processors for OpenTDF https://github.com/opentdf/nifi diff --git a/versions.txt b/versions.txt index 2b89896..dca66e9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -nifi:0.6.0:0.6.0 \ No newline at end of file +nifi:0.6.0:0.7.0-SNAPSHOT \ No newline at end of file