Merge branch 'master' of github.com:jenkinsci/jenkins

changelog.html

@@ -63,7 +63,10 @@ Upcoming changes</a>
 
 <!-- these changes are controlled by the release process. DO NOT MODIFY -->
 <div id="rc" style="display:none;"><!--=BEGIN=-->
-<h3><a name=v1.487>What's new in 1.487</a> <!--=DATE=--></h3>
+<h3><a name=v1.488>What's new in 1.488</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.487>What's new in 1.487</a> (2012/10/23)</h3>
 <ul class=image>
   <li class=rfe>
     JNLP Slave agent on OS X can install itself as a launchd service.
@@ -86,7 +89,6 @@ Upcoming changes</a>
     Plugin manager now supports uninstallation.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-3070">issue 3070</a>)
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.486>What's new in 1.486</a> (2012/10/14)</h3>
 <ul class=image>
   <li class=bug>

debian/debian/changelog

+jenkins (1.487) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Tue, 23 Oct 2012 17:10:11 -0700
+
 jenkins (1.486) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.

war/pom.xml

@@ -448,28 +448,6 @@ THE SOFTWARE.
           </webApp>
         </configuration>
       </plugin>
-      <plugin>
-        <!-- generate aggregated javadoc that goes to http://javadoc.jenkins-ci.org/ -->
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <inherited>false</inherited>
-        <configuration>
-          <includeDependencySources>true</includeDependencySources>
-          <dependencySourceIncludes>
-            <dependencySourceInclude>org.jvnet.hudson*:*</dependencySourceInclude>
-            <dependencySourceInclude>org.jenkins-ci*:*</dependencySourceInclude>
-          </dependencySourceIncludes>
-          <dependencySourceExcludes>
-            <dependencySourceExclude>org.jenkins-ci:trilead-ssh2</dependencySourceExclude>
-            <dependencySourceExclude>*:commons-*</dependencySourceExclude>
-            <dependencySourceExclude>org.jvnet.hudson:jtidy</dependencySourceExclude>
-            <dependencySourceExclude>*:dom4j</dependencySourceExclude>
-            <dependencySourceExclude>*:activation</dependencySourceExclude>
-            <dependencySourceExclude>*:xstream</dependencySourceExclude>
-            <dependencySourceExclude>*:jmdns</dependencySourceExclude>
-          </dependencySourceExcludes>
-
-        </configuration>
-      </plugin>
     </plugins>
   </build>