diff --git a/release-tools/pom.xml b/release-tools/pom.xml
index a907794..4f9d331 100644
--- a/release-tools/pom.xml
+++ b/release-tools/pom.xml
@@ -15,6 +15,7 @@
 		<java.version>1.8</java.version>
 		<jar.mainclass>org.springframework.data.release.Application</jar.mainclass>
 		<spring-plugin.version>1.3.0.BUILD-SNAPSHOT</spring-plugin.version>
+		<spring.version>4.3.0.RELEASE</spring.version>
 	</properties>
 
 	<dependencies>
@@ -52,7 +53,7 @@
 		<dependency>
 			<groupId>org.springframework.shell</groupId>
 			<artifactId>spring-shell</artifactId>
-			<version>1.2.0.M1</version>
+			<version>1.2.0.RC1</version>
 		</dependency>
 
 		<dependency>
diff --git a/release-tools/src/main/java/org/springframework/data/release/announcement/AnnouncementCommands.java b/release-tools/src/main/java/org/springframework/data/release/announcement/AnnouncementCommands.java
index ff5f29c..fa22b67 100644
--- a/release-tools/src/main/java/org/springframework/data/release/announcement/AnnouncementCommands.java
+++ b/release-tools/src/main/java/org/springframework/data/release/announcement/AnnouncementCommands.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,9 @@
  */
 package org.springframework.data.release.announcement;
 
-import lombok.AccessLevel;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.release.CliComponent;
 import org.springframework.data.release.TimedCommand;
 import org.springframework.data.release.model.TrainIteration;
@@ -33,11 +30,10 @@ import org.springframework.shell.core.annotation.CliOption;
  * @author Oliver Gierke
  */
 @CliComponent
-@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
+@RequiredArgsConstructor
 class AnnouncementCommands extends TimedCommand {
 
-	@NonNull AnnouncementOperations operations;
+	private final @NonNull AnnouncementOperations operations;
 
 	@CliCommand("announcement")
 	public void announce(@CliOption(key = "", mandatory = true) TrainIteration iteration) throws Exception {
diff --git a/release-tools/src/main/java/org/springframework/data/release/build/BuildCommands.java b/release-tools/src/main/java/org/springframework/data/release/build/BuildCommands.java
index 2b94f05..0a14817 100644
--- a/release-tools/src/main/java/org/springframework/data/release/build/BuildCommands.java
+++ b/release-tools/src/main/java/org/springframework/data/release/build/BuildCommands.java
@@ -22,7 +22,7 @@ import lombok.experimental.FieldDefaults;
 
 import java.io.IOException;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.release.CliComponent;
 import org.springframework.data.release.TimedCommand;
 import org.springframework.data.release.io.Workspace;
 import org.springframework.data.release.utils.Logger;
@@ -31,8 +31,9 @@ import org.springframework.shell.core.annotation.CliCommand;
 /**
  * @author Oliver Gierke
  */
+@CliComponent
+@RequiredArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
 class BuildCommands extends TimedCommand {
 
 	@NonNull BuildOperations build;
diff --git a/release-tools/src/main/java/org/springframework/data/release/build/BuildOperations.java b/release-tools/src/main/java/org/springframework/data/release/build/BuildOperations.java
index 76ac831..a3e2450 100644
--- a/release-tools/src/main/java/org/springframework/data/release/build/BuildOperations.java
+++ b/release-tools/src/main/java/org/springframework/data/release/build/BuildOperations.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.release.build;
 
+import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
 import java.nio.file.Path;
@@ -22,7 +23,6 @@ import java.util.List;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.release.deployment.DeploymentInformation;
 import org.springframework.data.release.model.ModuleIteration;
 import org.springframework.data.release.model.Phase;
@@ -37,11 +37,11 @@ import org.springframework.util.Assert;
  * @author Oliver Gierke
  */
 @Component
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
+@RequiredArgsConstructor
 public class BuildOperations {
 
-	private final PluginRegistry<BuildSystem, Project> buildSystems;
-	private final MavenProperties properties;
+	private final @NonNull PluginRegistry<BuildSystem, Project> buildSystems;
+	private final @NonNull MavenProperties properties;
 
 	/**
 	 * Updates all inter-project dependencies based on the given {@link TrainIteration} and release {@link Phase}.
diff --git a/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java b/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java
index 419fd5b..2eafc26 100644
--- a/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java
+++ b/release-tools/src/main/java/org/springframework/data/release/build/MavenBuildSystem.java
@@ -17,14 +17,15 @@ package org.springframework.data.release.build;
 
 import static org.springframework.data.release.model.Projects.*;
 
+import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.data.release.deployment.DefaultDeploymentInformation;
 import org.springframework.data.release.deployment.DeploymentInformation;
@@ -49,16 +50,17 @@ import org.xmlbeam.io.XBFileIO;
  */
 @Component
 @Order(100)
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
+@RequiredArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 class MavenBuildSystem implements BuildSystem {
 
-	private static final String POM_XML = "pom.xml";
+	static String POM_XML = "pom.xml";
 
-	private final Workspace workspace;
-	private final ProjectionFactory projectionFactory;
-	private final Logger logger;
-	private final MavenRuntime mvn;
-	private final DeploymentProperties properties;
+	Workspace workspace;
+	ProjectionFactory projectionFactory;
+	Logger logger;
+	MavenRuntime mvn;
+	DeploymentProperties properties;
 
 	/* 
 	 * (non-Javadoc)
diff --git a/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java b/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java
index a8ae7c9..38dd4cf 100644
--- a/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java
+++ b/release-tools/src/main/java/org/springframework/data/release/cli/ReleaseCommands.java
@@ -24,7 +24,6 @@ import lombok.experimental.FieldDefaults;
 
 import java.util.List;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.release.CliComponent;
 import org.springframework.data.release.TimedCommand;
 import org.springframework.data.release.build.BuildOperations;
@@ -48,7 +47,7 @@ import org.springframework.util.Assert;
  * @author Oliver Gierke
  */
 @CliComponent
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
+@RequiredArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 class ReleaseCommands extends TimedCommand {
 
@@ -61,7 +60,7 @@ class ReleaseCommands extends TimedCommand {
 	public String predictTrainAndIteration() throws Exception {
 
 		return git.getTags(COMMONS).getLatest().toArtifactVersion().//
-				map(this::getTrainNameForCommonsVersion).//
+				map(ReleaseCommands::getTrainNameForCommonsVersion).//
 				orElse(null);
 	}
 
@@ -164,7 +163,7 @@ class ReleaseCommands extends TimedCommand {
 		build.distributeResources(iteration);
 	}
 
-	String getTrainNameForCommonsVersion(ArtifactVersion version) {
+	private static String getTrainNameForCommonsVersion(ArtifactVersion version) {
 
 		return ReleaseTrains.TRAINS.stream().//
 				filter(train -> version.toString().startsWith(train.getModule(COMMONS).getVersion().toString())).//
diff --git a/release-tools/src/main/java/org/springframework/data/release/deployment/ArtifactoryCommands.java b/release-tools/src/main/java/org/springframework/data/release/deployment/ArtifactoryCommands.java
index 2184db3..4640db3 100644
--- a/release-tools/src/main/java/org/springframework/data/release/deployment/ArtifactoryCommands.java
+++ b/release-tools/src/main/java/org/springframework/data/release/deployment/ArtifactoryCommands.java
@@ -18,7 +18,6 @@ package org.springframework.data.release.deployment;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.release.CliComponent;
 import org.springframework.data.release.TimedCommand;
 import org.springframework.shell.core.annotation.CliCommand;
@@ -29,7 +28,7 @@ import org.springframework.shell.core.annotation.CliCommand;
  * @author Oliver Gierke
  */
 @CliComponent
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
+@RequiredArgsConstructor
 class ArtifactoryCommands extends TimedCommand {
 
 	private final @NonNull DeploymentOperations deployment;
diff --git a/release-tools/src/main/java/org/springframework/data/release/deployment/DeploymentOperations.java b/release-tools/src/main/java/org/springframework/data/release/deployment/DeploymentOperations.java
index 107c33e..895ceb7 100644
--- a/release-tools/src/main/java/org/springframework/data/release/deployment/DeploymentOperations.java
+++ b/release-tools/src/main/java/org/springframework/data/release/deployment/DeploymentOperations.java
@@ -17,7 +17,6 @@ package org.springframework.data.release.deployment;
 
 import lombok.RequiredArgsConstructor;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
@@ -27,7 +26,7 @@ import org.springframework.util.Assert;
  * @author Oliver Gierke
  */
 @Component
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
+@RequiredArgsConstructor
 public class DeploymentOperations {
 
 	private final ArtifactoryClient client;
diff --git a/release-tools/src/main/java/org/springframework/data/release/git/Branches.java b/release-tools/src/main/java/org/springframework/data/release/git/Branches.java
index b00a4e4..6f575be 100644
--- a/release-tools/src/main/java/org/springframework/data/release/git/Branches.java
+++ b/release-tools/src/main/java/org/springframework/data/release/git/Branches.java
@@ -15,14 +15,12 @@
  */
 package org.springframework.data.release.git;
 
+import lombok.EqualsAndHashCode;
+
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import lombok.EqualsAndHashCode;
-
-import org.springframework.data.release.model.ArtifactVersion;
-import org.springframework.data.release.model.ModuleIteration;
 import org.springframework.util.Assert;
 
 /**
diff --git a/release-tools/src/main/java/org/springframework/data/release/git/GitCommands.java b/release-tools/src/main/java/org/springframework/data/release/git/GitCommands.java
index 9471bfb..9d98b2e 100644
--- a/release-tools/src/main/java/org/springframework/data/release/git/GitCommands.java
+++ b/release-tools/src/main/java/org/springframework/data/release/git/GitCommands.java
@@ -15,17 +15,14 @@
  */
 package org.springframework.data.release.git;
 
-import lombok.AccessLevel;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.release.CliComponent;
 import org.springframework.data.release.TimedCommand;
 import org.springframework.data.release.issues.Ticket;
@@ -43,11 +40,10 @@ import org.springframework.util.StringUtils;
  * @author Oliver Gierke
  */
 @CliComponent
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
-@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
+@RequiredArgsConstructor
 class GitCommands extends TimedCommand {
 
-	@NonNull GitOperations git;
+	private final @NonNull GitOperations git;
 
 	@CliCommand("git co train")
 	public void checkout(@CliOption(key = "", mandatory = true) Train train) throws Exception {
diff --git a/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java b/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java
index 38f6824..0c5dfec 100644
--- a/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java
+++ b/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java
@@ -41,7 +41,6 @@ import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
 import org.eclipse.jgit.transport.RefSpec;
 import org.eclipse.jgit.transport.TagOpt;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.release.io.Workspace;
 import org.springframework.data.release.issues.IssueTracker;
 import org.springframework.data.release.issues.Ticket;
@@ -62,7 +61,7 @@ import org.springframework.util.Assert;
  * @author Oliver Gierke
  */
 @Component
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
+@RequiredArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 public class GitOperations {
 
diff --git a/release-tools/src/main/java/org/springframework/data/release/io/Workspace.java b/release-tools/src/main/java/org/springframework/data/release/io/Workspace.java
index ab4bf67..80bc29c 100644
--- a/release-tools/src/main/java/org/springframework/data/release/io/Workspace.java
+++ b/release-tools/src/main/java/org/springframework/data/release/io/Workspace.java
@@ -17,11 +17,13 @@ package org.springframework.data.release.io;
 
 import static org.springframework.data.release.utils.StreamUtils.*;
 
+import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -34,7 +36,6 @@ import java.util.stream.Stream;
 
 import javax.annotation.PostConstruct;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.data.release.model.Project;
@@ -47,13 +48,13 @@ import org.springframework.util.Assert;
  * @author Oliver Gierke
  */
 @Component
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
+@RequiredArgsConstructor
 public class Workspace {
 
-	private static final Charset UTF_8 = Charset.forName("UTF-8");
+	private static final Charset UTF_8 = StandardCharsets.UTF_8;
 
-	private final IoProperties ioProperties;
-	private final ResourcePatternResolver resolver;
+	private final @NonNull IoProperties ioProperties;
+	private final @NonNull ResourcePatternResolver resolver;
 
 	/**
 	 * Returns the current working directory.
diff --git a/release-tools/src/main/java/org/springframework/data/release/io/WorkspaceCommands.java b/release-tools/src/main/java/org/springframework/data/release/io/WorkspaceCommands.java
index 8daa187..37f553f 100644
--- a/release-tools/src/main/java/org/springframework/data/release/io/WorkspaceCommands.java
+++ b/release-tools/src/main/java/org/springframework/data/release/io/WorkspaceCommands.java
@@ -22,7 +22,6 @@ import lombok.experimental.FieldDefaults;
 
 import java.io.IOException;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.release.TimedCommand;
 import org.springframework.data.release.utils.Logger;
 import org.springframework.shell.core.annotation.CliCommand;
@@ -30,8 +29,8 @@ import org.springframework.shell.core.annotation.CliCommand;
 /**
  * @author Oliver Gierke
  */
+@RequiredArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
 class WorkspaceCommands extends TimedCommand {
 
 	@NonNull Workspace workspace;
diff --git a/release-tools/src/main/java/org/springframework/data/release/issues/IssueTrackerCommands.java b/release-tools/src/main/java/org/springframework/data/release/issues/IssueTrackerCommands.java
index a16f0bc..7ada355 100644
--- a/release-tools/src/main/java/org/springframework/data/release/issues/IssueTrackerCommands.java
+++ b/release-tools/src/main/java/org/springframework/data/release/issues/IssueTrackerCommands.java
@@ -25,7 +25,6 @@ import lombok.experimental.FieldDefaults;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.release.CliComponent;
 import org.springframework.data.release.TimedCommand;
 import org.springframework.data.release.model.ModuleIteration;
@@ -42,8 +41,8 @@ import org.springframework.util.StringUtils;
  * @author Mark Paluch
  */
 @CliComponent
+@RequiredArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
 class IssueTrackerCommands extends TimedCommand {
 
 	@NonNull PluginRegistry<IssueTracker, Project> tracker;
diff --git a/release-tools/src/main/java/org/springframework/data/release/issues/github/GitHubProperties.java b/release-tools/src/main/java/org/springframework/data/release/issues/github/GitHubProperties.java
index fda66d9..21946dd 100644
--- a/release-tools/src/main/java/org/springframework/data/release/issues/github/GitHubProperties.java
+++ b/release-tools/src/main/java/org/springframework/data/release/issues/github/GitHubProperties.java
@@ -22,7 +22,6 @@ import lombok.RequiredArgsConstructor;
 
 import javax.annotation.PostConstruct;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.data.release.git.GitProperties;
 import org.springframework.data.release.utils.HttpBasicCredentials;
@@ -35,7 +34,7 @@ import org.springframework.util.Assert;
 @Data
 @Component
 @ConfigurationProperties(prefix = "github")
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
+@RequiredArgsConstructor
 public class GitHubProperties {
 
 	private final @Getter(AccessLevel.NONE) GitProperties gitProperties;
diff --git a/release-tools/src/main/java/org/springframework/data/release/misc/ReleaseOperations.java b/release-tools/src/main/java/org/springframework/data/release/misc/ReleaseOperations.java
index 222e286..d16f510 100644
--- a/release-tools/src/main/java/org/springframework/data/release/misc/ReleaseOperations.java
+++ b/release-tools/src/main/java/org/springframework/data/release/misc/ReleaseOperations.java
@@ -21,7 +21,6 @@ import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.release.git.GitOperations;
 import org.springframework.data.release.io.Workspace;
 import org.springframework.data.release.issues.Changelog;
@@ -40,7 +39,7 @@ import org.springframework.util.Assert;
  * @author Oliver Gierke
  */
 @Component
-@RequiredArgsConstructor(onConstructor = @__(@Autowired) )
+@RequiredArgsConstructor
 public class ReleaseOperations {
 
 	private static final Set<String> CHANGELOG_LOCATIONS;
diff --git a/release-tools/src/test/java/org/springframework/data/release/model/SimpleIterationVersion.java b/release-tools/src/test/java/org/springframework/data/release/model/SimpleIterationVersion.java
index ad6292b..c73653a 100644
--- a/release-tools/src/test/java/org/springframework/data/release/model/SimpleIterationVersion.java
+++ b/release-tools/src/test/java/org/springframework/data/release/model/SimpleIterationVersion.java
@@ -20,8 +20,8 @@ import lombok.Value;
 @Value
 public class SimpleIterationVersion implements IterationVersion {
 
-	private final Version version;
-	private final Iteration iteration;
+	Version version;
+	Iteration iteration;
 
 	/* 
 	 * (non-Javadoc)