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

pom.xml

@@ -94,6 +94,7 @@ THE SOFTWARE.
     <slf4jVersion>1.7.7</slf4jVersion> <!-- < 1.6.x version didn't specify the license (MIT) -->
     <maven-plugin.version>2.7.1</maven-plugin.version>
     <matrix-project.version>1.4.1</matrix-project.version>
+    <sorcerer.version>0.11</sorcerer.version>
     <animal.sniffer.skip>${skipTests}</animal.sniffer.skip>
     <findbugs-maven-plugin.version>3.0.1</findbugs-maven-plugin.version>
     <test-annotations.version>1.2</test-annotations.version>
@@ -800,17 +801,24 @@ THE SOFTWARE.
       <reporting>
         <plugins>
           <plugin>
-            <groupId>org.jvnet.sorcerer</groupId>
+            <groupId>org.kohsuke.sorcerer</groupId>
             <artifactId>maven-sorcerer-plugin</artifactId>
-            <version>0.8</version>
+            <version>${sorcerer.version}</version>
+            <configuration>
+              <source>1.${java.level}</source>
+            </configuration>
           </plugin>
         </plugins>
       </reporting>
       <build>
         <plugins>
           <plugin>
-            <groupId>org.jvnet.sorcerer</groupId>
+            <groupId>org.kohsuke.sorcerer</groupId>
             <artifactId>maven-sorcerer-plugin</artifactId>
+            <version>${sorcerer.version}</version>
+            <configuration>
+              <source>1.${java.level}</source>
+            </configuration>
           </plugin>
         </plugins>
       </build>

war/pom.xml

@@ -558,12 +558,16 @@ THE SOFTWARE.
             <executions>
               <execution>
                 <id>signWar</id>
-                <phase>verify</phase>
+                <phase>pre-integration-test</phase>
                 <goals>
                   <goal>sign</goal>
                 </goals>
                 <configuration>
                   <archive>${project.build.directory}/${project.build.finalName}.war</archive>
+                  <arguments>
+                    <argument>-tsa</argument>
+                    <argument>http://timestamp.comodoca.com/rfc3161</argument>
+                  </arguments>
                 </configuration>
               </execution>
             </executions>