From bba7d7458014b1931edb90b324ca387047464ba8 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Sat, 9 Mar 2024 10:40:42 -0800
Subject: [PATCH 1/4] Add the 'compile' goal for 'compile-java9'

and update to a newer version of bnd for multi-release jar support, see
https://github.com/bndtools/bnd/issues/2227.
---
 annotations/pom.xml | 3 +++
 pom.xml             | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/annotations/pom.xml b/annotations/pom.xml
index 39a06275850..aa47b3be9f2 100644
--- a/annotations/pom.xml
+++ b/annotations/pom.xml
@@ -64,6 +64,9 @@
           </execution>
           <execution>
             <id>compile-java9</id>
+            <goals>
+              <goal>compile</goal>
+            </goals>
             <configuration>
               <source>9</source>
               <target>9</target>
diff --git a/pom.xml b/pom.xml
index f7cad3c75bd..bd0551be9a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
       <plugin>
         <groupId>biz.aQute.bnd</groupId>
         <artifactId>bnd-maven-plugin</artifactId>
-        <version>6.4.0</version>
+        <version>7.0.0</version>
         <executions>
           <execution>
             <id>generate-OSGi-manifest</id>

From 20243be6c0e1c5a18481d1dc34d4c52baafc04d3 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Sat, 9 Mar 2024 11:45:03 -0800
Subject: [PATCH 2/4] Work around BND issue with classes in the MRJAR root

https://github.com/google/error-prone/pull/4314#issuecomment-1986959959
---
 annotations/pom.xml | 3 +++
 pom.xml             | 1 +
 2 files changed, 4 insertions(+)

diff --git a/annotations/pom.xml b/annotations/pom.xml
index aa47b3be9f2..e68d412cbc2 100644
--- a/annotations/pom.xml
+++ b/annotations/pom.xml
@@ -85,6 +85,9 @@
               <Multi-Release>true</Multi-Release>
             </manifestEntries>
           </archive>
+          <excludes>
+            <exclude>/META-INF/versions/9/com/**/*.class</exclude>
+          </excludes>
         </configuration>
       </plugin>
     </plugins>
diff --git a/pom.xml b/pom.xml
index bd0551be9a0..df4c0b93bfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,6 +153,7 @@
                 -exportcontents: com.google.errorprone*
                 -noextraheaders: true
                 -removeheaders: Private-Package
+                -fixupmessages: ^Classes found in the wrong directory: .*
               ]]></bnd>
             </configuration>
           </execution>

From 6255508ce9e2067429880d56da1f33f9adcdb874 Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Sat, 9 Mar 2024 11:49:39 -0800
Subject: [PATCH 3/4] Downgrade bnd version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index df4c0b93bfe..7c0fc991206 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
       <plugin>
         <groupId>biz.aQute.bnd</groupId>
         <artifactId>bnd-maven-plugin</artifactId>
-        <version>7.0.0</version>
+        <version>6.4.0</version>
         <executions>
           <execution>
             <id>generate-OSGi-manifest</id>

From 604430dfc2cb70bf7dba8d1cb27224d3e50869fe Mon Sep 17 00:00:00 2001
From: Liam Miller-Cushon <cushon@google.com>
Date: Sat, 9 Mar 2024 13:33:31 -0800
Subject: [PATCH 4/4] More updates

https://github.com/google/error-prone/pull/4314#issuecomment-1986961609

* Remove unnecessary `requires java.base;`
* Excludes META-INF from BND (see !META-INF...)
---
 annotations/src/main/java/module-info.java | 1 -
 pom.xml                                    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/annotations/src/main/java/module-info.java b/annotations/src/main/java/module-info.java
index 779f8fe61eb..532f2758a07 100644
--- a/annotations/src/main/java/module-info.java
+++ b/annotations/src/main/java/module-info.java
@@ -15,7 +15,6 @@
  */
 
 open module com.google.errorprone.annotation {
-  requires java.base;
   requires java.compiler;
 
   exports com.google.errorprone.annotations;
diff --git a/pom.xml b/pom.xml
index 7c0fc991206..3dc704b4f83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
               <bnd><![CDATA[
                 Bundle-SymbolicName: com.google.$<replacestring;$<replacestring;${project.artifactId};^error_prone;errorprone>;_;.>
                 Automatic-Module-Name: $<Bundle-SymbolicName>
-                -exportcontents: com.google.errorprone*
+                -exportcontents: com.google.errorprone*,!META-INF.*
                 -noextraheaders: true
                 -removeheaders: Private-Package
                 -fixupmessages: ^Classes found in the wrong directory: .*