From 3d3682597fac104504ece1b036b03b162d97c3b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= <herve.boutemy@free.fr>
Date: Thu, 15 Feb 2024 02:52:01 +0100
Subject: [PATCH] drop buildnumber:create already executed by jetty-util
 (#11360)

* drop buildnumber creation already done by jetty-util
* copy build.properties from jetty-util
---
 jetty-core/jetty-start/pom.xml                | 40 +++++++++++--------
 .../org/eclipse/jetty/start/build.properties  |  4 --
 2 files changed, 23 insertions(+), 21 deletions(-)
 delete mode 100644 jetty-core/jetty-start/src/main/resources/org/eclipse/jetty/start/build.properties

diff --git a/jetty-core/jetty-start/pom.xml b/jetty-core/jetty-start/pom.xml
index 7b50606b236..e37012255aa 100644
--- a/jetty-core/jetty-start/pom.xml
+++ b/jetty-core/jetty-start/pom.xml
@@ -43,6 +43,29 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
+          <execution>
+            <id>build.properties</id>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <phase>process-resources</phase>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.eclipse.jetty</groupId>
+                  <artifactId>jetty-util</artifactId>
+                  <type>jar</type>
+                  <overWrite>false</overWrite>
+                  <includes>**/build.properties</includes>
+                  <fileMappers>
+                    <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"></fileMapper>
+                  </fileMappers>
+                  <outputDirectory>${project.build.outputDirectory}/org/eclipse/jetty/start/</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+              <overWriteSnapshots>true</overWriteSnapshots>
+            </configuration>
+          </execution>
           <execution>
             <id>unpack</id>
             <goals>
@@ -109,23 +132,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>buildnumber-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>create-buildnumber</id>
-            <goals>
-              <goal>create</goal>
-            </goals>
-            <configuration>
-              <doCheck>false</doCheck>
-              <doUpdate>false</doUpdate>
-              <revisionOnScmFailure>${nonCanonicalRevision}</revisionOnScmFailure>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/jetty-core/jetty-start/src/main/resources/org/eclipse/jetty/start/build.properties b/jetty-core/jetty-start/src/main/resources/org/eclipse/jetty/start/build.properties
deleted file mode 100644
index c9d20227f6c..00000000000
--- a/jetty-core/jetty-start/src/main/resources/org/eclipse/jetty/start/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-buildNumber=${buildNumber}
-timestamp=${timestamp}
-version=${project.version}
-scmUrl=${project.scm.connection}
\ No newline at end of file