Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
PAYARA-243 fix broken images links, and allow jdk8 to be used to have…
… the {@docroot}

git-svn-id: https://svn.java.net/svn/glassfish~svn/trunk/main@63893 6f3ba3e3-413c-0410-a8aa-90bee3ab43b5

Conflicts:
	appserver/javaee-api/pom.xml
  • Loading branch information
romain_grecourt authored and Pandrex247 committed Jun 8, 2015
1 parent a1cbcfd commit ef5cdd1
Showing 1 changed file with 64 additions and 34 deletions.
98 changes: 64 additions & 34 deletions appserver/javaee-api/pom.xml
Expand Up @@ -59,40 +59,12 @@
<module>javax.javaee-api</module>
<module>javax.javaee-endorsed-api</module>
</modules>

<properties>
<extra.excludes />
</properties>
</properties>

<!--
A profile to report serialVersionUID errors when compiling
the API source files.
-->
<profiles>
<profile>
<id>check-serial-version-uid</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
<useIncrementalCompilation>
false
</useIncrementalCompilation>
<showWarnings>true</showWarnings>
<compilerArgs>
<arg>-Xlint:serial</arg>
</compilerArgs>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

<build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -127,6 +99,26 @@
<outputDirectory>${project.build.directory}/apidocs/doc-files</outputDirectory>
</configuration>
</execution>
<execution>
<id>copy-javadoc-resources</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<resources>
<resource>
<directory>${project.build.directory}/sources-dependency</directory>
<includes>
<include>**/*.jpg</include>
<include>**/*.gif</include>
<include>**/*.pdf</include>
</includes>
</resource>
</resources>
<outputDirectory>${project.build.directory}/apidocs</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down Expand Up @@ -197,12 +189,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<configuration>
<failOnError>false</failOnError>
<additionalparam>${javadoc.options}</additionalparam>
<attach>false</attach>
<doctitle>${project.name}</doctitle>
<windowtitle>${project.name}</windowtitle>
<bottom>
<![CDATA[Copyright &#169; 1996-2013,
<![CDATA[Copyright &#169; 1996-2015,
<a href="http://www.oracle.com">Oracle</a>
and/or its affiliates. All Rights Reserved.
Use is subject to
Expand All @@ -212,6 +207,41 @@
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</pluginManagement>
</build>
<profiles>
<!--
A profile to report serialVersionUID errors when compiling
the API source files.
-->
<profile>
<id>check-serial-version-uid</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
<useIncrementalCompilation>false</useIncrementalCompilation>
<showWarnings>true</showWarnings>
<compilerArgs>
<arg>-Xlint:serial</arg>
</compilerArgs>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>javadoc-jdk8+</id>
<activation>
<jdk>[1.8</jdk>
<activeByDefault>false</activeByDefault>
</activation>
<properties>
<javadoc.options>-Xdoclint:none</javadoc.options>
</properties>
</profile>
</profiles>
</project>

0 comments on commit ef5cdd1

Please sign in to comment.