Revert "Changes to support building with Java 5"

This reverts commit 9f2cdaf.

lite-device-delegating-view-resolver/src/main/java/org/springframework/showcases/lite/config/MainWebApplicationInitializer.java

@@ -28,6 +28,7 @@
  */
 public class MainWebApplicationInitializer implements WebApplicationInitializer {
 
+	@Override
 	public void onStartup(ServletContext servletContext) {
 		AnnotationConfigWebApplicationContext appContext = new AnnotationConfigWebApplicationContext();
 		appContext.setServletContext(servletContext);

lite-device-resolver/src/main/java/org/springframework/showcases/lite/config/MainWebApplicationInitializer.java

@@ -28,6 +28,7 @@
  */
 public class MainWebApplicationInitializer implements WebApplicationInitializer {
 
+	@Override
 	public void onStartup(ServletContext servletContext) {
 		AnnotationConfigWebApplicationContext appContext = new AnnotationConfigWebApplicationContext();
 		appContext.setServletContext(servletContext);

lite-showcase/src/main/java/org/springframework/showcases/lite/config/MainWebApplicationInitializer.java

@@ -28,6 +28,7 @@
  */
 public class MainWebApplicationInitializer implements WebApplicationInitializer {
 
+	@Override
 	public void onStartup(ServletContext servletContext) {
 		AnnotationConfigWebApplicationContext appContext = new AnnotationConfigWebApplicationContext();
 		appContext.setServletContext(servletContext);

lite-site-preference-handler/src/main/java/org/springframework/showcases/lite/config/MainWebApplicationInitializer.java

@@ -28,6 +28,7 @@
  */
 public class MainWebApplicationInitializer implements WebApplicationInitializer {
 
+	@Override
 	public void onStartup(ServletContext servletContext) {
 		AnnotationConfigWebApplicationContext appContext = new AnnotationConfigWebApplicationContext();
 		appContext.setServletContext(servletContext);

lite-site-switcher-handler/src/main/java/org/springframework/showcases/lite/config/MainWebApplicationInitializer.java

@@ -28,6 +28,7 @@
  */
 public class MainWebApplicationInitializer implements WebApplicationInitializer {
 
+	@Override
 	public void onStartup(ServletContext servletContext) {
 		AnnotationConfigWebApplicationContext appContext = new AnnotationConfigWebApplicationContext();
 		appContext.setServletContext(servletContext);

pom.xml

@@ -26,7 +26,7 @@
 	</modules>
 
 	<properties>
-		<java-version>1.5</java-version>
+		<java-version>1.6</java-version>
 		<org.springframework-version>3.2.1.RELEASE</org.springframework-version>
 		<org.springframework.mobile-version>1.1.0.BUILD-SNAPSHOT</org.springframework.mobile-version>
 		<org.aspectj-version>1.6.9</org.aspectj-version>