You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2025/02/01 21:29:49 UTC
(commons-build-plugin) branch master updated (f638b05 -> 335863f)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-build-plugin.git
from f638b05 Bump actions/setup-java from 4.6.0 to 4.7.0 (#349)
new 9d5bc3d Spaces, not tabs
new 13e54f3 Move properties section up
new ba8a187 Refactor version for Maven core plugin dependencies into a new property commons.maven.version
new 335863f Refactor unnamed profile into two for JavaScript dependency: java-11 and java-17-plus
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 112 ++++++++++++++++++++++++++++++------------------
src/changes/changes.xml | 2 +
2 files changed, 73 insertions(+), 41 deletions(-)
(commons-build-plugin) 04/04: Refactor unnamed profile into two for JavaScript dependency: java-11 and java-17-plus
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-build-plugin.git
commit 335863f57414b3eb504c4a2cf282fa76fc7c3d01
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Sat Feb 1 16:29:45 2025 -0500
Refactor unnamed profile into two for JavaScript dependency: java-11 and
java-17-plus
---
pom.xml | 39 ++++++++++++++++++++++++++++++++++-----
src/changes/changes.xml | 1 +
2 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 095a6a4..751dcd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,9 +84,6 @@
commons.releaseManagerName
commons.releaseManagerKey
-->
- <!-- JS for Java 11+ (see profiles) -->
- <graalvm.version>23.0.7</graalvm.version>
- <graalvm.js.version>24.1.2</graalvm.js.version>
<!-- moditect currently fails. Disable the check until we need to use Java plugins -->
<moditect.skip>true</moditect.skip>
<!-- Not needed for plugins intended for developer use only -->
@@ -239,9 +236,13 @@
</reporting>
<profiles>
<profile>
+ <id>java-11</id>
<activation>
- <jdk>[11,)</jdk>
+ <jdk>[11,17)</jdk>
</activation>
+ <properties>
+ <graalvm.version>22.3.3</graalvm.version>
+ </properties>
<dependencies>
<dependency>
<groupId>org.graalvm.js</groupId>
@@ -251,7 +252,35 @@
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js-scriptengine</artifactId>
- <version>${graalvm.js.version}</version>
+ <version>${graalvm.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>java-17-plus</id>
+ <activation>
+ <jdk>[17,)</jdk>
+ </activation>
+ <properties>
+ <graalvm.version>24.1.2</graalvm.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.graalvm.polyglot</groupId>
+ <artifactId>js</artifactId>
+ <version>${graalvm.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.graalvm.polyglot</groupId>
+ <artifactId>polyglot</artifactId>
+ <version>${graalvm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.graalvm.js</groupId>
+ <artifactId>js-scriptengine</artifactId>
+ <version>${graalvm.version}</version>
</dependency>
</dependencies>
</profile>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index f86ee9d..7c60edb 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -32,6 +32,7 @@
<action type="fix" dev="ggregory" due-to="Gary Gregory">Remove -nouses directive from maven-bundle-plugin. OSGi package imports now state 'uses' definitions for package imports, this doesn't affect JPMS (from org.apache.commons:commons-parent:80).</action>
<!-- ADD -->
<action type="add" dev="ggregory" due-to="Gary Gregory">Refactor version for Maven core plugin dependencies into a new property commons.maven.version.</action>
+ <action type="add" dev="ggregory" due-to="Gary Gregory">Refactor unnamed profile into two for JavaScript dependency: java-11 and java-17-plus.</action>
<!-- UPDATE -->
<action dev="ggregory" type="update" due-to="Dependabot, Gary Gregory">Bump org.graalvm.js:js from 23.0.6 to 23.0.7 #347.</action>
<action dev="ggregory" type="update" due-to="Dependabot, Gary Gregory">Bump org.graalvm.js:js-scriptengine from 24.1.1 to 24.1.2 #346.</action>
(commons-build-plugin) 01/04: Spaces, not tabs
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-build-plugin.git
commit 9d5bc3d3ae5bc0236532c3db27b999f74804c64b
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Sat Feb 1 15:56:34 2025 -0500
Spaces, not tabs
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 469606a..8f941dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -239,7 +239,7 @@
<profiles>
<profile>
<activation>
- <jdk>[11,)</jdk>
+ <jdk>[11,)</jdk>
</activation>
<dependencies>
<dependency>
(commons-build-plugin) 02/04: Move properties section up
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-build-plugin.git
commit 13e54f3593cd26c6ece4ccd79440faaa6a7f0a8b
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Sat Feb 1 16:00:37 2025 -0500
Move properties section up
---
pom.xml | 74 ++++++++++++++++++++++++++++++++---------------------------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8f941dd..3e0b4d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,43 @@
<url>scm:svn:${commons.scmPubUrl}</url>
</site>
</distributionManagement>
+ <properties>
+ <enforcer.skip>true</enforcer.skip>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <commons.manifestfile/>
+ <commons.componentid>build-plugin</commons.componentid>
+ <commons.jira.id>COMMONSSITE</commons.jira.id>
+ <commons.jira.pid>12310466&amp;component=12312401</commons.jira.pid>
+ <commons.site.path>commons-${commons.componentid}</commons.site.path>
+ <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/${commons.site.path}</commons.scmPubUrl>
+ <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
+ <!-- Commons Release Plugin -->
+ <commons.bc.version>1.14.1</commons.bc.version>
+ <commons.release.version>1.15.0</commons.release.version>
+ <commons.release.next>1.15.1</commons.release.next>
+ <!-- Previous version of the component (used for reporting binary compatibility check)-->
+ <commons.rc.version>RC1</commons.rc.version>
+ <commons.release.isDistModule>true</commons.release.isDistModule>
+ <commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
+ <!--
+ Define the following in ~/.m2/settings.xml in an active profile:
+ (or provide them on the command line)
+ commons.releaseManagerName
+ commons.releaseManagerKey
+ -->
+ <!-- JS for Java 11+ (see profiles) -->
+ <graalvm.version>23.0.7</graalvm.version>
+ <graalvm.js.version>24.1.2</graalvm.js.version>
+ <!-- moditect currently fails. Disable the check until we need to use Java plugins -->
+ <moditect.skip>true</moditect.skip>
+ <!-- Not needed for plugins intended for developer use only -->
+ <cyclonedx.skip>true</cyclonedx.skip>
+ <!-- Not available until version 0.7.1 -->
+ <spdx.skip>true</spdx.skip>
+ <!-- project.build.outputTimestamp is managed by Maven plugins, see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
+ <project.build.outputTimestamp>2025-01-11T13:42:07Z</project.build.outputTimestamp>
+ </properties>
<dependencies>
<dependency>
<!-- Try to deal with https://bz.apache.org/bugzilla/show_bug.cgi?id=66951 -->
@@ -199,43 +236,6 @@
</plugin>
</plugins>
</reporting>
- <properties>
- <enforcer.skip>true</enforcer.skip>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <commons.manifestfile/>
- <commons.componentid>build-plugin</commons.componentid>
- <commons.jira.id>COMMONSSITE</commons.jira.id>
- <commons.jira.pid>12310466&amp;component=12312401</commons.jira.pid>
- <commons.site.path>commons-${commons.componentid}</commons.site.path>
- <commons.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/commons/content/proper/${commons.site.path}</commons.scmPubUrl>
- <commons.scmPubCheckoutDirectory>site-content</commons.scmPubCheckoutDirectory>
- <!-- Commons Release Plugin -->
- <commons.bc.version>1.14.1</commons.bc.version>
- <commons.release.version>1.15.0</commons.release.version>
- <commons.release.next>1.15.1</commons.release.next>
- <!-- Previous version of the component (used for reporting binary compatibility check)-->
- <commons.rc.version>RC1</commons.rc.version>
- <commons.release.isDistModule>true</commons.release.isDistModule>
- <commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
- <!--
- Define the following in ~/.m2/settings.xml in an active profile:
- (or provide them on the command line)
- commons.releaseManagerName
- commons.releaseManagerKey
- -->
- <!-- JS for Java 11+ (see profiles) -->
- <graalvm.version>23.0.7</graalvm.version>
- <graalvm.js.version>24.1.2</graalvm.js.version>
- <!-- moditect currently fails. Disable the check until we need to use Java plugins -->
- <moditect.skip>true</moditect.skip>
- <!-- Not needed for plugins intended for developer use only -->
- <cyclonedx.skip>true</cyclonedx.skip>
- <!-- Not available until version 0.7.1 -->
- <spdx.skip>true</spdx.skip>
- <!-- project.build.outputTimestamp is managed by Maven plugins, see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
- <project.build.outputTimestamp>2025-01-11T13:42:07Z</project.build.outputTimestamp>
- </properties>
<profiles>
<profile>
<activation>
(commons-build-plugin) 03/04: Refactor version for Maven core plugin dependencies into a new property commons.maven.version
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-build-plugin.git
commit ba8a1870bc9255022db8f7f5a2a2d3c65df9c5ea
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Sat Feb 1 16:02:44 2025 -0500
Refactor version for Maven core plugin dependencies into a new property
commons.maven.version
---
pom.xml | 5 +++--
src/changes/changes.xml | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3e0b4d1..095a6a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,6 +77,7 @@
<commons.rc.version>RC1</commons.rc.version>
<commons.release.isDistModule>true</commons.release.isDistModule>
<commons.distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/${commons.componentid}</commons.distSvnStagingUrl>
+ <commons.maven.version>3.9.9</commons.maven.version>
<!--
Define the following in ~/.m2/settings.xml in an active profile:
(or provide them on the command line)
@@ -106,14 +107,14 @@
<!-- Try to deal with https://bz.apache.org/bugzilla/show_bug.cgi?id=66951 -->
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>3.9.9</version>
+ <version>${commons.maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- Try to deal with https://bz.apache.org/bugzilla/show_bug.cgi?id=66951 -->
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>3.9.9</version>
+ <version>${commons.maven.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4251f4d..f86ee9d 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,7 @@
<action type="fix" dev="ggregory" due-to="Gary Gregory">Migrate site generation templates to https://maven.apache.org/xsd/xdoc-2.0.xsd.</action>
<action type="fix" dev="ggregory" due-to="Gary Gregory">Remove -nouses directive from maven-bundle-plugin. OSGi package imports now state 'uses' definitions for package imports, this doesn't affect JPMS (from org.apache.commons:commons-parent:80).</action>
<!-- ADD -->
+ <action type="add" dev="ggregory" due-to="Gary Gregory">Refactor version for Maven core plugin dependencies into a new property commons.maven.version.</action>
<!-- UPDATE -->
<action dev="ggregory" type="update" due-to="Dependabot, Gary Gregory">Bump org.graalvm.js:js from 23.0.6 to 23.0.7 #347.</action>
<action dev="ggregory" type="update" due-to="Dependabot, Gary Gregory">Bump org.graalvm.js:js-scriptengine from 24.1.1 to 24.1.2 #346.</action>