Skip to content

Commit f578e25

Browse files
authored
fix: don't use release profile for phoenix build (#843)
1 parent 4f57e94 commit f578e25

File tree

3 files changed

+50
-51
lines changed

3 files changed

+50
-51
lines changed

hbase/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ mvn \
248248
-Dhadoop.version=${HADOOP} \
249249
-DskipTests \
250250
-Dcheckstyle.skip=true \
251-
-Prelease \
252251
-fphoenix-${PHOENIX}-src \
253252
clean \
254253
package
Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
diff --git a/pom.xml b/pom.xml
2-
index bce2398..92d92f1 100644
2+
index bce2398..4abcb5a 100644
33
--- a/pom.xml
44
+++ b/pom.xml
5-
@@ -1744,6 +1744,23 @@
6-
<id>release</id>
7-
<build>
8-
<plugins>
9-
+ <plugin>
10-
+ <groupId>org.cyclonedx</groupId>
11-
+ <artifactId>cyclonedx-maven-plugin</artifactId>
12-
+ <version>2.8.0</version>
13-
+ <configuration>
14-
+ <projectType>application</projectType>
15-
+ <schemaVersion>1.5</schemaVersion>
16-
+ </configuration>
17-
+ <executions>
18-
+ <execution>
19-
+ <goals>
20-
+ <goal>makeBom</goal>
21-
+ </goals>
22-
+ <phase>package</phase>
23-
+ </execution>
24-
+ </executions>
25-
+ </plugin>
26-
<plugin>
27-
<groupId>org.apache.rat</groupId>
28-
<artifactId>apache-rat-plugin</artifactId>
5+
@@ -680,6 +680,23 @@
6+
<extensions>true</extensions>
7+
<inherited>true</inherited>
8+
</plugin>
9+
+ <plugin>
10+
+ <groupId>org.cyclonedx</groupId>
11+
+ <artifactId>cyclonedx-maven-plugin</artifactId>
12+
+ <version>2.8.0</version>
13+
+ <configuration>
14+
+ <projectType>application</projectType>
15+
+ <schemaVersion>1.5</schemaVersion>
16+
+ </configuration>
17+
+ <executions>
18+
+ <execution>
19+
+ <goals>
20+
+ <goal>makeBom</goal>
21+
+ </goals>
22+
+ <phase>package</phase>
23+
+ </execution>
24+
+ </executions>
25+
+ </plugin>
26+
</plugins>
27+
</build>
28+
Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
diff --git a/pom.xml b/pom.xml
2-
index e3d5b9a..503a8b3 100644
2+
index e3d5b9a..8a5cfdc 100644
33
--- a/pom.xml
44
+++ b/pom.xml
5-
@@ -1833,6 +1833,23 @@
6-
</execution>
7-
</executions>
8-
</plugin>
9-
+ <plugin>
10-
+ <groupId>org.cyclonedx</groupId>
11-
+ <artifactId>cyclonedx-maven-plugin</artifactId>
12-
+ <version>2.8.0</version>
13-
+ <configuration>
14-
+ <projectType>application</projectType>
15-
+ <schemaVersion>1.5</schemaVersion>
16-
+ </configuration>
17-
+ <executions>
18-
+ <execution>
19-
+ <goals>
20-
+ <goal>makeBom</goal>
21-
+ </goals>
22-
+ <phase>package</phase>
23-
+ </execution>
24-
+ </executions>
25-
+ </plugin>
26-
</plugins>
27-
</build>
28-
</profile>
5+
@@ -685,6 +685,23 @@
6+
<extensions>true</extensions>
7+
<inherited>true</inherited>
8+
</plugin>
9+
+ <plugin>
10+
+ <groupId>org.cyclonedx</groupId>
11+
+ <artifactId>cyclonedx-maven-plugin</artifactId>
12+
+ <version>2.8.0</version>
13+
+ <configuration>
14+
+ <projectType>application</projectType>
15+
+ <schemaVersion>1.5</schemaVersion>
16+
+ </configuration>
17+
+ <executions>
18+
+ <execution>
19+
+ <goals>
20+
+ <goal>makeBom</goal>
21+
+ </goals>
22+
+ <phase>package</phase>
23+
+ </execution>
24+
+ </executions>
25+
+ </plugin>
26+
</plugins>
27+
</build>
28+

0 commit comments

Comments
 (0)