shopizer-uncached

Fixed commitOrder

12/21/2016 4:20:13 PM

Changes

pom.xml 18(+13 -5)

sm-core/pom.xml 2(+1 -1)

sm-shop/pom.xml 2(+1 -1)

Details

pom.xml 18(+13 -5)

diff --git a/pom.xml b/pom.xml
index b377cd7..386f51c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.shopizer</groupId>
     <artifactId>shopizer</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.0.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     
     <name>shopizer</name>
@@ -21,10 +21,10 @@
 
     <properties>
         <java.version>1.8</java.version>        
-        <shopizer.version>2.5.0-SNAPSHOT</shopizer.version>
-        <shopizer.search.version>2.5.0-SNAPSHOT</shopizer.search.version>
-        <shopizer-canadapost.version>2.5.0-SNAPSHOT</shopizer-canadapost.version>
-		<shopizer-shipping-distance.version>2.5.0-SNAPSHOT</shopizer-shipping-distance.version>	
+        <shopizer.version>2.0.5-SNAPSHOT</shopizer.version>
+        <shopizer.search.version>2.0.5-SNAPSHOT</shopizer.search.version>
+        <shopizer-canadapost.version>2.0.5-SNAPSHOT</shopizer-canadapost.version>
+		<shopizer-shipping-distance.version>2.0.5-SNAPSHOT</shopizer-shipping-distance.version>	
         <jackson-version>2.7.4</jackson-version>
 
         <commons-collections4.version>4.0</commons-collections4.version>
@@ -63,6 +63,14 @@
 		    <artifactId>validation-api</artifactId>
 		    <version>1.1.0.Final</version>
 		</dependency>
+		
+		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
+		<dependency>
+		    <groupId>org.apache.commons</groupId>
+		    <artifactId>commons-lang3</artifactId>
+		    <version>3.5</version>
+		</dependency>
+		
 
 		<!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
 		<dependency>
diff --git a/shopizer-canadapost/pom.xml b/shopizer-canadapost/pom.xml
index ccf9a10..23563df 100644
--- a/shopizer-canadapost/pom.xml
+++ b/shopizer-canadapost/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.shopizer</groupId>
   <artifactId>shopizer-shipping-canadapost-module</artifactId>
-  <version>2.5.0-SNAPSHOT</version>
+  <version>2.0.5-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>shopizer-shipping-canadapost-module</name>
   <url>http://www.shopizer.com</url>
diff --git a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
index 14909bf..3d754ca 100644
--- a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
+++ b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
@@ -1,6 +1,6 @@
 #Generated by Maven Integration for Eclipse
-#Thu Dec 15 12:41:36 EST 2016
-version=2.5.0-SNAPSHOT
+#Wed Dec 21 13:14:22 EST 2016
+version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-canadapost
 m2e.projectLocation=C\:\\code\\personal\\shopizer-2.0.5\\shopizer\\shopizer-canadapost
diff --git a/shopizer-shipping-distance-module/pom.xml b/shopizer-shipping-distance-module/pom.xml
index c4b64ee..f8c5803 100644
--- a/shopizer-shipping-distance-module/pom.xml
+++ b/shopizer-shipping-distance-module/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.shopizer</groupId>
   <artifactId>shopizer-shipping-distance-processor</artifactId>
-  <version>2.5.0-SNAPSHOT</version>
+  <version>2.0.5-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>shopizer-shipping-distance-processor</name>
   <url>http://www.shopizer.com</url>
diff --git a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
index 262b592..953895d 100644
--- a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
+++ b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
@@ -1,6 +1,6 @@
 #Generated by Maven Integration for Eclipse
-#Tue Dec 20 08:56:33 EST 2016
-version=2.5.0-SNAPSHOT
+#Wed Dec 21 13:14:23 EST 2016
+version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor
 m2e.projectLocation=C\:\\code\\personal\\shopizer-2.0.5\\shopizer\\shopizer-shipping-distance-module

sm-core/pom.xml 2(+1 -1)

diff --git a/sm-core/pom.xml b/sm-core/pom.xml
index 00fe233..14186b7 100644
--- a/sm-core/pom.xml
+++ b/sm-core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.shopizer</groupId>
 		<artifactId>shopizer</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.0.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>sm-core</artifactId>
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/modules/integration/shipping/impl/StorePickupShippingQuote.java b/sm-core/src/main/java/com/salesmanager/core/business/modules/integration/shipping/impl/StorePickupShippingQuote.java
index 88f8b15..4604821 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/modules/integration/shipping/impl/StorePickupShippingQuote.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/modules/integration/shipping/impl/StorePickupShippingQuote.java
@@ -8,6 +8,8 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
+import org.apache.commons.lang.Validate;
+
 import com.salesmanager.core.business.services.system.MerchantConfigurationService;
 import com.salesmanager.core.business.utils.ProductPriceUtils;
 import com.salesmanager.core.model.common.Delivery;
@@ -121,6 +123,8 @@ public class StorePickupShippingQuote implements ShippingQuoteModule, ShippingQu
 			List<IntegrationModule> allModules, Locale locale)
 			throws IntegrationException {
 		
+		Validate.notNull(globalShippingConfiguration, "IntegrationConfiguration must not be null for StorePickUp");
+		
 		
 		try {
 
diff --git a/sm-core/src/main/java/com/salesmanager/core/business/modules/integration/shipping/impl/UPSShippingQuote.java b/sm-core/src/main/java/com/salesmanager/core/business/modules/integration/shipping/impl/UPSShippingQuote.java
index b2ca599..a79950a 100644
--- a/sm-core/src/main/java/com/salesmanager/core/business/modules/integration/shipping/impl/UPSShippingQuote.java
+++ b/sm-core/src/main/java/com/salesmanager/core/business/modules/integration/shipping/impl/UPSShippingQuote.java
@@ -12,6 +12,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.commons.digester.Digester;
+import org.apache.commons.lang.Validate;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -127,6 +128,8 @@ public class UPSShippingQuote implements ShippingQuoteModule {
 			IntegrationConfiguration configuration, IntegrationModule module,
 			ShippingConfiguration shippingConfiguration, Locale locale)
 			throws IntegrationException {
+		
+		Validate.notNull(configuration, "IntegrationConfiguration must not be null for USPS shipping module");
 
 		
 		if(StringUtils.isBlank(delivery.getPostalCode())) {
diff --git a/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml b/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml
index 2da13b2..ea85b8d 100644
--- a/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml
+++ b/sm-core/src/main/resources/spring/processors/shopizer-core-shipping-processors.xml
@@ -9,9 +9,9 @@
 
 		<!-- Shipping pre-processors -->
 		<util:list id="shippingModulePreProcessors" value-type="com.salesmanager.core.business.modules.integration.shipping.model.ShippingQuotePrePostProcessModule">
-			<ref bean="shippingDistancePreProcessor"/>
-			<!-- From rules -->
-			<ref bean="shippingMethodDecisionProcess"/>
+			<!-- Not configured by default, should know what is your intention before enabling -->
+<!-- 		<ref bean="shippingDistancePreProcessor"/>
+			<ref bean="shippingMethodDecisionProcess"/> -->
 		</util:list>
 	
 		<!-- Calculates the distance between the origin and destination -->
@@ -32,13 +32,14 @@
 		<!-- Any post process required after getting a quote -->
 		<!-- Shipping post-processors -->
 		<util:list id="shippingModulePostProcessors" value-type="com.salesmanager.core.business.modules.integration.shipping.model.ShippingQuotePrePostProcessModule">
-			<ref bean="storePickUp"/><!-- defined in core-modules -->
+			<!-- Not configured by default, should be configured to be used -->
+			<!-- <ref bean="storePickUp"/> --><!-- defined in core-modules -->
 		</util:list>
 		
 		<!-- List of accepted zones for using shipping distance pre processor -->
 		<util:list id="acceptedZones" value-type="java.lang.String">
 			<value>NY</value>
 			<value>NJ</value>
-    	        </util:list>
+    	</util:list>
 	
 </beans>
\ No newline at end of file
diff --git a/sm-core/target/classes/spring/processors/shopizer-core-shipping-processors.xml b/sm-core/target/classes/spring/processors/shopizer-core-shipping-processors.xml
index 2da13b2..ea85b8d 100644
--- a/sm-core/target/classes/spring/processors/shopizer-core-shipping-processors.xml
+++ b/sm-core/target/classes/spring/processors/shopizer-core-shipping-processors.xml
@@ -9,9 +9,9 @@
 
 		<!-- Shipping pre-processors -->
 		<util:list id="shippingModulePreProcessors" value-type="com.salesmanager.core.business.modules.integration.shipping.model.ShippingQuotePrePostProcessModule">
-			<ref bean="shippingDistancePreProcessor"/>
-			<!-- From rules -->
-			<ref bean="shippingMethodDecisionProcess"/>
+			<!-- Not configured by default, should know what is your intention before enabling -->
+<!-- 		<ref bean="shippingDistancePreProcessor"/>
+			<ref bean="shippingMethodDecisionProcess"/> -->
 		</util:list>
 	
 		<!-- Calculates the distance between the origin and destination -->
@@ -32,13 +32,14 @@
 		<!-- Any post process required after getting a quote -->
 		<!-- Shipping post-processors -->
 		<util:list id="shippingModulePostProcessors" value-type="com.salesmanager.core.business.modules.integration.shipping.model.ShippingQuotePrePostProcessModule">
-			<ref bean="storePickUp"/><!-- defined in core-modules -->
+			<!-- Not configured by default, should be configured to be used -->
+			<!-- <ref bean="storePickUp"/> --><!-- defined in core-modules -->
 		</util:list>
 		
 		<!-- List of accepted zones for using shipping distance pre processor -->
 		<util:list id="acceptedZones" value-type="java.lang.String">
 			<value>NY</value>
 			<value>NJ</value>
-    	        </util:list>
+    	</util:list>
 	
 </beans>
\ No newline at end of file
diff --git a/sm-core-model/pom.xml b/sm-core-model/pom.xml
index 300b417..10a4bb7 100644
--- a/sm-core-model/pom.xml
+++ b/sm-core-model/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.shopizer</groupId>
 		<artifactId>shopizer</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.0.5-SNAPSHOT</version>
 	</parent>
 
 
diff --git a/sm-core-modules/pom.xml b/sm-core-modules/pom.xml
index 8b4c739..7314678 100644
--- a/sm-core-modules/pom.xml
+++ b/sm-core-modules/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.shopizer</groupId>
 		<artifactId>shopizer</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.0.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>sm-core-modules</artifactId>
diff --git a/sm-search/pom.xml b/sm-search/pom.xml
index 7026086..e17328b 100644
--- a/sm-search/pom.xml
+++ b/sm-search/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.shopizer</groupId>
   <artifactId>sm-search</artifactId>
-  <version>2.5.0-SNAPSHOT</version>
+  <version>2.0.5-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>sm-search</name>
   <url>http://www.shopizer.com</url>
diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
index c3145e0..71976b6 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
@@ -1,6 +1,6 @@
 #Generated by Maven Integration for Eclipse
-#Tue Dec 20 08:56:34 EST 2016
-version=2.5.0-SNAPSHOT
+#Wed Dec 21 13:14:28 EST 2016
+version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search
 m2e.projectLocation=C\:\\code\\personal\\shopizer-2.0.5\\shopizer\\sm-search
diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.xml b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.xml
index 7026086..e17328b 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.xml
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.shopizer</groupId>
   <artifactId>sm-search</artifactId>
-  <version>2.5.0-SNAPSHOT</version>
+  <version>2.0.5-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>sm-search</name>
   <url>http://www.shopizer.com</url>

sm-shop/pom.xml 2(+1 -1)

diff --git a/sm-shop/pom.xml b/sm-shop/pom.xml
index 27697c6..851110e 100644
--- a/sm-shop/pom.xml
+++ b/sm-shop/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.shopizer</groupId>
 		<artifactId>shopizer</artifactId>
-		<version>2.5.0-SNAPSHOT</version>
+		<version>2.0.5-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>sm-shop</artifactId>
diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 33caaee..155351f 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ
diff --git a/sm-shop/SALESMANAGER.lock.db b/sm-shop/SALESMANAGER.lock.db
index 518a6d0..6e1b92e 100644
--- a/sm-shop/SALESMANAGER.lock.db
+++ b/sm-shop/SALESMANAGER.lock.db
@@ -1,4 +1,4 @@
 #FileLock
-#Tue Dec 20 13:09:34 EST 2016
-id=1591d6c94dd9c3ba469553b719b771ae8e16778da01
+#Wed Dec 21 13:15:26 EST 2016
+id=1592298591ee30815598af25df5c0fccb63b8f5280a
 method=file
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxClassController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxClassController.java
index c0e0645..61fa9bc 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxClassController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxClassController.java
@@ -66,9 +66,9 @@ public class TaxClassController {
 	
 	
 	@PreAuthorize("hasRole('TAX')")
-	@RequestMapping(value = "/admin/tax/taxclass/paging.html", method = RequestMethod.POST, produces = "application/json")
+	@RequestMapping(value = "/admin/tax/taxclass/paging.html", method = RequestMethod.POST)
 	public @ResponseBody
-	String pageTaxClasses(HttpServletRequest request,
+	ResponseEntity<String> pageTaxClasses(HttpServletRequest request,
 			HttpServletResponse response, Locale locale) {
 		
 		MerchantStore store = (MerchantStore)request.getAttribute(Constants.ADMIN_STORE);
@@ -96,7 +96,9 @@ public class TaxClassController {
 		}
 		
 		String returnString = resp.toJSONString();
-		return returnString;
+		final HttpHeaders httpHeaders= new HttpHeaders();
+	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
+		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
 	}
 	
 	@PreAuthorize("hasRole('TAX')")
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxRatesController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxRatesController.java
index 0cbcb04..3dd6d34 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxRatesController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/tax/TaxRatesController.java
@@ -102,10 +102,11 @@ public class TaxRatesController {
 		return com.salesmanager.shop.admin.controller.ControllerConstants.Tiles.Tax.taxRates;
 	}
 	
+	@SuppressWarnings("unchecked")
 	@PreAuthorize("hasRole('TAX')")
-	@RequestMapping(value = "/admin/tax/taxrates/page.html", method = RequestMethod.POST, produces = "application/json")
+	@RequestMapping(value = "/admin/tax/taxrates/page.html", method = RequestMethod.POST)
 	public @ResponseBody
-	String pageTaxRates(HttpServletRequest request,
+	ResponseEntity<String> pageTaxRates(HttpServletRequest request,
 			HttpServletResponse response) {
 
 		AjaxResponse resp = new AjaxResponse();
@@ -117,7 +118,6 @@ public class TaxRatesController {
 
 			
 			nf = NumberFormat.getInstance(Locale.US);
-
 			nf.setMaximumFractionDigits(Integer.parseInt(Character
 						.toString(DECIMALCOUNT)));
 			nf.setMinimumFractionDigits(Integer.parseInt(Character
@@ -160,10 +160,8 @@ public class TaxRatesController {
 						zoneCode = rate.getZone().getCode();
 					}
 					entry.put("zone", zoneCode);
-					
 					entry.put("rate", nf.format(rate.getTaxRate()));
 
-					
 					resp.addDataEntry(entry);
 
 				}
@@ -177,8 +175,9 @@ public class TaxRatesController {
 		}
 
 		String returnString = resp.toJSONString();
-
-		return returnString;
+		final HttpHeaders httpHeaders= new HttpHeaders();
+	    httpHeaders.setContentType(MediaType.APPLICATION_JSON_UTF8);
+		return new ResponseEntity<String>(returnString,httpHeaders,HttpStatus.OK);
 	}
 	
 	@PreAuthorize("hasRole('TAX')")
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/ShoppingOrderController.java b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/ShoppingOrderController.java
index 5c2ccf0..1fd324a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/ShoppingOrderController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/store/controller/order/ShoppingOrderController.java
@@ -886,7 +886,7 @@ public class ShoppingOrderController extends AbstractController {
 	 * @throws Exception
 	 */
 	@SuppressWarnings("unchecked")
-	@RequestMapping(value={"/shippingQuotes.html"}, method=RequestMethod.POST)
+	@RequestMapping(value={"/shippingQuotes.json"}, method=RequestMethod.POST)
 	public @ResponseBody ReadableShopOrder calculateShipping(@ModelAttribute(value="order") ShopOrder order, HttpServletRequest request, HttpServletResponse response, Locale locale) throws Exception {
 		
 		Language language = (Language)request.getAttribute("LANGUAGE");
@@ -1104,7 +1104,7 @@ public class ShoppingOrderController extends AbstractController {
 	 * @return
 	 * @throws Exception
 	 */
-	@RequestMapping(value={"/calculateOrderTotal.html"}, method=RequestMethod.POST)
+	@RequestMapping(value={"/calculateOrderTotal.json"}, method=RequestMethod.POST)
 	public @ResponseBody ReadableShopOrder calculateOrderTotal(@ModelAttribute(value="order") ShopOrder order, HttpServletRequest request, HttpServletResponse response, Locale locale) throws Exception {
 		
 		Language language = (Language)request.getAttribute("LANGUAGE");
diff --git a/sm-shop/src/main/webapp/pages/shop/common/checkout/checkout.jsp b/sm-shop/src/main/webapp/pages/shop/common/checkout/checkout.jsp
index aaaf1d8..e08ea87 100644
--- a/sm-shop/src/main/webapp/pages/shop/common/checkout/checkout.jsp
+++ b/sm-shop/src/main/webapp/pages/shop/common/checkout/checkout.jsp
@@ -500,7 +500,7 @@ function shippingQuotes(){
 	
 	$.ajax({
 	  type: 'POST',
-	  url: '<c:url value="/shop/order/shippingQuotes.html"/>',
+	  url: '<c:url value="/shop/order/shippingQuotes.json"/>',
 	  data: data,
 	  cache: false,
 	  dataType: 'json',
@@ -753,7 +753,7 @@ function calculateTotal(){
 	
 	$.ajax({
 	  type: 'POST',
-	  url: '<c:url value="/shop/order/calculateOrderTotal.html"/>',
+	  url: '<c:url value="/shop/order/calculateOrderTotal.json"/>',
 	  data: data,
 	  cache: false,
 	  dataType: 'json',
diff --git a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
index 11a8449..bc7b63c 100644
--- a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
+++ b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
@@ -1,6 +1,6 @@
 #Generated by Maven Integration for Eclipse
-#Tue Dec 20 08:56:39 EST 2016
-version=2.5.0-SNAPSHOT
+#Wed Dec 21 13:14:31 EST 2016
+version=2.0.5-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop
 m2e.projectLocation=C\:\\code\\personal\\shopizer-2.0.5\\shopizer\\sm-shop