Review JENKINS-25618

jenkinsci · Dec 7, 2014 · 2a5bdc6 · 2a5bdc6
1 parent c9e2801
commit 2a5bdc6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -48,8 +48,8 @@
 		<!-- Using Praqma's github repo as developer connection - this mean we must manual push tags and commits to the
 				 Jenkins CI github repo after an release. We do this to ensure no one sneaks code into our repo. -->
     <scm>
-				<connection>scm:git:ssh://github.com/Praqma/pretested-integration-plugin.git</connection>
-				<developerConnection>scm:git:ssh://github.com/Praqma/pretested-integration-plugin.git</developerConnection>
+        <connection>scm:git:ssh://github.com/Praqma/pretested-integration-plugin.git</connection>
+        <developerConnection>scm:git:ssh://github.com/Praqma/pretested-integration-plugin.git</developerConnection>
         <url>https://github.com/Praqma/pretested-integration-plugin</url>
     </scm>
 
@@ -131,7 +131,10 @@
 
 
             <!--
-            Use java 1.7. We need this for our testing environment
+                Use java 1.7. We need this for our testing environment. Java 6 was EOL last year
+                and i was starting to get some wierd errors with FindBugs plugin. Plugins also require
+                Java 7 with the version of Jenkins we're using so i decided to move to Java 7 which also soon
+                is EOL.                  
             -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/.../org/jenkinsci/plugins/pretestedintegration/integration/scm/git/BuildResultValidator.java b/.../org/jenkinsci/plugins/pretestedintegration/integration/scm/git/BuildResultValidator.java
@@ -16,6 +16,8 @@
 import org.eclipse.jgit.revwalk.RevWalk;
 
 /**
+ * Abstraction for validating a Jenkins build result. It also automagically 
+ * cleans up any resources used. (Specifically repositories).
  *
  * @author Mads
  */

diff --git a/...va/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/GeneralBehaviourIT.java b/...va/org/jenkinsci/plugins/pretestedintegration/integration/scm/git/GeneralBehaviourIT.java
@@ -312,6 +312,11 @@ public void testOriginAndEmptyInDualConfig() throws Exception {
         }
     }
 
+    /**
+     * We want to test that the squash commit merge message we crease is the standard message. So we assert and check that the tip of our 
+     * repository has a commit that follows the patter of the default Squash merge commit message.
+     * @throws Exception 
+     */
     @Bug(25618)
     @Test
     public void validateSquashCommitMessageContents() throws Exception {