You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2026/05/26 18:58:38 UTC

(db-jdo) branch main updated: JDO-847: fix spdx warnings with java8 and java11 (#125)

This is an automated email from the ASF dual-hosted git repository.

mboapache pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/db-jdo.git


The following commit(s) were added to refs/heads/main by this push:
     new 60c77b6f JDO-847: fix spdx warnings with java8 and java11 (#125)
60c77b6f is described below

commit 60c77b6fc5b3f3ba712ca14689be545f36599aa5
Author: Michael Bouschen <mb...@apache.org>
AuthorDate: Tue May 26 20:58:33 2026 +0200

    JDO-847: fix spdx warnings with java8 and java11 (#125)
---
 parent-pom/pom.xml | 121 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 88 insertions(+), 33 deletions(-)

diff --git a/parent-pom/pom.xml b/parent-pom/pom.xml
index 79fba997..9847f7ee 100644
--- a/parent-pom/pom.xml
+++ b/parent-pom/pom.xml
@@ -182,7 +182,6 @@
         <version.maven-bundle-plugin>5.1.9</version.maven-bundle-plugin>
         <version.fmt-maven-plugin>2.29</version.fmt-maven-plugin>
         <version.cyclonedx-maven-plugin>2.9.1</version.cyclonedx-maven-plugin>
-        <version.spdx-maven-plugin>1.0.3</version.spdx-maven-plugin>
     </properties>
 
     <dependencyManagement>
@@ -308,30 +307,6 @@
                         <outputFormat>json</outputFormat>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>org.spdx</groupId>
-                    <artifactId>spdx-maven-plugin</artifactId>
-                    <version>${version.spdx-maven-plugin}</version>
-                    <executions>
-                        <execution>
-                            <id>build-sbom-spdx</id>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>createSPDX</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <configuration>
-                        <outputFormat>JSON</outputFormat>
-                        <spdxFile>${project.build.directory}/${project.artifactId}-${project.version}-spdx.json</spdxFile>
-                        <defaultFileCopyright>Copyright (c) 2005-2025 The Apache Software Foundation</defaultFileCopyright>
-                        <defaultLicenseInformationInFile>Apache-2.0</defaultLicenseInformationInFile>
-                        <defaultFileConcludedLicense>Apache-2.0</defaultFileConcludedLicense>
-                        <licenseDeclared>Apache-2.0</licenseDeclared>
-                        <includeTestScope>false</includeTestScope>
-                        <sbomType>consolidated</sbomType>
-                    </configuration>
-                </plugin>
             </plugins>
         </pluginManagement>
 
@@ -487,22 +462,102 @@
         </profile>
 
         <profile>
-            <id>jdk8-plugin-fix-version</id>
+            <id>jdk8-spdx-plugin</id>
             <activation>
                 <jdk>[1.8,1.9)</jdk>
             </activation>
-            <properties>
-                <version.spdx-maven-plugin>0.6.3</version.spdx-maven-plugin>
-            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.spdx</groupId>
+                        <artifactId>spdx-maven-plugin</artifactId>
+                        <version>0.6.3</version>
+                        <executions>
+                            <execution>
+                              <id>build-sbom-spdx</id>
+                              <phase>package</phase>
+                              <goals>
+                                  <goal>createSPDX</goal>
+                              </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <outputFormat>JSON</outputFormat>
+                            <spdxFile>${project.build.directory}/${project.artifactId}-${project.version}-spdx.json</spdxFile>
+                            <defaultFileCopyright>Copyright (c) 2005-2025 The Apache Software Foundation</defaultFileCopyright>
+                            <defaultLicenseInformationInFile>Apache-2.0</defaultLicenseInformationInFile>
+                            <defaultFileConcludedLicense>Apache-2.0</defaultFileConcludedLicense>
+                            <licenseDeclared>Apache-2.0</licenseDeclared>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
         <profile>
-            <id>jdk11-plugin-fix-version</id>
+            <id>jdk11-spdx-plugin</id>
             <activation>
                 <jdk>[11,17)</jdk>
             </activation>
-            <properties>
-                <version.spdx-maven-plugin>0.7.4</version.spdx-maven-plugin>
-            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.spdx</groupId>
+                        <artifactId>spdx-maven-plugin</artifactId>
+                        <version>0.7.4</version>
+                        <executions>
+                            <execution>
+                              <id>build-sbom-spdx</id>
+                              <phase>package</phase>
+                              <goals>
+                                  <goal>createSPDX</goal>
+                              </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <outputFormat>JSON</outputFormat>
+                            <spdxFile>${project.build.directory}/${project.artifactId}-${project.version}-spdx.json</spdxFile>
+                            <defaultFileCopyright>Copyright (c) 2005-2025 The Apache Software Foundation</defaultFileCopyright>
+                            <defaultLicenseInformationInFile>Apache-2.0</defaultLicenseInformationInFile>
+                            <defaultFileConcludedLicense>Apache-2.0</defaultFileConcludedLicense>
+                            <licenseDeclared>Apache-2.0</licenseDeclared>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>jdk17-spdx-plugin</id>
+            <activation>
+                <jdk>[17,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.spdx</groupId>
+                        <artifactId>spdx-maven-plugin</artifactId>
+                        <version>1.0.3</version>
+                        <executions>
+                            <execution>
+                              <id>build-sbom-spdx</id>
+                              <phase>package</phase>
+                              <goals>
+                                  <goal>createSPDX</goal>
+                              </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <outputFormat>JSON</outputFormat>
+                            <spdxFile>${project.build.directory}/${project.artifactId}-${project.version}-spdx.json</spdxFile>
+                            <defaultFileCopyright>Copyright (c) 2005-2025 The Apache Software Foundation</defaultFileCopyright>
+                            <defaultLicenseInformationInFile>Apache-2.0</defaultLicenseInformationInFile>
+                            <defaultFileConcludedLicense>Apache-2.0</defaultFileConcludedLicense>
+                            <licenseDeclared>Apache-2.0</licenseDeclared>
+                            <includeTestScope>false</includeTestScope>
+                            <sbomType>consolidated</sbomType>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
     </profiles>
 </project>