From 5e7b844b65cf021ce1378bc1a1f78f9bc8a2b33d Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Tue, 29 Oct 2013 09:19:24 -0700
Subject: [PATCH] Completing the migration to Java6

---
 changelog.html | 3 +++
 pom.xml        | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changelog.html b/changelog.html
index 3fb4857488..0fdeb5fd5a 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,9 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=rfe>
+    Core started relying on Java6 API, completing Java5 -&gt; Java6 migration.
+    (<a href="https://groups.google.com/d/topic/jenkinsci-dev/c_XTbO52PTM/discussion">discussion</a>)
   <li class=rfe>
     Adding a batch of contributed localization from the community.
 </ul>
diff --git a/pom.xml b/pom.xml
index bfa252a24a..32ae97816f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -593,8 +593,7 @@ THE SOFTWARE.
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
-            <!-- Currently held back to java15. After Sep 30 2013 (perhaps?), switch to java1${java.level}. -->
-            <artifactId>java15</artifactId>
+            <artifactId>java1${java.level}</artifactId>
             <version>1.0</version>
           </signature>
         </configuration>