|
5 | 5 | <parent>
|
6 | 6 | <groupId>com.google.guava</groupId>
|
7 | 7 | <artifactId>guava-parent</artifactId>
|
8 |
| - <version>26.0-android</version> |
| 8 | + <version>33.4.0-android</version> |
9 | 9 | </parent>
|
10 | 10 | <artifactId>failureaccess</artifactId>
|
11 |
| - <version>1.0.2</version> |
12 |
| - <packaging>bundle</packaging> |
| 11 | + <version>1.0.3</version> |
| 12 | + <packaging>jar</packaging> |
13 | 13 | <name>Guava InternalFutureFailureAccess and InternalFutures</name>
|
14 | 14 | <description>
|
15 | 15 | Contains
|
|
22 | 22 | </description>
|
23 | 23 | <build>
|
24 | 24 | <plugins>
|
| 25 | + <plugin> |
| 26 | + <artifactId>maven-compiler-plugin</artifactId> |
| 27 | + <executions> |
| 28 | + <execution> |
| 29 | + <id>default-compile</id> |
| 30 | + <goals> |
| 31 | + <goal>compile</goal> |
| 32 | + </goals> |
| 33 | + <configuration> |
| 34 | + <release>8</release> |
| 35 | + <excludes> |
| 36 | + <exclude>module-info.java</exclude> |
| 37 | + </excludes> |
| 38 | + <compilerArgs> |
| 39 | + <!-- |
| 40 | + Make includes/excludes fully work: |
| 41 | + https://issues.apache.org/jira/browse/MCOMPILER-174 |
| 42 | + (Compare what guava-gwt has to do for maven-javadoc-plugin.) |
| 43 | + --> |
| 44 | + <arg>-sourcepath</arg> |
| 45 | + <arg>doesnotexist</arg> |
| 46 | + </compilerArgs> |
| 47 | + </configuration> |
| 48 | + </execution> |
| 49 | + <execution> |
| 50 | + <id>compile-java9</id> |
| 51 | + <goals> |
| 52 | + <goal>compile</goal> |
| 53 | + </goals> |
| 54 | + <configuration> |
| 55 | + <release>9</release> |
| 56 | + <compileSourceRoots> |
| 57 | + <compileSourceRoot>${project.basedir}/src</compileSourceRoot> |
| 58 | + </compileSourceRoots> |
| 59 | + |
| 60 | + <!-- JPMS needs access to the module sources to complete a modular Java build. --> |
| 61 | + <compilerArgs> |
| 62 | + <arg>-sourcepath</arg> |
| 63 | + <arg>${project.basedir}/src</arg> |
| 64 | + <arg>--add-reads=com.google.common=ALL-UNNAMED</arg> |
| 65 | + <!-- https://errorprone.info/docs/installation#maven --> |
| 66 | + <arg>-XDcompilePolicy=simple</arg> |
| 67 | + </compilerArgs> |
| 68 | + <multiReleaseOutput>true</multiReleaseOutput> |
| 69 | + </configuration> |
| 70 | + </execution> |
| 71 | + </executions> |
| 72 | + </plugin> |
25 | 73 | <plugin>
|
26 | 74 | <artifactId>maven-jar-plugin</artifactId>
|
27 | 75 | <configuration>
|
28 | 76 | <archive>
|
| 77 | + <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> |
29 | 78 | <manifestEntries>
|
30 |
| - <Automatic-Module-Name>com.google.common.util.concurrent.internal</Automatic-Module-Name> |
| 79 | + <Multi-Release>true</Multi-Release> |
31 | 80 | </manifestEntries>
|
32 | 81 | </archive>
|
| 82 | + <excludes> |
| 83 | + <exclude>/module-info.class</exclude> |
| 84 | + <exclude>META-INF/versions/9/com/google/common/util/concurrent/internal/*.class</exclude> |
| 85 | + </excludes> |
33 | 86 | </configuration>
|
34 | 87 | </plugin>
|
35 | 88 | <plugin>
|
|
55 | 108 | </executions>
|
56 | 109 | <configuration>
|
57 | 110 | <instructions>
|
58 |
| - <Export-Package>com.google.common.util.concurrent.internal</Export-Package> |
| 111 | + <!-- Silence a warning that claims that META-INF/versions/9/... is the "wrong directory" for our classes. --> |
| 112 | + <_fixupmessages>^Classes found in the wrong directory: .*</_fixupmessages> |
| 113 | + <Export-Package>com.google.common.util.concurrent.internal,!META-INF.*</Export-Package> |
59 | 114 | <Bundle-DocURL>https://github.com/google/guava/</Bundle-DocURL>
|
60 | 115 | </instructions>
|
61 | 116 | </configuration>
|
|
0 commit comments