This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new de17643e31 GH-43229: [Java] Update Maven project info (#43231)
de17643e31 is described below
commit de17643e3176d821e02873c776ee91f6e53d3314
Author: Laurent Goujon <[email protected]>
AuthorDate: Wed Jul 17 02:04:37 2024 +0200
GH-43229: [Java] Update Maven project info (#43231)
### Rationale for this change
Some Maven modules are missing project information like the website url,
the mailing lists, and scm and issues url
Other may have incorrect links because of the way Maven interpolates those
values at build time
### What changes are included in this PR?
Update/Fix Maven project information for all modules:
* Add project url, mailing lists, scm and issueManagement information to
bom and maven parent modules
* Fix top-level parent by preventing Maven to rewrite project url, and scm
connections/urls based on the module hierarchy
* Change project.scm.tag to `main` and update version change script to also
change the tag value to `apache-arrow-${version}`
### Are these changes tested?
CI/CD only
### Are there any user-facing changes?
No
* GitHub Issue: #43229
Authored-by: Laurent Goujon <[email protected]>
Signed-off-by: David Li <[email protected]>
---
dev/release/01-prepare-test.rb | 11 ++++++++++
dev/release/utils-prepare.sh | 9 ++++++--
java/bom/pom.xml | 50 +++++++++++++++++++++++++++++++++++++++++-
java/maven/pom.xml | 50 +++++++++++++++++++++++++++++++++++++++++-
java/pom.xml | 25 +++++++++++++++------
5 files changed, 134 insertions(+), 11 deletions(-)
diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index fbd0b29960..fec99ef058 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -323,6 +323,17 @@ class PrepareTest < Test::Unit::TestCase
"+#{new_line}",
]
end
+ tag = "<tag>main</tag>"
+ target_lines = lines.grep(/#{Regexp.escape(tag)}/)
+ target_lines.each do |line|
+ new_line = line.gsub("main") do
+ "apache-arrow-#{@release_version}"
+ end
+ hunks << [
+ "-#{line}",
+ "+#{new_line}",
+ ]
+ end
expected_changes << {hunks: hunks, path: path}
end
diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
index c255e728a3..760a7f404a 100644
--- a/dev/release/utils-prepare.sh
+++ b/dev/release/utils-prepare.sh
@@ -83,8 +83,13 @@ update_versions() {
popd
pushd "${ARROW_DIR}/java"
- mvn versions:set -DnewVersion=${version} -DprocessAllModules
- find . -type f -name pom.xml.versionsBackup -delete
+ mvn versions:set -DnewVersion=${version} -DprocessAllModules
-DgenerateBackupPoms=false
+ if [ "${type}" = "release" ]; then
+ # versions-maven-plugin:set-scm-tag does not update the whole reactor.
Invoking separately
+ mvn versions:set-scm-tag -DnewTag=apache-arrow-${version}
-DgenerateBackupPoms=false -pl :arrow-java-root
+ mvn versions:set-scm-tag -DnewTag=apache-arrow-${version}
-DgenerateBackupPoms=false -pl :arrow-bom
+ mvn versions:set-scm-tag -DnewTag=apache-arrow-${version}
-DgenerateBackupPoms=false -pl :arrow-maven-plugins
+ fi
git add "pom.xml"
git add "**/pom.xml"
popd
diff --git a/java/bom/pom.xml b/java/bom/pom.xml
index b0fe96d6d5..e51906cd77 100644
--- a/java/bom/pom.xml
+++ b/java/bom/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
child.project.url.inherit.append.path="false"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,8 +30,51 @@ under the License.
<artifactId>arrow-bom</artifactId>
<version>18.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+
<name>Arrow Bill of Materials</name>
<description>Arrow Bill of Materials</description>
+ <url>https://arrow.apache.org/</url>
+
+ <mailingLists>
+ <mailingList>
+ <name>Developer List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
+
<archive>https://lists.apache.org/[email protected]</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commits List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
+
<archive>https://lists.apache.org/[email protected]</archive>
+ </mailingList>
+ <mailingList>
+ <name>Issues List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+
<archive>https://lists.apache.org/[email protected]</archive>
+ </mailingList>
+ <mailingList>
+ <name>GitHub List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+
<archive>https://lists.apache.org/[email protected]</archive>
+ </mailingList>
+ </mailingLists>
+
+ <scm child.scm.connection.inherit.append.path="false"
child.scm.developerConnection.inherit.append.path="false"
child.scm.url.inherit.append.path="false">
+ <connection>scm:git:https://github.com/apache/arrow.git</connection>
+
<developerConnection>scm:git:https://github.com/apache/arrow.git</developerConnection>
+ <tag>main</tag>
+ <url>https://github.com/apache/arrow/tree/${project.scm.tag}</url>
+ </scm>
+
+ <issueManagement>
+ <system>GitHub</system>
+ <url>https://github.com/apache/arrow/issues</url>
+ </issueManagement>
<properties>
<arrow.vector.classifier></arrow.vector.classifier>
@@ -169,6 +212,11 @@ under the License.
<artifactId>spotless-maven-plugin</artifactId>
<version>2.30.0</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <version>2.17.0</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
diff --git a/java/maven/pom.xml b/java/maven/pom.xml
index efa074deec..d342b62935 100644
--- a/java/maven/pom.xml
+++ b/java/maven/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
child.project.url.inherit.append.path="false"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<!--
Note: Do not inherit from the Arrow parent POM as plugins can be referenced
@@ -34,12 +34,55 @@ under the License.
<artifactId>arrow-maven-plugins</artifactId>
<version>18.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+
<name>Arrow Maven Plugins</name>
+ <url>https://arrow.apache.org/</url>
+
+ <mailingLists>
+ <mailingList>
+ <name>Developer List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
+
<archive>https://lists.apache.org/[email protected]</archive>
+ </mailingList>
+ <mailingList>
+ <name>Commits List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
+
<archive>https://lists.apache.org/[email protected]</archive>
+ </mailingList>
+ <mailingList>
+ <name>Issues List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+
<archive>https://lists.apache.org/[email protected]</archive>
+ </mailingList>
+ <mailingList>
+ <name>GitHub List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+
<archive>https://lists.apache.org/[email protected]</archive>
+ </mailingList>
+ </mailingLists>
<modules>
<module>module-info-compiler-maven-plugin</module>
</modules>
+ <scm child.scm.connection.inherit.append.path="false"
child.scm.developerConnection.inherit.append.path="false"
child.scm.url.inherit.append.path="false">
+ <connection>scm:git:https://github.com/apache/arrow.git</connection>
+
<developerConnection>scm:git:https://github.com/apache/arrow.git</developerConnection>
+ <tag>main</tag>
+ <url>https://github.com/apache/arrow/tree/${project.scm.tag}</url>
+ </scm>
+
+ <issueManagement>
+ <system>GitHub</system>
+ <url>https://github.com/apache/arrow/issues</url>
+ </issueManagement>
+
<properties>
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
<!-- org.apache:apache overrides -->
@@ -75,6 +118,11 @@ under the License.
<artifactId>cyclonedx-maven-plugin</artifactId>
<version>2.8.0</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <version>2.17.0</version>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
diff --git a/java/pom.xml b/java/pom.xml
index f3f7432ba6..4ce0c1981d 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -17,7 +17,7 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
child.project.url.inherit.append.path="false"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -41,20 +41,26 @@ under the License.
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
- <archive>https://mail-archives.apache.org/mod_mbox/arrow-dev/</archive>
+
<archive>https://lists.apache.org/[email protected]</archive>
</mailingList>
<mailingList>
<name>Commits List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
-
<archive>https://mail-archives.apache.org/mod_mbox/arrow-commits/</archive>
+
<archive>https://lists.apache.org/[email protected]</archive>
</mailingList>
<mailingList>
<name>Issues List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
-
<archive>https://mail-archives.apache.org/mod_mbox/arrow-issues/</archive>
+
<archive>https://lists.apache.org/[email protected]</archive>
+ </mailingList>
+ <mailingList>
+ <name>GitHub List</name>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+
<archive>https://lists.apache.org/[email protected]</archive>
</mailingList>
</mailingLists>
@@ -73,11 +79,11 @@ under the License.
<module>compression</module>
</modules>
- <scm>
+ <scm child.scm.connection.inherit.append.path="false"
child.scm.developerConnection.inherit.append.path="false"
child.scm.url.inherit.append.path="false">
<connection>scm:git:https://github.com/apache/arrow.git</connection>
<developerConnection>scm:git:https://github.com/apache/arrow.git</developerConnection>
- <tag>apache-arrow-2.0.0</tag>
- <url>https://github.com/apache/arrow</url>
+ <tag>main</tag>
+ <url>https://github.com/apache/arrow/tree/${project.scm.tag}</url>
</scm>
<issueManagement>
@@ -507,6 +513,11 @@ under the License.
<artifactId>exec-maven-plugin</artifactId>
<version>3.3.0</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <version>2.17.0</version>
+ </plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
