Skip to content

Commit d70366d

Browse files
sgammonGoogle Java Core Libraries
sgammon
authored and
Google Java Core Libraries
committed
Stop setting up and trying to inherit Javadoc from the JDK.
Drops the JDK source steps involved with Javadoc builds, as suggested in #7089. There will be some build warnings related to Javadoc until subsequent PRs are merged. Signed-off-by: Sam Gammon <[email protected]> Gives up on the "inherting" half of #6790. Fixes #7092 RELNOTES=n/a PiperOrigin-RevId: 614693592
1 parent 8b9387e commit d70366d

File tree

2 files changed

+0
-148
lines changed

2 files changed

+0
-148
lines changed

‎android/guava/pom.xml

-74
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
<groupId>com.google.j2objc</groupId>
4545
<artifactId>j2objc-annotations</artifactId>
4646
</dependency>
47-
<!-- TODO(cpovirk): does this comment belong on the <dependency> in <profiles>? -->
48-
<!-- TODO(cpovirk): want this only for dependency plugin but seems not to work there? Maven runs without failure, but the resulting Javadoc is missing the hoped-for inherited text -->
4947
</dependencies>
5048
<build>
5149
<resources>
@@ -106,36 +104,13 @@
106104
<plugin>
107105
<artifactId>maven-source-plugin</artifactId>
108106
</plugin>
109-
<!-- TODO(cpovirk): include JDK sources when building testlib doc, too -->
110-
<plugin>
111-
<artifactId>maven-dependency-plugin</artifactId>
112-
<executions>
113-
<execution>
114-
<id>unpack-jdk-sources</id>
115-
<phase>generate-sources</phase>
116-
<goals><goal>unpack-dependencies</goal></goals>
117-
<configuration>
118-
<includeArtifactIds>srczip</includeArtifactIds>
119-
<outputDirectory>${project.build.directory}/jdk-sources</outputDirectory>
120-
<silent>false</silent>
121-
<!-- Exclude module-info files (since we're using -source 8 to avoid other modules problems) and FileDescriptor (which uses a language feature not available in Java 8). -->
122-
<excludes>**/module-info.java,**/java/io/FileDescriptor.java</excludes>
123-
</configuration>
124-
</execution>
125-
</executions>
126-
</plugin>
127107
<plugin>
128108
<groupId>org.codehaus.mojo</groupId>
129109
<artifactId>animal-sniffer-maven-plugin</artifactId>
130110
</plugin>
131111
<plugin>
132112
<artifactId>maven-javadoc-plugin</artifactId>
133113
<configuration>
134-
<!-- TODO(cpovirk): Move this to the parent after making jdk-sources available there. -->
135-
<!-- TODO(cpovirk): can we use includeDependencySources and a local com.oracle.java:jdk-lib:noversion:sources instead of all this unzipping and manual sourcepath modification? -->
136-
<!-- (We need JDK *sources*, not just -link, so that {@inheritDoc} works.) -->
137-
<sourcepath>${project.build.sourceDirectory}:${project.build.directory}/jdk-sources</sourcepath>
138-
139114
<!-- Passing `-subpackages com.google.common` breaks things, so we explicitly exclude everything else instead. -->
140115
<!-- excludePackageNames requires specification of packages separately from "all subpackages".
141116
https://issues.apache.org/jira/browse/MJAVADOC-584 -->
@@ -247,53 +222,4 @@
247222
</plugin>
248223
</plugins>
249224
</build>
250-
<profiles>
251-
<profile>
252-
<id>srczip-parent</id>
253-
<activation>
254-
<file>
255-
<exists>${java.home}/../src.zip</exists>
256-
</file>
257-
</activation>
258-
<dependencies>
259-
<dependency>
260-
<groupId>jdk</groupId>
261-
<artifactId>srczip</artifactId>
262-
<version>999</version>
263-
<scope>system</scope>
264-
<systemPath>${java.home}/../src.zip</systemPath>
265-
<optional>true</optional>
266-
</dependency>
267-
</dependencies>
268-
</profile>
269-
<profile>
270-
<id>srczip-lib</id>
271-
<activation>
272-
<file>
273-
<exists>${java.home}/lib/src.zip</exists>
274-
</file>
275-
</activation>
276-
<dependencies>
277-
<dependency>
278-
<groupId>jdk</groupId>
279-
<artifactId>srczip</artifactId>
280-
<version>999</version>
281-
<scope>system</scope>
282-
<systemPath>${java.home}/lib/src.zip</systemPath>
283-
<optional>true</optional>
284-
</dependency>
285-
</dependencies>
286-
<build>
287-
<plugins>
288-
<plugin>
289-
<artifactId>maven-javadoc-plugin</artifactId>
290-
<configuration>
291-
<!-- We need to point at the java.base subdirectory because Maven appears to assume that package foo.bar is located in foo/bar and not java.base/foo/bar when translating excludePackageNames into filenames to pass to javadoc. (Note that manually passing -exclude to javadoc appears to possibly not work at all for java.* types??) Also, referring only to java.base avoids a lot of other sources. -->
292-
<sourcepath>${project.build.sourceDirectory}:${project.build.directory}/jdk-sources/java.base</sourcepath>
293-
</configuration>
294-
</plugin>
295-
</plugins>
296-
</build>
297-
</profile>
298-
</profiles>
299225
</project>

‎guava/pom.xml

-74
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@
4444
<groupId>com.google.j2objc</groupId>
4545
<artifactId>j2objc-annotations</artifactId>
4646
</dependency>
47-
<!-- TODO(cpovirk): does this comment belong on the <dependency> in <profiles>? -->
48-
<!-- TODO(cpovirk): want this only for dependency plugin but seems not to work there? Maven runs without failure, but the resulting Javadoc is missing the hoped-for inherited text -->
4947
</dependencies>
5048
<build>
5149
<resources>
@@ -106,36 +104,13 @@
106104
<plugin>
107105
<artifactId>maven-source-plugin</artifactId>
108106
</plugin>
109-
<!-- TODO(cpovirk): include JDK sources when building testlib doc, too -->
110-
<plugin>
111-
<artifactId>maven-dependency-plugin</artifactId>
112-
<executions>
113-
<execution>
114-
<id>unpack-jdk-sources</id>
115-
<phase>generate-sources</phase>
116-
<goals><goal>unpack-dependencies</goal></goals>
117-
<configuration>
118-
<includeArtifactIds>srczip</includeArtifactIds>
119-
<outputDirectory>${project.build.directory}/jdk-sources</outputDirectory>
120-
<silent>false</silent>
121-
<!-- Exclude module-info files (since we're using -source 8 to avoid other modules problems) and FileDescriptor (which uses a language feature not available in Java 8). -->
122-
<excludes>**/module-info.java,**/java/io/FileDescriptor.java</excludes>
123-
</configuration>
124-
</execution>
125-
</executions>
126-
</plugin>
127107
<plugin>
128108
<groupId>org.codehaus.mojo</groupId>
129109
<artifactId>animal-sniffer-maven-plugin</artifactId>
130110
</plugin>
131111
<plugin>
132112
<artifactId>maven-javadoc-plugin</artifactId>
133113
<configuration>
134-
<!-- TODO(cpovirk): Move this to the parent after making jdk-sources available there. -->
135-
<!-- TODO(cpovirk): can we use includeDependencySources and a local com.oracle.java:jdk-lib:noversion:sources instead of all this unzipping and manual sourcepath modification? -->
136-
<!-- (We need JDK *sources*, not just -link, so that {@inheritDoc} works.) -->
137-
<sourcepath>${project.build.sourceDirectory}:${project.build.directory}/jdk-sources</sourcepath>
138-
139114
<!-- Passing `-subpackages com.google.common` breaks things, so we explicitly exclude everything else instead. -->
140115
<!-- excludePackageNames requires specification of packages separately from "all subpackages".
141116
https://issues.apache.org/jira/browse/MJAVADOC-584 -->
@@ -247,53 +222,4 @@
247222
</plugin>
248223
</plugins>
249224
</build>
250-
<profiles>
251-
<profile>
252-
<id>srczip-parent</id>
253-
<activation>
254-
<file>
255-
<exists>${java.home}/../src.zip</exists>
256-
</file>
257-
</activation>
258-
<dependencies>
259-
<dependency>
260-
<groupId>jdk</groupId>
261-
<artifactId>srczip</artifactId>
262-
<version>999</version>
263-
<scope>system</scope>
264-
<systemPath>${java.home}/../src.zip</systemPath>
265-
<optional>true</optional>
266-
</dependency>
267-
</dependencies>
268-
</profile>
269-
<profile>
270-
<id>srczip-lib</id>
271-
<activation>
272-
<file>
273-
<exists>${java.home}/lib/src.zip</exists>
274-
</file>
275-
</activation>
276-
<dependencies>
277-
<dependency>
278-
<groupId>jdk</groupId>
279-
<artifactId>srczip</artifactId>
280-
<version>999</version>
281-
<scope>system</scope>
282-
<systemPath>${java.home}/lib/src.zip</systemPath>
283-
<optional>true</optional>
284-
</dependency>
285-
</dependencies>
286-
<build>
287-
<plugins>
288-
<plugin>
289-
<artifactId>maven-javadoc-plugin</artifactId>
290-
<configuration>
291-
<!-- We need to point at the java.base subdirectory because Maven appears to assume that package foo.bar is located in foo/bar and not java.base/foo/bar when translating excludePackageNames into filenames to pass to javadoc. (Note that manually passing -exclude to javadoc appears to possibly not work at all for java.* types??) Also, referring only to java.base avoids a lot of other sources. -->
292-
<sourcepath>${project.build.sourceDirectory}:${project.build.directory}/jdk-sources/java.base</sourcepath>
293-
</configuration>
294-
</plugin>
295-
</plugins>
296-
</build>
297-
</profile>
298-
</profiles>
299225
</project>

0 commit comments

Comments
 (0)