Update to CP 54

Disable CycloneDX as config is incorrect for multi-module builds.

Override ciManagement section from the parent.

Set commons.release.isDistModule to false in the parent.

Add rat exclusion for .gitattributes.
This commit is contained in:
aherbert 2022-10-13 11:42:44 +01:00
parent 5a8234a2fe
commit e59397ba10
1 changed files with 15 additions and 2 deletions

17
pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId> <artifactId>commons-parent</artifactId>
<version>53</version> <version>54</version>
</parent> </parent>
<artifactId>commons-math-parent</artifactId> <artifactId>commons-math-parent</artifactId>
@ -46,6 +46,8 @@
<commons.osgi.symbolicName>org.apache.commons.math4</commons.osgi.symbolicName> <commons.osgi.symbolicName>org.apache.commons.math4</commons.osgi.symbolicName>
<!-- OSGi --> <!-- OSGi -->
<commons.osgi.export>org.apache.commons.math4</commons.osgi.export> <commons.osgi.export>org.apache.commons.math4</commons.osgi.export>
<!-- This flag should only be true in the dist-archive module. -->
<commons.release.isDistModule>false</commons.release.isDistModule>
<!-- do not use snapshot suffix here --> <!-- do not use snapshot suffix here -->
<commons.release.version>4.0</commons.release.version> <commons.release.version>4.0</commons.release.version>
<commons.release.desc>(requires Java 8+)</commons.release.desc> <commons.release.desc>(requires Java 8+)</commons.release.desc>
@ -72,6 +74,8 @@
<math.antrun.version>1.8</math.antrun.version> <math.antrun.version>1.8</math.antrun.version>
<!-- Workaround to avoid duplicating config files. --> <!-- Workaround to avoid duplicating config files. -->
<math.parent.dir>${basedir}</math.parent.dir> <math.parent.dir>${basedir}</math.parent.dir>
<!-- Multi-module support fixed in commons-parent 55 -->
<cyclonedx.skip>true</cyclonedx.skip>
<!-- Increase from commons-parent --> <!-- Increase from commons-parent -->
<commons.jacoco.methodRatio>1.00</commons.jacoco.methodRatio> <commons.jacoco.methodRatio>1.00</commons.jacoco.methodRatio>
@ -134,11 +138,17 @@
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-math.git</developerConnection> <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/commons-math.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf/commons-math.git</url> <url>https://gitbox.apache.org/repos/asf/commons-math.git</url>
</scm> </scm>
<issueManagement> <issueManagement>
<system>jira</system> <system>jira</system>
<url>https://issues.apache.org/jira/browse/MATH</url> <url>https://issues.apache.org/jira/browse/MATH</url>
</issueManagement> </issueManagement>
<ciManagement>
<system>GitHub</system>
<url>https://github.com/apache/commons-math/actions</url>
</ciManagement>
<distributionManagement> <distributionManagement>
<site> <site>
<id>apache.website</id> <id>apache.website</id>
@ -413,6 +423,8 @@
<exclude>src/site/resources/release-notes/RELEASE-NOTES-*.txt</exclude> <exclude>src/site/resources/release-notes/RELEASE-NOTES-*.txt</exclude>
<exclude>dist-archive/**</exclude> <exclude>dist-archive/**</exclude>
<exclude>**/site-content/**</exclude> <exclude>**/site-content/**</exclude>
<!-- Moved to commons-parent 55 -->
<exclude>.gitattributes</exclude>
<!-- MANIFEST files cannot have any comments, so we can't put license header --> <!-- MANIFEST files cannot have any comments, so we can't put license header -->
<exclude>src/test/maxima/special/RealFunctionValidation/MANIFEST.txt</exclude> <exclude>src/test/maxima/special/RealFunctionValidation/MANIFEST.txt</exclude>
@ -434,7 +446,6 @@
<!-- direction numbers for Sobol generation from Frances Y. Kuo and Stephen Joe, <!-- direction numbers for Sobol generation from Frances Y. Kuo and Stephen Joe,
available under a BSD-style license (see LICENSE.txt) --> available under a BSD-style license (see LICENSE.txt) -->
<exclude>src/main/resources/assets/org/apache/commons/math4/legacy/random/new-joe-kuo-6.21201</exclude> <exclude>src/main/resources/assets/org/apache/commons/math4/legacy/random/new-joe-kuo-6.21201</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>
@ -492,6 +503,8 @@
<exclude>src/site/resources/release-notes/RELEASE-NOTES-*.txt</exclude> <exclude>src/site/resources/release-notes/RELEASE-NOTES-*.txt</exclude>
<exclude>dist-archive/**</exclude> <exclude>dist-archive/**</exclude>
<exclude>**/site-content/**</exclude> <exclude>**/site-content/**</exclude>
<!-- Moved to commons-parent 55 -->
<exclude>.gitattributes</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>