Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MODULES-386] Fixing Javadoc build issues on JDK11 #237

Merged
merged 1 commit into from Mar 18, 2019
Merged

[MODULES-386] Fixing Javadoc build issues on JDK11 #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
<version>24</version>
<version>32</version>
</parent>

<licenses>
Expand Down Expand Up @@ -233,8 +233,13 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>${version.javadoc.plugin}</version>
<configuration>
<detectJavaApiLink>false</detectJavaApiLink>
<excludePackageNames>__redirected</excludePackageNames>
<excludePackageNames>org.jboss.modules._private</excludePackageNames>
<sourcepath>${project.basedir}/src/main/java9;${project.basedir}/src/main/java</sourcepath>
<sourceFileExcludes>
<exclude>org/jboss/modules/JDKSpecific.java</exclude>
</sourceFileExcludes>
</configuration>
</plugin>

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/jboss/modules/maven/MavenArtifactUtil.java
View file
Open in desktop
Expand Up @@ -194,7 +194,7 @@ public static ResourceLoader createMavenArtifactLoader(final MavenResolver maven
/**
* A utility method to create a Maven artifact resource loader for the given artifact coordinates.
*
* @param name the resource root name to use (must not be {@code null})
* @param rootName the resource root name to use (must not be {@code null})
* @param coordinates the artifact coordinates to use (must not be {@code null})
* @param mavenResolver the Maven resolver to use (must not be {@code null})
* @return the resource loader
Expand Down
28 changes: 14 additions & 14 deletions src/main/java/org/jboss/modules/xml/XmlPullParser.java
View file
Open in desktop
Expand Up @@ -87,7 +87,7 @@
* factory.setNamespaceAware(true);
* XmlPullParser xpp = factory.newPullParser();
*
* xpp.<a href="#setInput">setInput</a>( new StringReader ( "&lt;foo>Hello World!&lt;/foo>" ) );
* xpp.<a href="#setInput">setInput</a>( new StringReader ( "&lt;foo&gt;Hello World!&lt;/foo&gt;" ) );
* int eventType = xpp.getEventType();
* while (eventType != XmlPullParser.END_DOCUMENT) {
* if(eventType == XmlPullParser.START_DOCUMENT) {
Expand Down Expand Up @@ -545,7 +545,7 @@ void setInput(InputStream inputStream, String inputEncoding)
* XmlPullParser pp = ...
* int nsStart = pp.getNamespaceCount(pp.getDepth()-1);
* int nsEnd = pp.getNamespaceCount(pp.getDepth());
* for (int i = nsStart; i < nsEnd; i++) {
* for (int i = nsStart; i &lt; nsEnd; i++) {
* String prefix = pp.getNamespacePrefix(i);
* String ns = pp.getNamespaceUri(i);
* // ...
Expand Down Expand Up @@ -592,7 +592,7 @@ void setInput(InputStream inputStream, String inputEncoding)
* <p>This method is a convenience method for
*
* <pre>
* for (int i = getNamespaceCount(getDepth ())-1; i >= 0; i--) {
* for (int i = getNamespaceCount(getDepth ())-1; i &gt;= 0; i--) {
* if (getNamespacePrefix(i).equals( prefix )) {
* return getNamespaceUri(i);
* }
Expand Down Expand Up @@ -627,7 +627,7 @@ void setInput(InputStream inputStream, String inputEncoding)
*
* <pre>
* &lt;!-- outside --&gt; 0
* &lt;root> 1
* &lt;root&gt; 1
* sometext 1
* &lt;foobar&gt; 2
* &lt;/foobar&gt; 2
Expand Down Expand Up @@ -913,9 +913,9 @@ void setInput(InputStream inputStream, String inputEncoding)
* must be expanded or exception mus be thrown if entity reerence can not be exapnded).
* If element content is empty (content is "") then no TEXT event will be reported.
*
* <p><b>NOTE:</b> empty element (such as &lt;tag/>) will be reported
* <p><b>NOTE:</b> empty element (such as &lt;tag/&gt;) will be reported
* with two separate events: START_TAG, END_TAG - it must be so to preserve
* parsing equivalency of empty element to &lt;tag>&lt;/tag>.
* parsing equivalency of empty element to &lt;tag&gt;&lt;/tag&gt;.
* (see isEmptyElementTag ())
*
* @see #isEmptyElementTag
Expand Down Expand Up @@ -950,9 +950,9 @@ int next()
* <dt>START_DOCUMENT<dd>null
* <dt>END_DOCUMENT<dd>null
* <dt>START_TAG<dd>null unless FEATURE_XML_ROUNDTRIP
* enabled and then returns XML tag, ex: &lt;tag attr='val'>
* enabled and then returns XML tag, ex: &lt;tag attr='val'&gt;
* <dt>END_TAG<dd>null unless FEATURE_XML_ROUNDTRIP
* id enabled and then returns XML tag, ex: &lt;/tag>
* id enabled and then returns XML tag, ex: &lt;/tag&gt;
* <dt>TEXT<dd>return element content.
* <br>Note: that element content may be delivered in multiple consecutive TEXT events.
* <dt>IGNORABLE_WHITESPACE<dd>return characters that are determined to be ignorable white
Expand All @@ -961,15 +961,15 @@ int next()
* <br>Note: that element content may be delevered in multiple consecutive IGNORABLE_WHITESPACE events.
* <dt>CDSECT<dd>
* return text <em>inside</em> CDATA
* (ex. 'fo&lt;o' from &lt;!CDATA[fo&lt;o]]>)
* (ex. 'fo&lt;o' from &lt;!CDATA[fo&lt;o]]&gt;)
* <dt>PROCESSING_INSTRUCTION<dd>
* if FEATURE_XML_ROUNDTRIP is true
* return exact PI content ex: 'pi foo' from &lt;?pi foo?>
* return exact PI content ex: 'pi foo' from &lt;?pi foo?&gt;
* otherwise it may be exact PI content or concatenation of PI target,
* space and data so for example for
* &lt;?target data?> string &quot;target data&quot; may
* &lt;?target data?&gt; string &quot;target data&quot; may
* be returned if FEATURE_XML_ROUNDTRIP is false.
* <dt>COMMENT<dd>return comment content ex. 'foo bar' from &lt;!--foo bar-->
* <dt>COMMENT<dd>return comment content ex. 'foo bar' from &lt;!--foo bar--&gt;
* <dt>ENTITY_REF<dd>getText() MUST return entity replacement text if PROCESS_DOCDECL is false
* otherwise getText() MAY return null,
* additionally getTextCharacters() MUST return entity name
Expand All @@ -987,10 +987,10 @@ int next()
* if FEATURE_XML_ROUNDTRIP is true or PROCESS_DOCDECL is false
* then return what is inside of DOCDECL for example it returns:<pre>
* &quot; titlepage SYSTEM "http://www.foo.bar/dtds/typo.dtd"
* [&lt;!ENTITY % active.links "INCLUDE">]&quot;</pre>
* [&lt;!ENTITY % active.links "INCLUDE"&gt;]&quot;</pre>
* <p>for input document that contained:<pre>
* &lt;!DOCTYPE titlepage SYSTEM "http://www.foo.bar/dtds/typo.dtd"
* [&lt;!ENTITY % active.links "INCLUDE">]></pre>
* [&lt;!ENTITY % active.links "INCLUDE"&gt;]&gt;</pre>
* otherwise if FEATURE_XML_ROUNDTRIP is false and PROCESS_DOCDECL is true
* then what is returned is undefined (it may be even null)
* </dd>
Expand Down