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.

Sign up for GitHub

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

Fix compilation on Java 11 #4505

Merged
merged 1 commit into from
Oct 25, 2018
Merged

Fix compilation on Java 11 #4505

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-api-javadocs</id>
Expand Down
4 changes: 2 additions & 2 deletions impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.8</version>
<version>0.8.2</version>
<executions>
<execution>
<id>default-prepare-agent</id>
Expand All @@ -340,7 +340,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down
2 changes: 1 addition & 1 deletion impl/src/main/java/javax/faces/component/UISelectMany.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
*
* <p>The {@link javax.faces.render.Renderer} for this component must
* perform the following logic on <a
* name="getConvertedValue"><code>getConvertedValue()</code></a>:</p>
* id="getConvertedValue"><code>getConvertedValue()</code></a>:</p>
*
* <blockquote>
*
Expand Down
5 changes: 2 additions & 3 deletions impl/src/main/java/javax/faces/webapp/UIComponentClassicTagBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,9 +1519,8 @@ public void release() {
* <code>doAfterBody()</code> method when it is called. Subclasses
* may override this method to return the appropriate value.</p>
*
* @return the value to return from <code>doAfterBody()</code>
*
* @return JspException if the value cannot be returned
* @return the value to return from <code>doAfterBody()</code>,
* JspException if the value cannot be returned
*
* @throws JspException if an unexpected condition arises while
* getting the value
Expand Down
2 changes: 1 addition & 1 deletion test/javaee6/correctScanningEar/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<plugins>
<plugin>
<artifactId>maven-ear-plugin</artifactId>
<version>2.10</version>
<version>3.0.1</version>
<configuration>
<displayName>test-javaee6-correctScanningEar</displayName>
<encoding>UTF-8</encoding>
Expand Down
1 change: 0 additions & 1 deletion test/osgi/simple/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<archive>
<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
Expand Down