diff --git a/hbase/Dockerfile b/hbase/Dockerfile index 29abe4b0d..4b6e937a5 100644 --- a/hbase/Dockerfile +++ b/hbase/Dockerfile @@ -248,7 +248,6 @@ mvn \ -Dhadoop.version=${HADOOP} \ -DskipTests \ -Dcheckstyle.skip=true \ - -Prelease \ -fphoenix-${PHOENIX}-src \ clean \ package diff --git a/hbase/stackable/patches/phoenix/5.2.0/01-cyclonedx-plugin.patch b/hbase/stackable/patches/phoenix/5.2.0/01-cyclonedx-plugin.patch index 3fccf5871..009c2fbc3 100644 --- a/hbase/stackable/patches/phoenix/5.2.0/01-cyclonedx-plugin.patch +++ b/hbase/stackable/patches/phoenix/5.2.0/01-cyclonedx-plugin.patch @@ -1,28 +1,28 @@ diff --git a/pom.xml b/pom.xml -index bce2398..92d92f1 100644 +index bce2398..4abcb5a 100644 --- a/pom.xml +++ b/pom.xml -@@ -1744,6 +1744,23 @@ - release - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ -+ -+ -+ -+ makeBom -+ -+ package -+ -+ -+ - - org.apache.rat - apache-rat-plugin +@@ -680,6 +680,23 @@ + true + true + ++ ++ org.cyclonedx ++ cyclonedx-maven-plugin ++ 2.8.0 ++ ++ application ++ 1.5 ++ ++ ++ ++ ++ makeBom ++ ++ package ++ ++ ++ + + + diff --git a/hbase/stackable/patches/phoenix/5.3.0-4afe457/01-cyclonedx-plugin.patch b/hbase/stackable/patches/phoenix/5.3.0-4afe457/01-cyclonedx-plugin.patch index a24e62bb7..7afc50190 100644 --- a/hbase/stackable/patches/phoenix/5.3.0-4afe457/01-cyclonedx-plugin.patch +++ b/hbase/stackable/patches/phoenix/5.3.0-4afe457/01-cyclonedx-plugin.patch @@ -1,28 +1,28 @@ diff --git a/pom.xml b/pom.xml -index e3d5b9a..503a8b3 100644 +index e3d5b9a..8a5cfdc 100644 --- a/pom.xml +++ b/pom.xml -@@ -1833,6 +1833,23 @@ - - - -+ -+ org.cyclonedx -+ cyclonedx-maven-plugin -+ 2.8.0 -+ -+ application -+ 1.5 -+ -+ -+ -+ -+ makeBom -+ -+ package -+ -+ -+ - - - +@@ -685,6 +685,23 @@ + true + true + ++ ++ org.cyclonedx ++ cyclonedx-maven-plugin ++ 2.8.0 ++ ++ application ++ 1.5 ++ ++ ++ ++ ++ makeBom ++ ++ package ++ ++ ++ + + +