From b86f172991fa0534a3ac0abad4d9b337207f26fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?JB=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Wed, 13 Dec 2023 15:19:39 +0100
Subject: [PATCH] GH-39214: [Java] Support reproducible build

---
 dev/release/01-prepare-test.rb                | 21 ++++----
 dev/release/post-11-bump-versions-test.rb     | 53 ++++++-------------
 dev/release/test-helper.rb                    | 47 +++++++++++++++-
 java/adapter/avro/pom.xml                     |  4 ++
 java/adapter/jdbc/pom.xml                     |  4 ++
 java/algorithm/pom.xml                        |  4 ++
 java/bom/pom.xml                              |  3 +-
 java/c/pom.xml                                |  1 +
 java/compression/pom.xml                      |  4 ++
 java/dataset/pom.xml                          |  1 +
 java/flight/flight-core/pom.xml               |  3 +-
 java/flight/flight-integration-tests/pom.xml  |  6 ++-
 java/flight/flight-sql-jdbc-core/pom.xml      |  1 +
 java/flight/flight-sql-jdbc-driver/pom.xml    |  4 ++
 java/flight/flight-sql/pom.xml                |  1 +
 java/format/pom.xml                           |  4 ++
 java/gandiva/pom.xml                          |  1 +
 .../module-info-compiler-maven-plugin/pom.xml |  1 +
 java/memory/memory-core/pom.xml               |  4 ++
 java/memory/memory-netty/pom.xml              |  4 ++
 java/memory/memory-unsafe/pom.xml             |  3 ++
 java/performance/pom.xml                      |  1 +
 java/pom.xml                                  | 10 +++-
 java/tools/pom.xml                            |  6 ++-
 java/vector/pom.xml                           |  5 +-
 25 files changed, 142 insertions(+), 54 deletions(-)

diff --git a/dev/release/01-prepare-test.rb b/dev/release/01-prepare-test.rb
index 8fb23f45f0f3a..f4bf01f1f6f9b 100644
--- a/dev/release/01-prepare-test.rb
+++ b/dev/release/01-prepare-test.rb
@@ -264,18 +264,17 @@ def test_version_pre_tag
     end
 
     Dir.glob("java/**/pom.xml") do |path|
-      version = "<version>#{@snapshot_version}</version>"
-      lines = File.readlines(path, chomp: true)
-      target_lines = lines.grep(/#{Regexp.escape(version)}/)
-      hunks = []
-      target_lines.each do |line|
-        new_line = line.gsub(@snapshot_version) do
-          @release_version
+      hunks = generate_hunks(File.readlines(path, chomp: true)) do |line|
+        if line.include?("<version>#{@snapshot_version}</version>")
+          new_line = line.gsub(@snapshot_version) do
+            @release_version
+          end
+          [line, new_line]
+        elsif line.include?("<project.build.outputTimestamp>")
+          [line, normalize_pom_xml_output_timestamp(line)]
+        else
+          [nil, nil]
         end
-        hunks << [
-          "-#{line}",
-          "+#{new_line}",
-        ]
       end
       expected_changes << {hunks: hunks, path: path}
     end
diff --git a/dev/release/post-11-bump-versions-test.rb b/dev/release/post-11-bump-versions-test.rb
index 78d9320bfb312..fd8a74039de99 100644
--- a/dev/release/post-11-bump-versions-test.rb
+++ b/dev/release/post-11-bump-versions-test.rb
@@ -262,37 +262,19 @@ def test_version_post_tag
       end
 
       import_path = "github.com/apache/arrow/go/v#{@snapshot_major_version}"
-      hunks = []
       if release_type == :major
-        lines = File.readlines(path, chomp: true)
-        target_lines = lines.each_with_index.select do |line, i|
-          line.include?(import_path)
-        end
-        next if target_lines.empty?
-        n_context_lines = 3 # The default of Git's diff.context
-        target_hunks = [[target_lines.first[0]]]
-        previous_i = target_lines.first[1]
-        target_lines[1..-1].each do |line, i|
-          if i - previous_i < n_context_lines
-            target_hunks.last << line
-          else
-            target_hunks << [line]
-          end
-          previous_i = i
-        end
-        target_hunks.each do |lines|
-          hunk = []
-          lines.each do |line,|
-            hunk << "-#{line}"
-          end
-          lines.each do |line|
+        hunks = generate_hunks(File.readlines(path, chomp: true)) do |line|
+          if line.include?(import_path)
             new_line = line.gsub("v#{@snapshot_major_version}") do
               "v#{@next_major_version}"
             end
-            hunk << "+#{new_line}"
+            [line, new_line]
+          else
+            [nil, nil]
           end
-          hunks << hunk
         end
+      else
+        hunks = []
       end
       if path == "go/parquet/writer_properties.go"
         hunks << [
@@ -305,18 +287,17 @@ def test_version_post_tag
     end
 
     Dir.glob("java/**/pom.xml") do |path|
-      version = "<version>#{@snapshot_version}</version>"
-      lines = File.readlines(path, chomp: true)
-      target_lines = lines.grep(/#{Regexp.escape(version)}/)
-      hunks = []
-      target_lines.each do |line|
-        new_line = line.gsub(@snapshot_version) do
-          @next_snapshot_version
+      hunks = generate_hunks(File.readlines(path, chomp: true)) do |line|
+        if line.include?("<version>#{@snapshot_version}</version>")
+          new_line = line.gsub(@snapshot_version) do
+            @next_snapshot_version
+          end
+          [line, new_line]
+        elsif line.include?("<project.build.outputTimestamp>")
+          [line, normalize_pom_xml_output_timestamp(line)]
+        else
+          [nil, nil]
         end
-        hunks << [
-          "-#{line}",
-          "+#{new_line}",
-        ]
       end
       expected_changes << {hunks: hunks, path: path}
     end
diff --git a/dev/release/test-helper.rb b/dev/release/test-helper.rb
index 3b2c3aa6e5874..1b840c75a481f 100644
--- a/dev/release/test-helper.rb
+++ b/dev/release/test-helper.rb
@@ -83,15 +83,60 @@ def parse_patch(patch)
       when /\A@@/
         in_hunk = true
         diffs.last[:hunks] << []
-      when /\A[-+]/
+      when /\A-/
         next unless in_hunk
         diffs.last[:hunks].last << line.chomp
+		  when /\A\+/
+		    next unless in_hunk
+			diffs.last[:hunks].last << normalize_added_line(line.chomp)
       end
     end
     diffs.sort_by do |diff|
       diff[:path]
     end
   end
+
+  def generate_hunks(lines)
+    git_diff_context = 3 # The default of Git's diff.context
+    max_lines_for_same_hunk = git_diff_context * 2 + 1
+    previous_i = nil
+    grouped_change_blocks = []
+    lines.each_with_index do |line, i|
+      deleted, added = yield(line)
+      next if deleted.nil? and added.nil?
+      if previous_i.nil? or (i - previous_i) > max_lines_for_same_hunk
+        grouped_change_blocks << []
+      end
+      if i - 1 != previous_i
+        grouped_change_blocks.last << []
+      end
+      grouped_change_blocks.last.last << [deleted, added]
+      previous_i = i
+    end
+    grouped_change_blocks.collect do |change_blocks|
+      hunk = []
+      change_blocks.each do |continuous_changes|
+        continuous_changes.each do |deleted, _|
+          hunk << "-#{deleted}" if deleted
+        end
+        continuous_changes.each do |_, added|
+          hunk << "+#{added}" if added
+        end
+      end
+      hunk
+    end
+  end
+
+  def normalize_pom_xml_output_timestamp(line)
+    line.gsub(/<project\.build\.outputTimestamp>.+?</) do
+      "<project.build.outputTimestamp>2023-12-13T00:00:00Z<"
+    end
+  end
+
+  def normalize_added_line(line)
+    normalize_pom_xml_output_timestamp(line)
+  end
+
 end
 
 module VersionDetectable
diff --git a/java/adapter/avro/pom.xml b/java/adapter/avro/pom.xml
index 6644748b5e597..d32629aec37d1 100644
--- a/java/adapter/avro/pom.xml
+++ b/java/adapter/avro/pom.xml
@@ -25,6 +25,10 @@
   <description>(Contrib/Experimental) A library for converting Avro data to Arrow data.</description>
   <url>http://maven.apache.org</url>
 
+  <properties>
+    <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
+  </properties>
+
   <dependencies>
 
     <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-core -->
diff --git a/java/adapter/jdbc/pom.xml b/java/adapter/jdbc/pom.xml
index dfcd4cfe8f61b..476342543598d 100644
--- a/java/adapter/jdbc/pom.xml
+++ b/java/adapter/jdbc/pom.xml
@@ -25,6 +25,10 @@
     <description>(Contrib/Experimental)A library for converting JDBC data to Arrow data.</description>
     <url>http://maven.apache.org</url>
 
+    <properties>
+        <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
+    </properties>
+
     <dependencies>
 
         <!-- https://mvnrepository.com/artifact/org.apache.arrow/arrow-memory-core -->
diff --git a/java/algorithm/pom.xml b/java/algorithm/pom.xml
index 25669010d2d42..f90cab499fa6e 100644
--- a/java/algorithm/pom.xml
+++ b/java/algorithm/pom.xml
@@ -20,6 +20,10 @@
   <name>Arrow Algorithms</name>
   <description>(Experimental/Contrib) A collection of algorithms for working with ValueVectors.</description>
 
+  <properties>
+    <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.arrow</groupId>
diff --git a/java/bom/pom.xml b/java/bom/pom.xml
index 025632c45a56d..9ebe78392249b 100644
--- a/java/bom/pom.xml
+++ b/java/bom/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>18</version>
+    <version>31</version>
   </parent>
 
   <groupId>org.apache.arrow</groupId>
@@ -26,6 +26,7 @@
   <description>Arrow Bill of Materials</description>
 
   <properties>
+    <minimalMavenBuildVersion>3.5.0</minimalMavenBuildVersion>
     <arrow.vector.classifier/>
   </properties>
 
diff --git a/java/c/pom.xml b/java/c/pom.xml
index ffd41b62dd674..a753b333cf5cb 100644
--- a/java/c/pom.xml
+++ b/java/c/pom.xml
@@ -22,6 +22,7 @@
     <description>Java implementation of C Data Interface</description>
     <packaging>jar</packaging>
     <properties>
+        <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
         <arrow.c.jni.dist.dir>./build</arrow.c.jni.dist.dir>
     </properties>
 
diff --git a/java/compression/pom.xml b/java/compression/pom.xml
index dea8c778735a8..a73cf50dc537f 100644
--- a/java/compression/pom.xml
+++ b/java/compression/pom.xml
@@ -20,6 +20,10 @@
   <name>Arrow Compression</name>
   <description>(Experimental/Contrib) A library for working with the compression/decompression of Arrow data.</description>
 
+  <properties>
+    <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.arrow</groupId>
diff --git a/java/dataset/pom.xml b/java/dataset/pom.xml
index 8723fafa8dadd..de7c177704bee 100644
--- a/java/dataset/pom.xml
+++ b/java/dataset/pom.xml
@@ -24,6 +24,7 @@
     <description>Java implementation of Arrow Dataset API/Framework</description>
     <packaging>jar</packaging>
     <properties>
+        <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
         <arrow.cpp.build.dir>../../../cpp/release-build/</arrow.cpp.build.dir>
         <protobuf.version>2.5.0</protobuf.version>
         <parquet.version>1.11.0</parquet.version>
diff --git a/java/flight/flight-core/pom.xml b/java/flight/flight-core/pom.xml
index 0346172f610a6..8a41690ded28b 100644
--- a/java/flight/flight-core/pom.xml
+++ b/java/flight/flight-core/pom.xml
@@ -24,6 +24,7 @@
   <packaging>jar</packaging>
 
   <properties>
+    <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
     <forkCount>1</forkCount>
   </properties>
 
@@ -300,7 +301,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>3.2.0</version>
         <configuration>
           <descriptorRefs>
             <descriptorRef>jar-with-dependencies</descriptorRef>
diff --git a/java/flight/flight-integration-tests/pom.xml b/java/flight/flight-integration-tests/pom.xml
index 944c624d630a2..246f3c4a45084 100644
--- a/java/flight/flight-integration-tests/pom.xml
+++ b/java/flight/flight-integration-tests/pom.xml
@@ -24,6 +24,10 @@
     <description>Integration tests for Flight RPC.</description>
     <packaging>jar</packaging>
 
+    <properties>
+        <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.arrow</groupId>
@@ -60,7 +64,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.2.0</version>
                 <configuration>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
diff --git a/java/flight/flight-sql-jdbc-core/pom.xml b/java/flight/flight-sql-jdbc-core/pom.xml
index ce1f52e39676e..48de17a4801f9 100644
--- a/java/flight/flight-sql-jdbc-core/pom.xml
+++ b/java/flight/flight-sql-jdbc-core/pom.xml
@@ -28,6 +28,7 @@
     <url>https://arrow.apache.org</url>
 
     <properties>
+        <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
         <org.apache.arrow.flight.name>${project.parent.groupId}:${project.parent.artifactId}</org.apache.arrow.flight.name>
         <org.apache.arrow.flight.version>${project.parent.version}</org.apache.arrow.flight.version>
         <org.apache.arrow.flight.jdbc-driver.name>${project.name}</org.apache.arrow.flight.jdbc-driver.name>
diff --git a/java/flight/flight-sql-jdbc-driver/pom.xml b/java/flight/flight-sql-jdbc-driver/pom.xml
index 28534a9b0badd..55a81c0682bff 100644
--- a/java/flight/flight-sql-jdbc-driver/pom.xml
+++ b/java/flight/flight-sql-jdbc-driver/pom.xml
@@ -27,6 +27,10 @@
     <packaging>jar</packaging>
     <url>https://arrow.apache.org</url>
 
+    <properties>
+        <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
+    </properties>
+
     <dependencies>
         <!-- https://mvnrepository.com/artifact/org.hamcrest/hamcrest-core -->
         <dependency>
diff --git a/java/flight/flight-sql/pom.xml b/java/flight/flight-sql/pom.xml
index a0598f70b9545..e698212ee95ea 100644
--- a/java/flight/flight-sql/pom.xml
+++ b/java/flight/flight-sql/pom.xml
@@ -24,6 +24,7 @@
   <packaging>jar</packaging>
 
   <properties>
+    <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
     <forkCount>1</forkCount>
   </properties>
 
diff --git a/java/format/pom.xml b/java/format/pom.xml
index a98edefbeb217..0396136b64908 100644
--- a/java/format/pom.xml
+++ b/java/format/pom.xml
@@ -23,6 +23,10 @@
 <name>Arrow Format</name>
 <description>Generated Java files from the IPC Flatbuffer definitions.</description>
 
+  <properties>
+    <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.google.flatbuffers</groupId>
diff --git a/java/gandiva/pom.xml b/java/gandiva/pom.xml
index 6337efcf7e348..a9550842abcc1 100644
--- a/java/gandiva/pom.xml
+++ b/java/gandiva/pom.xml
@@ -23,6 +23,7 @@
     <name>Arrow Gandiva</name>
     <description>Java wrappers around the native Gandiva SQL expression compiler.</description>
     <properties>
+        <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <protobuf.version>3.25.1</protobuf.version>
diff --git a/java/maven/module-info-compiler-maven-plugin/pom.xml b/java/maven/module-info-compiler-maven-plugin/pom.xml
index 37d14ad412d88..568fcc4560beb 100644
--- a/java/maven/module-info-compiler-maven-plugin/pom.xml
+++ b/java/maven/module-info-compiler-maven-plugin/pom.xml
@@ -30,6 +30,7 @@
   </prerequisites>
 
   <properties>
+    <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
     <maven.version>3.3.9</maven.version>
   </properties>
 
diff --git a/java/memory/memory-core/pom.xml b/java/memory/memory-core/pom.xml
index 2a92d032942c9..7daa9ce2b6569 100644
--- a/java/memory/memory-core/pom.xml
+++ b/java/memory/memory-core/pom.xml
@@ -22,6 +22,10 @@
   <name>Arrow Memory - Core</name>
   <description>Core off-heap memory management libraries for Arrow ValueVectors.</description>
 
+  <properties>
+    <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
diff --git a/java/memory/memory-netty/pom.xml b/java/memory/memory-netty/pom.xml
index 9b20e1bde2ae7..ac3d83623f246 100644
--- a/java/memory/memory-netty/pom.xml
+++ b/java/memory/memory-netty/pom.xml
@@ -21,6 +21,10 @@
   <name>Arrow Memory - Netty</name>
   <description>Netty allocator and utils for allocating memory in Arrow</description>
 
+  <properties>
+    <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.arrow</groupId>
diff --git a/java/memory/memory-unsafe/pom.xml b/java/memory/memory-unsafe/pom.xml
index 07a140e594522..1add3dc35564a 100644
--- a/java/memory/memory-unsafe/pom.xml
+++ b/java/memory/memory-unsafe/pom.xml
@@ -21,6 +21,9 @@
   <name>Arrow Memory - Unsafe</name>
   <description>Allocator and utils for allocating memory in Arrow based on sun.misc.Unsafe</description>
 
+  <properties>
+    <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
+  </properties>
 
   <dependencies>
     <dependency>
diff --git a/java/performance/pom.xml b/java/performance/pom.xml
index a1d53171f549b..05fe8ca2979af 100644
--- a/java/performance/pom.xml
+++ b/java/performance/pom.xml
@@ -80,6 +80,7 @@
     </dependencies>
 
     <properties>
+        <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jmh.version>1.21</jmh.version>
         <javac.target>1.8</javac.target>
diff --git a/java/pom.xml b/java/pom.xml
index 3e595648ed085..5a3e3c84866c8 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -15,7 +15,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>18</version>
+    <version>31</version>
   </parent>
 
   <groupId>org.apache.arrow</groupId>
@@ -28,6 +28,7 @@
   <url>https://arrow.apache.org/</url>
 
   <properties>
+    <minimalMavenBuildVersion>3.5.0</minimalMavenBuildVersion>
     <target.gen.source.path>${project.build.directory}/generated-sources</target.gen.source.path>
     <dep.junit.platform.version>1.9.0</dep.junit.platform.version>
     <dep.junit.jupiter.version>5.10.1</dep.junit.jupiter.version>
@@ -446,6 +447,13 @@
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
           <version>3.4.1</version>
+          <configuration>
+            <rules>
+              <requireMavenVersion>
+                <version>[3.3.0,4)</version>
+              </requireMavenVersion>
+            </rules>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 0688fae1ab78c..d3d31ca29ed1a 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -20,6 +20,10 @@
     <name>Arrow Tools</name>
     <description>Java applications for working with Arrow ValueVectors.</description>
 
+    <properties>
+        <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.arrow</groupId>
@@ -85,7 +89,7 @@
       <plugins>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.0.0</version>
+          <version>3.2.0</version>
           <configuration>
             <descriptorRefs>
               <descriptorRef>jar-with-dependencies</descriptorRef>
diff --git a/java/vector/pom.xml b/java/vector/pom.xml
index dc453963b62f6..29dd21961b8c6 100644
--- a/java/vector/pom.xml
+++ b/java/vector/pom.xml
@@ -20,8 +20,11 @@
   <name>Arrow Vectors</name>
   <description>An off-heap reference implementation for Arrow columnar data format.</description>
 
-  <dependencies>
+  <properties>
+    <project.build.outputTimestamp>2023-12-13T00:00:00Z</project.build.outputTimestamp>
+  </properties>
 
+  <dependencies>
     <dependency>
       <groupId>org.apache.arrow</groupId>
       <artifactId>arrow-format</artifactId>