You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/09/25 23:19:21 UTC
svn commit: r1175581 - in /maven/plugins/trunk/maven-javadoc-plugin/src/main:
java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
resources/org/apache/maven/plugin/javadoc/java-api-package-list-1.7
Author: hboutemy
Date: Sun Sep 25 21:19:21 2011
New Revision: 1175581
URL: http://svn.apache.org/viewvc?rev=1175581&view=rev
Log:
[MJAVADOC-327] added Java 7 to known javadoc API urls
Added:
maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/org/apache/maven/plugin/javadoc/java-api-package-list-1.7
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java?rev=1175581&r1=1175580&r2=1175581&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java Sun Sep 25 21:19:21 2011
@@ -150,7 +150,7 @@ public abstract class AbstractJavadocMoj
/**
* The default Javadoc API urls according the
- * <a href="http://java.sun.com/reference/api/index.html">Sun API Specifications</a>:
+ * <a href="http://www.oracle.com/technetwork/java/javase/documentation/api-jsp-136079.html">Sun API Specifications</a>:
* <pre>
* <javaApiLinks>
* <property>
@@ -169,6 +169,10 @@ public abstract class AbstractJavadocMoj
* <name>api_1.6</name>
* <value>http://download.oracle.com/javase/6/docs/api/</value>
* </property>
+ * <property>
+ * <name>api_1.7</name>
+ * <value>http://download.oracle.com/javase/7/docs/api/</value>
+ * </property>
* </javaApiLinks>
* </pre>
*
@@ -1622,7 +1626,6 @@ public abstract class AbstractJavadocMoj
/**
* List of included dependency-source patterns. Example: <code>org.apache.maven:*</code>
- *
*
* @parameter
* @since 2.7
@@ -1632,7 +1635,6 @@ public abstract class AbstractJavadocMoj
/**
* List of excluded dependency-source patterns. Example: <code>org.apache.maven.shared:*</code>
- *
*
* @parameter
* @since 2.7
@@ -1659,8 +1661,8 @@ public abstract class AbstractJavadocMoj
private transient List<JavadocBundle> dependencyJavadocBundles;
/**
- * capability to add optionnal dependencies to the javadoc classpath
- * Exemple :
+ * capability to add optionnal dependencies to the javadoc classpath.
+ * Exemple:
* <pre>
* <additionnalDependencies>
* <additionnalDependency>
@@ -1685,6 +1687,7 @@ public abstract class AbstractJavadocMoj
DEFAULT_JAVA_API_LINKS.put( "api_1.4", "http://download.oracle.com/javase/1.4.2/docs/api/" );
DEFAULT_JAVA_API_LINKS.put( "api_1.5", "http://download.oracle.com/javase/1.5.0/docs/api/" );
DEFAULT_JAVA_API_LINKS.put( "api_1.6", "http://download.oracle.com/javase/6/docs/api/" );
+ DEFAULT_JAVA_API_LINKS.put( "api_1.7", "http://download.oracle.com/javase/7/docs/api/" );
}
// ----------------------------------------------------------------------
@@ -2165,7 +2168,8 @@ public abstract class AbstractJavadocMoj
}
catch ( IOException e )
{
- throw new MavenReportException( "Failed to delete cache directory: " + sourceDependencyCacheDir + "\nReason: " + e.getMessage(), e );
+ throw new MavenReportException( "Failed to delete cache directory: " + sourceDependencyCacheDir
+ + "\nReason: " + e.getMessage(), e );
}
final SourceResolverConfig config = getDependencySourceResolverConfig();
@@ -2222,13 +2226,13 @@ public abstract class AbstractJavadocMoj
{
Set<Artifact> dependencyArtifacts = project.getDependencyArtifacts();
- List<String> artifactPatterns = new ArrayList<String>(dependencyArtifacts.size());
- for (Artifact artifact : dependencyArtifacts)
+ List<String> artifactPatterns = new ArrayList<String>( dependencyArtifacts.size() );
+ for ( Artifact artifact : dependencyArtifacts )
{
- artifactPatterns.add(artifact.getGroupId() + ":" + artifact.getArtifactId());
+ artifactPatterns.add( artifact.getGroupId() + ":" + artifact.getArtifactId() );
}
- return new IncludesArtifactFilter(artifactPatterns);
+ return new IncludesArtifactFilter( artifactPatterns );
}
/**
@@ -5490,10 +5494,14 @@ public abstract class AbstractJavadocMoj
{
apiVersion = "1.5";
}
- else if ( sourceVersion >= 1.6f )
+ else if ( sourceVersion >= 1.6f && sourceVersion < 1.7f )
{
apiVersion = "1.6";
}
+ else if ( sourceVersion >= 1.7f )
+ {
+ apiVersion = "1.7";
+ }
String javaApiLink = javaApiLinks.getProperty( "api_" + apiVersion, null );
if ( getLog().isDebugEnabled() )
Added: maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/org/apache/maven/plugin/javadoc/java-api-package-list-1.7
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/org/apache/maven/plugin/javadoc/java-api-package-list-1.7?rev=1175581&view=auto
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/org/apache/maven/plugin/javadoc/java-api-package-list-1.7 (added)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/main/resources/org/apache/maven/plugin/javadoc/java-api-package-list-1.7 Sun Sep 25 21:19:21 2011
@@ -0,0 +1,209 @@
+java.applet
+java.awt
+java.awt.color
+java.awt.datatransfer
+java.awt.dnd
+java.awt.event
+java.awt.font
+java.awt.geom
+java.awt.im
+java.awt.im.spi
+java.awt.image
+java.awt.image.renderable
+java.awt.print
+java.beans
+java.beans.beancontext
+java.io
+java.lang
+java.lang.annotation
+java.lang.instrument
+java.lang.invoke
+java.lang.management
+java.lang.ref
+java.lang.reflect
+java.math
+java.net
+java.nio
+java.nio.channels
+java.nio.channels.spi
+java.nio.charset
+java.nio.charset.spi
+java.nio.file
+java.nio.file.attribute
+java.nio.file.spi
+java.rmi
+java.rmi.activation
+java.rmi.dgc
+java.rmi.registry
+java.rmi.server
+java.security
+java.security.acl
+java.security.cert
+java.security.interfaces
+java.security.spec
+java.sql
+java.text
+java.text.spi
+java.util
+java.util.concurrent
+java.util.concurrent.atomic
+java.util.concurrent.locks
+java.util.jar
+java.util.logging
+java.util.prefs
+java.util.regex
+java.util.spi
+java.util.zip
+javax.accessibility
+javax.activation
+javax.activity
+javax.annotation
+javax.annotation.processing
+javax.crypto
+javax.crypto.interfaces
+javax.crypto.spec
+javax.imageio
+javax.imageio.event
+javax.imageio.metadata
+javax.imageio.plugins.bmp
+javax.imageio.plugins.jpeg
+javax.imageio.spi
+javax.imageio.stream
+javax.jws
+javax.jws.soap
+javax.lang.model
+javax.lang.model.element
+javax.lang.model.type
+javax.lang.model.util
+javax.management
+javax.management.loading
+javax.management.modelmbean
+javax.management.monitor
+javax.management.openmbean
+javax.management.relation
+javax.management.remote
+javax.management.remote.rmi
+javax.management.timer
+javax.naming
+javax.naming.directory
+javax.naming.event
+javax.naming.ldap
+javax.naming.spi
+javax.net
+javax.net.ssl
+javax.print
+javax.print.attribute
+javax.print.attribute.standard
+javax.print.event
+javax.rmi
+javax.rmi.CORBA
+javax.rmi.ssl
+javax.script
+javax.security.auth
+javax.security.auth.callback
+javax.security.auth.kerberos
+javax.security.auth.login
+javax.security.auth.spi
+javax.security.auth.x500
+javax.security.cert
+javax.security.sasl
+javax.sound.midi
+javax.sound.midi.spi
+javax.sound.sampled
+javax.sound.sampled.spi
+javax.sql
+javax.sql.rowset
+javax.sql.rowset.serial
+javax.sql.rowset.spi
+javax.swing
+javax.swing.border
+javax.swing.colorchooser
+javax.swing.event
+javax.swing.filechooser
+javax.swing.plaf
+javax.swing.plaf.basic
+javax.swing.plaf.metal
+javax.swing.plaf.multi
+javax.swing.plaf.nimbus
+javax.swing.plaf.synth
+javax.swing.table
+javax.swing.text
+javax.swing.text.html
+javax.swing.text.html.parser
+javax.swing.text.rtf
+javax.swing.tree
+javax.swing.undo
+javax.tools
+javax.transaction
+javax.transaction.xa
+javax.xml
+javax.xml.bind
+javax.xml.bind.annotation
+javax.xml.bind.annotation.adapters
+javax.xml.bind.attachment
+javax.xml.bind.helpers
+javax.xml.bind.util
+javax.xml.crypto
+javax.xml.crypto.dom
+javax.xml.crypto.dsig
+javax.xml.crypto.dsig.dom
+javax.xml.crypto.dsig.keyinfo
+javax.xml.crypto.dsig.spec
+javax.xml.datatype
+javax.xml.namespace
+javax.xml.parsers
+javax.xml.soap
+javax.xml.stream
+javax.xml.stream.events
+javax.xml.stream.util
+javax.xml.transform
+javax.xml.transform.dom
+javax.xml.transform.sax
+javax.xml.transform.stax
+javax.xml.transform.stream
+javax.xml.validation
+javax.xml.ws
+javax.xml.ws.handler
+javax.xml.ws.handler.soap
+javax.xml.ws.http
+javax.xml.ws.soap
+javax.xml.ws.spi
+javax.xml.ws.spi.http
+javax.xml.ws.wsaddressing
+javax.xml.xpath
+org.ietf.jgss
+org.omg.CORBA
+org.omg.CORBA.DynAnyPackage
+org.omg.CORBA.ORBPackage
+org.omg.CORBA.TypeCodePackage
+org.omg.CORBA.portable
+org.omg.CORBA_2_3
+org.omg.CORBA_2_3.portable
+org.omg.CosNaming
+org.omg.CosNaming.NamingContextExtPackage
+org.omg.CosNaming.NamingContextPackage
+org.omg.Dynamic
+org.omg.DynamicAny
+org.omg.DynamicAny.DynAnyFactoryPackage
+org.omg.DynamicAny.DynAnyPackage
+org.omg.IOP
+org.omg.IOP.CodecFactoryPackage
+org.omg.IOP.CodecPackage
+org.omg.Messaging
+org.omg.PortableInterceptor
+org.omg.PortableInterceptor.ORBInitInfoPackage
+org.omg.PortableServer
+org.omg.PortableServer.CurrentPackage
+org.omg.PortableServer.POAManagerPackage
+org.omg.PortableServer.POAPackage
+org.omg.PortableServer.ServantLocatorPackage
+org.omg.PortableServer.portable
+org.omg.SendingContext
+org.omg.stub.java.rmi
+org.w3c.dom
+org.w3c.dom.bootstrap
+org.w3c.dom.events
+org.w3c.dom.ls
+org.xml.sax
+org.xml.sax.ext
+org.xml.sax.helpers
\ No newline at end of file