update for rc1; dependency updates; readme update

README

@@ -24,13 +24,13 @@ To build, simply execute 'mvn install' and deploy the resulting .war to any Serv
 By default, the app will run in 'embedded' mode which does not require any external setup.
 
 You may also launch Tomcat from the command line by invoking the Tomcat 7 Maven plugin:
-	mvn t7:run
+	mvn clean install t7:run
 
-Access the deployed webapp at http://localhost:8080/greenhouse-1.0.0-BUILD-SNAPSHOT
+Access the deployed webapp at http://localhost:8080/greenhouse
 
 Building and Running from a Maven/Java Dynamic Web-project-capable IDE, such as Eclipse/SpringSource Tool Suite:
 ------------------------------------------
-Simply import the project into your IDE and deploy the project to your IDE's embedded servlet container.
+Simply import "as a Maven Project" into your IDE and deploy the project to your IDE's embedded servlet container.
 
 Enjoy!
 The Greenhouse Development Team

pom.xml

@@ -13,15 +13,15 @@
 		<url>http://www.springsource.org</url>
 	</organization>
 	<packaging>war</packaging>
-	<version>1.0.0-BUILD-SNAPSHOT</version>
+	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<properties>
 		<java-version>1.6</java-version>
-		<org.springframework-version>3.1.0.BUILD-SNAPSHOT</org.springframework-version>
+		<org.springframework-version>3.1.0.RC1</org.springframework-version>
 		<org.springframework.security-version>3.1.0.RC3</org.springframework.security-version>
 		<org.springframework.integration-version>2.0.5.RELEASE</org.springframework.integration-version>
 		<org.springframework.social-version>1.0.0.RELEASE</org.springframework.social-version>
 		<org.aspectj-version>1.6.11</org.aspectj-version>
-		<org.slf4j-version>1.6.1</org.slf4j-version>
+		<org.slf4j-version>1.6.2</org.slf4j-version>
 	</properties>
 	<dependencies>
 		<!-- Spring -->
@@ -194,20 +194,20 @@
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.3.159</version>
+			<version>1.3.160</version>
 		</dependency>
 		<!-- For MapMaker -->
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>r09</version>
+			<version>10.0.1</version>
 		</dependency>
 
 		<!-- Apache Http Client -->
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.1.1</version>
+			<version>4.1.2</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-logging</groupId>
@@ -275,7 +275,7 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>4.1.0.Final</version>
+			<version>4.2.0.Final</version>
 		</dependency>
 
 		<!-- Joda Time -->
@@ -295,7 +295,7 @@
 		<dependency>
 			<groupId>org.codehaus.jackson</groupId>
 			<artifactId>jackson-mapper-asl</artifactId>
-			<version>1.8.5</version>
+			<version>1.9.0</version>
 		</dependency>
 
 		<!-- File Upload -->
@@ -342,7 +342,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.8.2</version>
+			<version>4.10</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -488,7 +488,10 @@
 			<plugin>
 				<groupId>com.googlecode.t7mp</groupId>
 				<artifactId>maven-t7-plugin</artifactId>
-				<version>0.9.7-scanner-SNAPSHOT</version>
+				<version>0.9.8.M2A</version>
+				<configuration>
+				  <contextPath>greenhouse</contextPath>
+				</configuration>
 			</plugin>
 			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
@@ -575,15 +578,6 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</pluginRepository>
-		<!-- For Tomcat plugin -->
-		<pluginRepository>
-			<id>sonatype-oss-repository</id>
-			<name>Sonatype Public OSS Repository</name>
-			<url>https://oss.sonatype.org/content/groups/public/</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
 	</pluginRepositories>
 
 	<distributionManagement>

src/main/java/com/springsource/greenhouse/config/DataConfig.java

@@ -22,7 +22,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.context.config.AdviceMode;
+import org.springframework.context.annotation.AdviceMode;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.jdbc.core.JdbcTemplate;

src/main/java/com/springsource/greenhouse/config/TaskConfig.java

@@ -19,7 +19,7 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.config.AdviceMode;
+import org.springframework.context.annotation.AdviceMode;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.AsyncConfigurer;
 import org.springframework.scheduling.annotation.EnableAsync;