Improvements \o/.

Upgraded dependencies. Changed XPath expressions due to upgrade of Xmlbeam.

Author: odrotbohm

files/sample-pom-modified.xml

@@ -1,3 +1,3 @@
 io.workDir=~/temp/spring-data-shell
 
-git.author=Oliver Gierke <ogierke@gopivotal.com>
+git.author=Oliver Gierke <ogierke@pivotal.io>

infrastructure.properties

@@ -8,10 +8,11 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.0.2.RELEASE</version>
+		<version>1.2.4.RELEASE</version>
 	</parent>
 
 	<properties>
+		<java.version>1.8</java.version>
 		<jar.mainclass>org.springframework.shell.Bootstrap</jar.mainclass>
 	</properties>
 
@@ -26,7 +27,7 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
@@ -42,30 +43,29 @@
 			<artifactId>spring-shell</artifactId>
 			<version>1.1.0.BUILD-SNAPSHOT</version>
 		</dependency>
-		
+
 		<dependency>
 		    <groupId>org.xmlbeam</groupId>
 		    <artifactId>xmlprojector</artifactId>
-		    <version>1.1.4</version>
+		    <version>1.4.7</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-exec</artifactId>
-			<version>1.2</version>
+			<version>1.3</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.12.4</version>
+			<version>1.16.4</version>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework.plugin</groupId>
 			<artifactId>spring-plugin-core</artifactId>
-			<version>1.0.0.RELEASE</version>
 		</dependency>
 
 		<dependency>
@@ -77,18 +77,8 @@
 	<build>
 		<plugins>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-			</plugin>
-
 			<!-- Shell packaging -->
 
-
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>appassembler-maven-plugin</artifactId>

pom.xml

@@ -15,14 +15,14 @@
  */
 package org.springframework.data.release.git;
 
+import lombok.RequiredArgsConstructor;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Future;
 
-import lombok.RequiredArgsConstructor;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.data.release.io.CommandResult;
@@ -37,6 +37,7 @@
 import org.springframework.data.release.model.Project;
 import org.springframework.data.release.model.Train;
 import org.springframework.data.release.model.TrainIteration;
+import org.springframework.data.release.utils.CommandUtils;
 import org.springframework.data.release.utils.Logger;
 import org.springframework.plugin.core.PluginRegistry;
 import org.springframework.stereotype.Component;
@@ -49,7 +50,7 @@
  * @author Oliver Gierke
  */
 @Component
-@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
 public class GitOperations {
 
 	private final GitServer server = new GitServer();
@@ -77,7 +78,8 @@ public void reset(TrainIteration train) throws Exception {
 
 			Branch branch = Branch.from(module);
 
-			os.executeCommand(String.format("git reset --hard origin/%s", branch), module.getProject()).get();
+			CommandUtils.getCommandResult(
+					os.executeCommand(String.format("git reset --hard origin/%s", branch), module.getProject()));
 		}
 	}
 
@@ -100,11 +102,11 @@ public void checkout(TrainIteration iteration) throws Exception {
 			Tag tag = findTagFor(project, artifactVersion);
 
 			if (tag == null) {
-				throw new IllegalStateException(String.format("No tag found for version %s of project %s, aborting.",
-						artifactVersion, project));
+				throw new IllegalStateException(
+						String.format("No tag found for version %s of project %s, aborting.", artifactVersion, project));
 			}
 
-			os.executeCommand(String.format("git checkout %s", tag), project).get();
+			CommandUtils.getCommandResult(os.executeCommand(String.format("git checkout %s", tag), project));
 		}
 
 		logger.log(iteration, "Successfully checked out projects.");
@@ -116,10 +118,10 @@ public void prepare(TrainIteration iteration) throws Exception {
 
 			Branch branch = Branch.from(module);
 
-			update(module.getProject()).get();
+			CommandUtils.getCommandResult(update(module.getProject()));
 
 			String checkoutCommand = String.format("git checkout %s && git pull origin %s", branch, branch);
-			os.executeCommand(checkoutCommand, module.getProject()).get();
+			CommandUtils.getCommandResult(os.executeCommand(checkoutCommand, module.getProject()));
 		}
 	}
 
@@ -132,7 +134,7 @@ public void update(Train train) throws Exception {
 		}
 
 		for (Future<CommandResult> execution : executions) {
-			execution.get();
+			CommandUtils.getCommandResult(execution);
 		}
 	}
 
@@ -141,14 +143,15 @@ public void push(TrainIteration iteration) throws Exception {
 		for (ModuleIteration module : iteration) {
 
 			Branch branch = Branch.from(module);
-			os.executeCommand(String.format("git push origin %s", branch), module.getProject()).get();
+			CommandUtils
+					.getCommandResult(os.executeCommand(String.format("git push origin %s", branch), module.getProject()));
 		}
 	}
 
 	public void pushTags(Train train) throws Exception {
 
 		for (Module module : train) {
-			os.executeCommand("git push --tags", module.getProject()).get();
+			CommandUtils.getCommandResult(os.executeCommand("git push --tags", module.getProject()));
 		}
 	}
 
@@ -198,15 +201,15 @@ public void tagRelease(TrainIteration iteration) throws Exception {
 			Project project = module.getProject();
 
 			String checkoutCommand = String.format("git checkout %s", branch);
-			os.executeCommand(checkoutCommand, project).get();
+			CommandUtils.getCommandResult(os.executeCommand(checkoutCommand, project));
 
 			String updateCommand = String.format("git pull origin %s", branch);
-			os.executeCommand(updateCommand, project).get();
+			CommandUtils.getCommandResult(os.executeCommand(updateCommand, project));
 
 			String hash = getReleaseHash(module);
 			Tag tag = getTags(project).createTag(module);
 			String tagCommand = String.format("git tag %s %s", tag, hash);
-			os.executeCommand(tagCommand, project).get();
+			CommandUtils.getCommandResult(os.executeCommand(tagCommand, project));
 		}
 	}
 
@@ -263,9 +266,9 @@ public void commit(ModuleIteration module, String summary, String details, File.
 				os.executeCommand(String.format("git add %s", file.getAbsolutePath()), project).get();
 			}
 
-			os.executeCommand(commitCommand, project).get();
+			CommandUtils.getCommandResult(os.executeCommand(commitCommand, project));
 		} else {
-			os.executeCommand(commitCommand.concat(" -a"), project).get();
+			CommandUtils.getCommandResult(os.executeCommand(commitCommand.concat(" -a"), project));
 		}
 	}
 
@@ -288,8 +291,8 @@ private String getReleaseHash(ModuleIteration module) throws Exception {
 			}
 		}
 
-		throw new IllegalStateException(String.format("Did not find a release commit for project %s (ticket id %s)",
-				project, releaseTicket.getId()));
+		throw new IllegalStateException(
+				String.format("Did not find a release commit for project %s (ticket id %s)", project, releaseTicket.getId()));
 	}
 
 	/**

src/main/java/org/springframework/data/release/git/GitOperations.java

@@ -24,6 +24,6 @@
  */
 public interface ParentPom extends Pom {
 
-	@XBWrite("/project/profiles/profile[id=''distribute'']/dependencies/dependency/version")
+	@XBWrite("/project/profiles/profile[id=\"distribute\"]/dependencies/dependency/version")
 	void setSharedResourcesVersion(@XBValue ArtifactVersion value);
 }

src/main/java/org/springframework/data/release/maven/ParentPom.java

@@ -43,10 +43,10 @@ public interface Pom {
 	@XBWrite("/project/properties/{0}")
 	void setProperty(String property, @XBValue ArtifactVersion value);
 
-	@XBWrite("/project/repositories/repository[id=''{0}'']/id")
+	@XBWrite("/project/repositories/repository[id=\"{0}\"]/id")
 	void setRepositoryId(String oldId, @XBValue String newId);
 
-	@XBWrite("/project/repositories/repository[id=''{0}'']/url")
+	@XBWrite("/project/repositories/repository[id=\"{0}\"]/url")
 	void setRepositoryUrl(String id, @XBValue String url);
 
 	/**