Skip to content

Commit

Permalink
Issue #295 - Javadoc License fixes from PR review
Browse files Browse the repository at this point in the history
+ Renamed SpecLicense.html to EFSL.html
+ Added <inceptionYear> to pom
+ Removed redundant <br> in javadoc <header> configuration
+ Corrected javadoc <bottom> configuration

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
  • Loading branch information
joakime committed Jul 31, 2019
1 parent 6c6f872 commit 5599127
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
11 changes: 6 additions & 5 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
<description>Jakarta WebSocket - API Parent</description>
<url>https://projects.eclipse.org/projects/ee4j.websocket</url>

<inceptionYear>2012</inceptionYear>

<scm>
<connection>scm:git:https://github.com/eclipse-ee4j/websocket-api</connection>
<developerConnection>scm:git:ssh://git@github.com/eclipse-ee4j/websocket-api</developerConnection>
Expand Down Expand Up @@ -184,12 +186,11 @@
<description>Jakarta WebSocket API documentation</description>
<doctitle>Jakarta WebSocket API documentation</doctitle>
<windowtitle>Jakarta WebSocket API documentation</windowtitle>
<header><![CDATA[<br>Jakarta WebSocket API v${project.version}]]></header>
<header><![CDATA[Jakarta WebSocket API v${project.version}]]></header>
<bottom><![CDATA[
Comments to: <a href="mailto:websocket-dev@eclipse.org">websocket-dev@eclipse.org</a>.<br>
Copyright &#169; 2017-{currentYear} - <a href="https://www.eclipse.org">Eclipse Foundation</a>. All rights reserved.<br>
Use is subject to <a href="{@docRoot}/doc-files/SpecLicense.html" target="_top">Eclipse Foundation Specification License</a>.]]>
</bottom>
Copyright &#169; ${project.inceptionYear}&#x2013;{currentYear} Oracle and/or its affiliates. All rights reserved.<br>
Use is subject to <a href="{@docRoot}/doc-files/EFSL.html" target="_top">license terms</a>.
]]></bottom>
<includeDependencySources>true</includeDependencySources>
<failOnError>false</failOnError>
</configuration>
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<description>Jakarta WebSocket</description>
<url>https://projects.eclipse.org/projects/ee4j.websocket</url>

<inceptionYear>2012</inceptionYear>

<scm>
<connection>scm:git:https://github.com/eclipse-ee4j/websocket-api</connection>
<developerConnection>scm:git:ssh://git@github.com/eclipse-ee4j/websocket-api</developerConnection>
Expand Down

0 comments on commit 5599127

Please sign in to comment.