From d209b0c19a568b5385b968da17f2cd5ef670331a Mon Sep 17 00:00:00 2001
From: Sam Gammon <sam@elide.ventures>
Date: Wed, 6 Mar 2024 10:35:16 -0800
Subject: [PATCH] feat: add jpms definition for `annotations`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- feat: add `module-info` to `annotations` module
- feat: ship `annotations` as a `Multi-Release` JAR
- feat: support `1.8` through latest JDK for `annotations` module
- fix: `HEAD-SNAPSHOT` → `1.0-HEAD-SNAPSHOT`, because of a Maven
  Compiler Plugin issue precluding use as a module version[0]

[0]: https://issues.apache.org/jira/browse/MCOMPILER-579

Signed-off-by: Sam Gammon <sam@elide.ventures>
---
 annotation/pom.xml                         |  2 +-
 annotations/pom.xml                        | 36 ++++++++++++++++++++--
 annotations/src/main/java/module-info.java | 22 +++++++++++++
 check_api/pom.xml                          |  2 +-
 core/pom.xml                               |  2 +-
 docgen/pom.xml                             |  2 +-
 docgen_processor/pom.xml                   |  2 +-
 pom.xml                                    | 12 +++++++-
 refaster/pom.xml                           |  2 +-
 test_helpers/pom.xml                       |  2 +-
 type_annotations/pom.xml                   |  2 +-
 11 files changed, 74 insertions(+), 12 deletions(-)
 create mode 100644 annotations/src/main/java/module-info.java

diff --git a/annotation/pom.xml b/annotation/pom.xml
index 59f69a89d89..fbbba7c5524 100644
--- a/annotation/pom.xml
+++ b/annotation/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.errorprone</groupId>
     <artifactId>error_prone_parent</artifactId>
-    <version>HEAD-SNAPSHOT</version>
+    <version>1.0-HEAD-SNAPSHOT</version>
   </parent>
 
   <name>@BugPattern annotation</name>
diff --git a/annotations/pom.xml b/annotations/pom.xml
index 03c522c0391..39a06275850 100644
--- a/annotations/pom.xml
+++ b/annotations/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.errorprone</groupId>
     <artifactId>error_prone_parent</artifactId>
-    <version>HEAD-SNAPSHOT</version>
+    <version>1.0-HEAD-SNAPSHOT</version>
   </parent>
 
   <name>error-prone annotations</name>
@@ -49,10 +49,40 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>8</source>
-          <target>8</target>
           <compilerArgs combine.self="override" />
         </configuration>
+        <executions>
+          <execution>
+            <id>default-compile</id>
+            <configuration>
+              <source>1.8</source>
+              <target>1.8</target>
+              <excludes>
+                <exclude>module-info.java</exclude>
+              </excludes>
+            </configuration>
+          </execution>
+          <execution>
+            <id>compile-java9</id>
+            <configuration>
+              <source>9</source>
+              <target>9</target>
+              <release>9</release>
+              <multiReleaseOutput>true</multiReleaseOutput>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Multi-Release>true</Multi-Release>
+            </manifestEntries>
+          </archive>
+        </configuration>
       </plugin>
     </plugins>
   </build>
diff --git a/annotations/src/main/java/module-info.java b/annotations/src/main/java/module-info.java
new file mode 100644
index 00000000000..72215b76776
--- /dev/null
+++ b/annotations/src/main/java/module-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015 The Error Prone Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+open module com.google.errorprone.annotation {
+  requires java.base;
+  requires java.compiler;
+  exports com.google.errorprone.annotations;
+  exports com.google.errorprone.annotations.concurrent;
+}
diff --git a/check_api/pom.xml b/check_api/pom.xml
index 397c42e88c6..1a96ffd6473 100644
--- a/check_api/pom.xml
+++ b/check_api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.errorprone</groupId>
     <artifactId>error_prone_parent</artifactId>
-    <version>HEAD-SNAPSHOT</version>
+    <version>1.0-HEAD-SNAPSHOT</version>
   </parent>
 
   <name>error-prone check api</name>
diff --git a/core/pom.xml b/core/pom.xml
index 68eae1cd680..1eb5aec8f77 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.errorprone</groupId>
     <artifactId>error_prone_parent</artifactId>
-    <version>HEAD-SNAPSHOT</version>
+    <version>1.0-HEAD-SNAPSHOT</version>
   </parent>
 
   <name>error-prone library</name>
diff --git a/docgen/pom.xml b/docgen/pom.xml
index 784673a1d5d..8ee00587502 100644
--- a/docgen/pom.xml
+++ b/docgen/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.errorprone</groupId>
     <artifactId>error_prone_parent</artifactId>
-    <version>HEAD-SNAPSHOT</version>
+    <version>1.0-HEAD-SNAPSHOT</version>
   </parent>
 
   <name>Documentation tool for generating Error Prone bugpattern documentation</name>
diff --git a/docgen_processor/pom.xml b/docgen_processor/pom.xml
index 351787a725f..7d97a4cb4ca 100644
--- a/docgen_processor/pom.xml
+++ b/docgen_processor/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.errorprone</groupId>
     <artifactId>error_prone_parent</artifactId>
-    <version>HEAD-SNAPSHOT</version>
+    <version>1.0-HEAD-SNAPSHOT</version>
   </parent>
 
   <name>JSR-269 annotation processor for @BugPattern annotation</name>
diff --git a/pom.xml b/pom.xml
index 09b4a4b3f88..f7cad3c75bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <name>Error Prone parent POM</name>
   <groupId>com.google.errorprone</groupId>
   <artifactId>error_prone_parent</artifactId>
-  <version>HEAD-SNAPSHOT</version>
+  <version>1.0-HEAD-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <description>Error Prone is a static analysis tool for Java that catches common programming mistakes at compile-time.</description>
@@ -204,6 +204,16 @@
             <exclude>**/testdata/**</exclude>
           </testExcludes>
         </configuration>
+        <executions>
+          <execution>
+            <id>default-compile</id>
+            <configuration>
+              <compilerArgs combine.children="append">
+                <arg>-Xlint:-options</arg>
+              </compilerArgs>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/refaster/pom.xml b/refaster/pom.xml
index d7951f0e492..968b0c2bae4 100644
--- a/refaster/pom.xml
+++ b/refaster/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>error_prone_parent</artifactId>
         <groupId>com.google.errorprone</groupId>
-        <version>HEAD-SNAPSHOT</version>
+        <version>1.0-HEAD-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/test_helpers/pom.xml b/test_helpers/pom.xml
index cf4af121a75..76fbfaf30d9 100644
--- a/test_helpers/pom.xml
+++ b/test_helpers/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.errorprone</groupId>
     <artifactId>error_prone_parent</artifactId>
-    <version>HEAD-SNAPSHOT</version>
+    <version>1.0-HEAD-SNAPSHOT</version>
   </parent>
 
   <name>error-prone test helpers</name>
diff --git a/type_annotations/pom.xml b/type_annotations/pom.xml
index b2495a2167f..365123af188 100644
--- a/type_annotations/pom.xml
+++ b/type_annotations/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.errorprone</groupId>
     <artifactId>error_prone_parent</artifactId>
-    <version>HEAD-SNAPSHOT</version>
+    <version>1.0-HEAD-SNAPSHOT</version>
   </parent>
 
   <name>error-prone type annotations</name>