Merge pull request #2 from PTC-ALM/master

Updating from master
jenkinsci · Nov 25, 2015 · 055f6a8 · 055f6a8
2 parents 3e38dc7 + 379971a
commit 055f6a8
Show file tree

Hide file tree

Showing 11 changed files with 711 additions and 745 deletions.
diff --git a/pom.xml b/pom.xml
@@ -72,22 +72,9 @@
 		<scope>test</scope>
 	</dependency>
 	<dependency>
-		<groupId>org.powermock</groupId>
-		<artifactId>powermock-api-mockito</artifactId>
-		<version>1.6.2</version>
-		<scope>test</scope>
-	</dependency>
-	<dependency>
-		<groupId>org.powermock</groupId>
-		<artifactId>powermock-module-junit4</artifactId>
-		<version>1.6.2</version>
-		<scope>test</scope>
-	</dependency>
-	<dependency>
-		<groupId>org.powermock</groupId>
-		<artifactId>powermock-api-easymock</artifactId>
-		<version>1.6.3</version>
-		<scope>test</scope>
+		<groupId>org.apache.commons</groupId>
+		<artifactId>commons-pool2</artifactId>
+		<version>2.4.2</version>
 	</dependency>
   </dependencies>
 

diff --git a/src/main/java/hudson/scm/IntegrityCMMember.java b/src/main/java/hudson/scm/IntegrityCMMember.java
@@ -24,9 +24,6 @@
 import hudson.scm.api.ExceptionHandler;
 import hudson.scm.api.command.CommandFactory;
 import hudson.scm.api.command.IAPICommand;
-import hudson.scm.api.command.ProjectAddCommand;
-import hudson.scm.api.command.ProjectCheckinCommand;
-import hudson.scm.api.command.SubmitCPCommand;
 import hudson.scm.api.option.APIOption;
 import hudson.scm.api.option.FileAPIOption;
 import hudson.scm.api.option.IAPIOption;
@@ -124,7 +121,7 @@ public static final String getDifferencesLink(String configPath, String memberID
 	public static final boolean checkout(ISession api, String configPath, String memberID, String memberRev, Timestamp memberTimestamp,
 							File targetFile, boolean restoreTimestamp, String lineTerminator) throws APIException
 	{
-	    	IAPICommand command = CommandFactory.createCommand(IAPICommand.PROJECT_CHECKOUT_COMMAND, null);
+	    IAPICommand command = CommandFactory.createCommand(IAPICommand.PROJECT_CHECKOUT_COMMAND, null);
 
 		command.addOption(new APIOption(IAPIOption.PROJECT, configPath));
 		command.addOption(new FileAPIOption(IAPIOption.TARGET_FILE, targetFile));
@@ -139,7 +136,7 @@ public static final boolean checkout(ISession api, String configPath, String mem
 		command.addAdditionalParameters(IAPIOption.TARGET_FILE,targetFile);
 
 		Response response =  command.execute(api);
-	        return BooleanUtils.toBoolean(response.getExitCode(), 0, 1);
+	    return BooleanUtils.toBoolean(response.getExitCode(), 0, 1);
 	}
 
 	/**