Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion hbase/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ mvn \
-Dhadoop.version=${HADOOP} \
-DskipTests \
-Dcheckstyle.skip=true \
-Prelease \
-fphoenix-${PHOENIX}-src \
clean \
package
Expand Down
50 changes: 25 additions & 25 deletions hbase/stackable/patches/phoenix/5.2.0/01-cyclonedx-plugin.patch
Original file line number Diff line number Diff line change
@@ -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 @@
<id>release</id>
<build>
<plugins>
+ <plugin>
+ <groupId>org.cyclonedx</groupId>
+ <artifactId>cyclonedx-maven-plugin</artifactId>
+ <version>2.8.0</version>
+ <configuration>
+ <projectType>application</projectType>
+ <schemaVersion>1.5</schemaVersion>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>makeBom</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@ -680,6 +680,23 @@
<extensions>true</extensions>
<inherited>true</inherited>
</plugin>
+ <plugin>
+ <groupId>org.cyclonedx</groupId>
+ <artifactId>cyclonedx-maven-plugin</artifactId>
+ <version>2.8.0</version>
+ <configuration>
+ <projectType>application</projectType>
+ <schemaVersion>1.5</schemaVersion>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>makeBom</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>

Original file line number Diff line number Diff line change
@@ -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 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.cyclonedx</groupId>
+ <artifactId>cyclonedx-maven-plugin</artifactId>
+ <version>2.8.0</version>
+ <configuration>
+ <projectType>application</projectType>
+ <schemaVersion>1.5</schemaVersion>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>makeBom</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
@@ -685,6 +685,23 @@
<extensions>true</extensions>
<inherited>true</inherited>
</plugin>
+ <plugin>
+ <groupId>org.cyclonedx</groupId>
+ <artifactId>cyclonedx-maven-plugin</artifactId>
+ <version>2.8.0</version>
+ <configuration>
+ <projectType>application</projectType>
+ <schemaVersion>1.5</schemaVersion>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>makeBom</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>

Loading