Skip to content

Commit ea5ef6d

Browse files
cushonError Prone Team
authored andcommitted
Add the 'compile' goal for 'compile-java9'
#4314 (comment) Fixes #4314 COPYBARA_INTEGRATE_REVIEW=#4314 from cushon:module 604430d PiperOrigin-RevId: 614276837
1 parent 0e95364 commit ea5ef6d

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

annotations/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@
6464
</execution>
6565
<execution>
6666
<id>compile-java9</id>
67+
<goals>
68+
<goal>compile</goal>
69+
</goals>
6770
<configuration>
6871
<source>9</source>
6972
<target>9</target>
@@ -82,6 +85,9 @@
8285
<Multi-Release>true</Multi-Release>
8386
</manifestEntries>
8487
</archive>
88+
<excludes>
89+
<exclude>/META-INF/versions/9/com/**/*.class</exclude>
90+
</excludes>
8591
</configuration>
8692
</plugin>
8793
</plugins>

annotations/src/main/java/module-info.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616

1717
open module com.google.errorprone.annotation {
18-
requires java.base;
1918
requires java.compiler;
2019

2120
exports com.google.errorprone.annotations;

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,10 @@
150150
<bnd><![CDATA[
151151
Bundle-SymbolicName: com.google.$<replacestring;$<replacestring;${project.artifactId};^error_prone;errorprone>;_;.>
152152
Automatic-Module-Name: $<Bundle-SymbolicName>
153-
-exportcontents: com.google.errorprone*
153+
-exportcontents: com.google.errorprone*,!META-INF.*
154154
-noextraheaders: true
155155
-removeheaders: Private-Package
156+
-fixupmessages: ^Classes found in the wrong directory: .*
156157
]]></bnd>
157158
</configuration>
158159
</execution>

0 commit comments

Comments
 (0)