This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git
The following commit(s) were added to refs/heads/master by this push:
new a7ad5ac58 AVRO-3700: Move CycloneDX configuration to Java specific
project (#2049)
a7ad5ac58 is described below
commit a7ad5ac5858fef5edc45671f77c7f06ed37a51cc
Author: Ismaël Mejía <[email protected]>
AuthorDate: Fri Jan 6 12:51:40 2023 +0100
AVRO-3700: Move CycloneDX configuration to Java specific project (#2049)
---
lang/java/pom.xml | 18 ++++++++++++++++++
pom.xml | 13 -------------
2 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index 18af2866a..9bb875cab 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -67,6 +67,7 @@
<file-management.version>3.1.0</file-management.version>
<javacc-plugin.version>3.0.3</javacc-plugin.version>
<javacc.version>7.0.12</javacc.version>
+ <cyclonedx-maven-plugin.version>2.7.3</cyclonedx-maven-plugin.version>
</properties>
<modules>
@@ -233,6 +234,11 @@
<artifactId>spotless-maven-plugin</artifactId>
<version>${spotless-maven-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.cyclonedx</groupId>
+ <artifactId>cyclonedx-maven-plugin</artifactId>
+ <version>${cyclonedx-maven-plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -320,6 +326,18 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.cyclonedx</groupId>
+ <artifactId>cyclonedx-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>makeBom</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/pom.xml b/pom.xml
index 3dc714fce..c1865847d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,19 +248,6 @@
<goalPrefix>avro</goalPrefix>
</configuration>
</plugin>
- <plugin>
- <groupId>org.cyclonedx</groupId>
- <artifactId>cyclonedx-maven-plugin</artifactId>
- <version>2.7.3</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>makeBom</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
