fixup! self-review

Signed-off-by: Sam Gammon <[email protected]>
sgammon · Feb 6, 2025 · 197822b · 197822b
1 parent d0c4b65
commit 197822b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 27 deletions.
diff --git a/futures/failureaccess/pom.xml b/futures/failureaccess/pom.xml
@@ -9,7 +9,7 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>failureaccess</artifactId>
-  <version>1.0.3-jpms</version>
+  <version>1.0.3</version>
   <packaging>jar</packaging>
   <name>Guava InternalFutureFailureAccess and InternalFutures</name>
   <description>
@@ -26,16 +26,6 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <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>
             <goals>

diff --git a/guava-gwt/pom.xml b/guava-gwt/pom.xml
@@ -134,15 +134,23 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <!-- Yes, we want to exclude ForceGuavaCompilation 4 times: -->
-            <!-- (And we might as well exclude DummyJavadocClass 3 times (though it would be harmless to include).) -->
-            <!-- 1. Don't compile it (since that requires a *non-test* dep on gwt-user. -->
-            <exclude>**/ForceGuavaCompilation*</exclude>
-            <exclude>**/DummyJavadocClass*</exclude>
-          </excludes>
-        </configuration>
+        <executions>
+          <execution>
+            <id>default-compile</id>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+            <configuration>
+              <excludes>
+                <!-- Yes, we want to exclude ForceGuavaCompilation 4 times: -->
+                <!-- (And we might as well exclude DummyJavadocClass 3 times (though it would be harmless to include).) -->
+                <!-- 1. Don't compile it (since that requires a *non-test* dep on gwt-user. -->
+                <exclude>**/ForceGuavaCompilation*</exclude>
+                <exclude>**/DummyJavadocClass*</exclude>
+              </excludes>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>

diff --git a/guava/pom.xml b/guava/pom.xml
@@ -112,11 +112,6 @@
           <execution>
             <id>default-compile</id>
             <configuration>
-              <source>1.8</source>
-              <target>1.8</target>
-              <excludes>
-                <exclude>module-info.java</exclude>
-              </excludes>
               <compilerArgs combine.children="append" combine.self="append">
                 <arg>-XDignore.symbol.file</arg>
               </compilerArgs>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <jspecify.version>1.0.0</jspecify.version>
     <errorprone.version>2.36.0</errorprone.version>
     <j2objc.version>3.0.0</j2objc.version>
-    <failureaccess.version>1.0.2</failureaccess.version>
+    <failureaccess.version>1.0.3</failureaccess.version>
     <javac.version>9+181-r4173-1</javac.version>
     <!-- Javadoc is pinned to the latest LTS, otherwise there are doc redirect warnings. -->
     <javadoc.specification.version>21</javadoc.specification.version>
@@ -95,6 +95,7 @@
     <module>guava-gwt</module>
     <module>guava-testlib</module>
     <module>guava-tests</module>
+    <module>futures/failureaccess</module>
   </modules>
   <build>
     <!-- Handle where Guava deviates from Maven defaults -->
@@ -182,7 +183,7 @@
               <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED</arg>
               <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
               <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
-              <arg>-Xlint:-removal,-options</arg>
+              <arg>-Xlint:-options</arg>
             </compilerArgs>
             <annotationProcessorPaths>
               <path>
@@ -194,6 +195,19 @@
             <!-- Fork because we need args like add-exports. (But see the TODO above about .mvn/jvm.config.) -->
             <fork>true</fork>
           </configuration>
+          <executions>
+            <execution>
+              <id>default-compile</id>
+              <goals>
+                <goal>compile</goal>
+              </goals>
+              <configuration>
+                <excludes>
+                  <exclude>module-info.java</exclude>
+                </excludes>
+              </configuration>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
@@ -214,6 +228,11 @@
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
           <version>3.4.0</version>
+          <configuration>
+            <excludes>
+              <exclude>/module-info.class</exclude>
+            </excludes>
+          </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>