From 9d1f306aa4562813578151a960c61b41ae201022 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Wed, 6 Sep 2023 10:18:24 +0200
Subject: [PATCH 1/2] Do not include revision and host-specific info in
 MANIFEST.MF

Except for the release.

I also removed the details about the OS in all cases as I don't see the
value of disclosing this information.

Currently the build cache is completely ineffective because of that.
---
 independent-projects/parent/pom.xml | 46 ++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml
index 7729f6aa63f09..6b32a582213ab 100644
--- a/independent-projects/parent/pom.xml
+++ b/independent-projects/parent/pom.xml
@@ -279,16 +279,10 @@
                                     true
                                 </addDefaultImplementationEntries>
                             </manifest>
-                            <manifestEntries>
+                            <manifestEntries combine.children="append">
                                 <Implementation-URL>${project.url}</Implementation-URL>
-                                <Java-Version>${java.version}</Java-Version>
-                                <Java-Vendor>${java.vendor}</Java-Vendor>
-                                <Os-Name>${os.name}</Os-Name>
-                                <Os-Arch>${os.arch}</Os-Arch>
-                                <Os-Version>${os.version}</Os-Version>
                                 <Scm-Url>${project.scm.url}</Scm-Url>
                                 <Scm-Connection>${project.scm.connection}</Scm-Connection>
-                                <Scm-Revision>${buildNumber}</Scm-Revision>
                             </manifestEntries>
                         </archive>
                     </configuration>
@@ -339,16 +333,10 @@
                                     true
                                 </addDefaultImplementationEntries>
                             </manifest>
-                            <manifestEntries>
+                            <manifestEntries combine.children="append">
                                 <Implementation-URL>${project.url}</Implementation-URL>
-                                <Java-Version>${java.version}</Java-Version>
-                                <Java-Vendor>${java.vendor}</Java-Vendor>
-                                <Os-Name>${os.name}</Os-Name>
-                                <Os-Arch>${os.arch}</Os-Arch>
-                                <Os-Version>${os.version}</Os-Version>
                                 <Scm-Url>${project.scm.url}</Scm-Url>
                                 <Scm-Connection>${project.scm.connection}</Scm-Connection>
-                                <Scm-Revision>${buildNumber}</Scm-Revision>
                             </manifestEntries>
                         </archive>
                     </configuration>
@@ -720,6 +708,36 @@
                             </execution>
                         </executions>
                     </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <configuration>
+                            <archive>
+                                <manifestEntries combine.children="append">
+                                    <Java-Version>${java.version}</Java-Version>
+                                    <Java-Vendor>${java.vendor}</Java-Vendor>
+                                    <Os-Name>${os.name}</Os-Name>
+                                    <Os-Arch>${os.arch}</Os-Arch>
+                                    <Scm-Revision>${buildNumber}</Scm-Revision>
+                                </manifestEntries>
+                            </archive>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <configuration>
+                            <archive>
+                                <manifestEntries combine.children="append">
+                                    <Java-Version>${java.version}</Java-Version>
+                                    <Java-Vendor>${java.vendor}</Java-Vendor>
+                                    <Os-Name>${os.name}</Os-Name>
+                                    <Os-Arch>${os.arch}</Os-Arch>
+                                    <Scm-Revision>${buildNumber}</Scm-Revision>
+                                </manifestEntries>
+                            </archive>
+                        </configuration>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>

From 69c78b9f8983645181db38813b3f95142e136813 Mon Sep 17 00:00:00 2001
From: Guillaume Smet <guillaume.smet@gmail.com>
Date: Wed, 6 Sep 2023 11:24:10 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Clean=20up=20gradle-enterprise.xml=20after?=
 =?UTF-8?q?=20talk=20with=20J=C3=A9r=C3=B4me?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .mvn/gradle-enterprise.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.mvn/gradle-enterprise.xml b/.mvn/gradle-enterprise.xml
index 4c3645c71a292..3615071f5640d 100644
--- a/.mvn/gradle-enterprise.xml
+++ b/.mvn/gradle-enterprise.xml
@@ -26,10 +26,6 @@
             <enabled>false</enabled>
         </local>
         <remote>
-            <server>
-                <url>https://ge.quarkus.io/cache/main/</url>
-                <allowUntrusted>false</allowUntrusted>
-            </server>
             <enabled>true</enabled>
             <storeEnabled>#{env['CI'] != null}</storeEnabled>
         </remote>