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] 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: .*