Javadoc generation fix

Change-Id: I849827b9df49191440f6139f1a2b2ef37a3a4642

Author: Adam Lindenthal

docs/src/main/docbook/jersey.ent

@@ -49,7 +49,7 @@
 <!ENTITY experimentalrepository "snapshots">
 <!ENTITY guava.version "$guava-version">
 <!ENTITY jaxb-api-jar.version "$jaxb-api-jar-version">
-<!ENTITY jax-rs.version "$jax-rs-version">
+<!ENTITY jax-rs.version "$jax-rs-api-jar-version">
 <!ENTITY javax-el.version "$javax-el-version">
 <!ENTITY javax-el-impl.version "$javax-el-impl-version">
 <!ENTITY jax-rs-api-jar.version "$jax-rs-api-jar-version">
@@ -77,7 +77,7 @@
 <!ENTITY jaxb.release.uri "http://jaxb.java.net/nonav/&jaxb-api-jar.version;">
 <!ENTITY jaxb.javadoc.uri "&jaxb.release.uri;/docs/api/javax/xml/bind">
 <!ENTITY jaxrs.release.uri "http://jax-rs-spec.java.net/nonav/&jax-rs.version;">
-<!ENTITY jaxrs.javadoc.uri "&jaxrs.release.uri;/apidocs/javax/ws/rs">
+<!ENTITY jaxrs.javadoc.uri "https://jersey.java.net/apidocs-javax.jax-rs/&jax-rs.version;/javax/ws/rs">
 <!ENTITY jersey.ext.bean-validation.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-bean-validation/dependencies.html'>jersey-bean-validation</link>" >
 <!ENTITY jersey.ext.declarative-linking.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-declarative-linking/dependencies.html'>jersey-declarative-linking</link>" >
 <!ENTITY jersey.ext.entity-filtering.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-entity-filtering/dependencies.html'>jersey-entity-filtering</link>" >

pom.xml

@@ -322,9 +322,8 @@
                                 All Rights Reserved. Use is subject to license terms.]]>
                         </bottom>
                         <links>
-                            <link>http://jax-rs-spec.java.net/nonav/2.0/apidocs</link>
+                            <link>http://jersey.java.net/apidocs-javax.jax-rs/2.0.1</link>
                             <link>http://hk2.java.net/nonav/hk2-api/apidocs</link>
-                            <link>http://docs.oracle.com/javaee/7/api</link>
                         </links>
                         <excludePackageNames>
                             *.internal.*:*.tests.*
@@ -333,6 +332,7 @@
                             <exclude>bundles/**</exclude>
                         </sourceFileExcludes>
                         <verbose />
+                        <additionalparam>-Xdoclint:none</additionalparam>
                     </configuration>
                     <executions>
                         <execution>
@@ -753,6 +753,18 @@
                 <module>examples</module>
             </modules>
         </profile>
+        <profile> <!-- bundles module will be automatically included unless bundles.excluded env variable is set -->
+            <id>bundlesIncluded</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>!bundles.excluded</name>
+                </property>
+            </activation>
+            <modules>
+                <module>bundles</module>
+            </modules>
+        </profile>
         <profile> <!-- test-framework module will be automatically included unless test-framework.excluded env variable is set -->
             <id>testFrameworkIncluded</id>
             <activation>
@@ -1203,15 +1215,14 @@
                             and/or its affiliates.
                             All Rights Reserved. Use is subject to license terms.]]>
                     </bottom>
-                    <!-- TODO: add 'javax.ws.rs*' to excludePackageNames whenever links works. -->
                     <excludePackageNames>
                         com.sun.ws.rs.ext:*.examples.*:*.internal.*:*.tests.*
                     </excludePackageNames>
-                    <!-- TODO: links still not working :-( -->
                     <links>
-                        <link>http://jax-rs-spec.java.net/nonav/2.0/apidocs</link>
+                        <link>http://jersey.java.net/apidocs-javax.jax-rs/2.0.1</link>
                         <link>http://hk2.java.net/${hk2.version}/apidocs</link>
                     </links>
+                    <additionalparam>-Xdoclint:none</additionalparam>
                 </configuration>
                 <reportSets>
                     <reportSet>
@@ -1280,7 +1291,6 @@
     <modules>
         <module>archetypes</module>
         <module>bom</module>
-        <module>bundles</module>
         <module>connectors</module>
         <module>containers</module>