2.0.3 Release with build fixes

shopizer-ecommerce · Feb 10, 2016 · ad2c4c9 · ad2c4c9
1 parent fabe114
commit ad2c4c9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,14 +12,15 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java-version>1.7</java-version>
-    <jdk-version>1.7</jdk-version>
+    <java-version>1.8</java-version>
+    <jdk-version>1.8</jdk-version>
     <!-- The version of this current module -->
     <shopizer.version>2.0.3-SNAPSHOT</shopizer.version>
 	<sm-core.version>2.0.3-SNAPSHOT</sm-core.version>
 	<sm-core-model.version>2.0.3-SNAPSHOT</sm-core-model.version>
 	<sm-core-modules.version>2.0.3-SNAPSHOT</sm-core-modules.version>
-	<sm-search.version>0.0.5-SNAPSHOT</sm-search.version>
+	<sm-search.version>0.0.5</sm-search.version>
+    <sm-shipping-distance-processor.version>2.0.3</sm-shipping-distance-processor.version>
 	<sm-shop.version>2.0.3-SNAPSHOT</sm-shop.version>
 
 	<shopizer-canadapost.version>0.0.1</shopizer-canadapost.version>	

diff --git a/sm-core-model/pom.xml b/sm-core-model/pom.xml
@@ -37,9 +37,9 @@
 		<sm-core.aspectj.version>1.5.4</sm-core.aspectj.version>
 		<sm-core.mysql-connector-java>5.1.31</sm-core.mysql-connector-java>
 		<sm-core.junit.version>4.9</sm-core.junit.version>
-		<sm-core.org.springframework.version>3.1.0.RELEASE</sm-core.org.springframework.version>
+		<sm-core.org.springframework.version>3.2.16.RELEASE</sm-core.org.springframework.version>
 		<sm-core.c3p0.version>0.9.1.2</sm-core.c3p0.version>
-		<sm-core.querydsl.version>3.4.2</sm-core.querydsl.version>
+		<sm-core.querydsl.version>3.7.1</sm-core.querydsl.version>
 		<sm-core.jodatime.version>2.0</sm-core.jodatime.version>
 		<sm-core.jodatime-hibernate.version>1.3</sm-core.jodatime-hibernate.version>
 		<sm-core.javassist.version>3.3</sm-core.javassist.version>
@@ -178,6 +178,12 @@
 			<artifactId>spring-web</artifactId>
 			<version>${sm-core.org.springframework.version}</version>
 		</dependency>
+
+		<dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+            <version>${sm-core.org.springframework.version}</version>
+        </dependency>
 
 		<!-- JSR 303 with Hibernate Validator -->
 		<dependency>
@@ -366,8 +372,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.2</version>
 					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
+						<source>1.8</source>
+						<target>1.8</target>
 						<encoding>${project.build.sourceEncoding}</encoding>
 						<compilerArgument>-proc:none</compilerArgument>
 					</configuration>
@@ -450,7 +456,7 @@
 				<plugin>
 					<groupId>com.mysema.maven</groupId>
 					<artifactId>maven-apt-plugin</artifactId>
-					<version>1.0.2</version>
+					<version>1.0.4</version>
 					<configuration>
 						<outputDirectory>target/generated-sources/querydsl</outputDirectory>
 					</configuration>

diff --git a/sm-core/pom.xml b/sm-core/pom.xml
@@ -41,7 +41,7 @@
 		<sm-core.aspectj.version>1.5.4</sm-core.aspectj.version>
 		<sm-core.mysql-connector-java>5.1.31</sm-core.mysql-connector-java>
 		<sm-core.junit.version>4.9</sm-core.junit.version>
-		<sm-core.org.springframework.version>3.1.0.RELEASE</sm-core.org.springframework.version>
+		<sm-core.org.springframework.version>3.2.16.RELEASE</sm-core.org.springframework.version>
 		<sm-core.c3p0.version>0.9.1.2</sm-core.c3p0.version>
 		<sm-core.querydsl.version>3.4.2</sm-core.querydsl.version>
 		<sm-core.jodatime.version>2.0</sm-core.jodatime.version>
@@ -78,7 +78,7 @@
  		<dependency>
 			<groupId>com.shopizer</groupId>
 			<artifactId>shopizer-shipping-distance-processor</artifactId>
-			<version>0.0.1</version>
+			<version>${sm-shipping-distance-processor.version}</version>
 		</dependency>
 
 		<!-- canadapost -->

diff --git a/sm-shop/pom.xml b/sm-shop/pom.xml
@@ -23,9 +23,9 @@
 
 		<jackson-version>1.9.13</jackson-version>
 		<fasterxml-version>2.2.3</fasterxml-version>
-		<org.springframework-version>3.1.0.RELEASE</org.springframework-version>
+		<org.springframework-version>3.2.16.RELEASE</org.springframework-version>
 		<org.springframework-security-version>3.1.4.RELEASE</org.springframework-security-version>
-		<org.aspectj-version>1.6.10</org.aspectj-version>
+		<org.aspectj-version>1.8.7</org.aspectj-version>
 		<org.slf4j-version>1.6.6</org.slf4j-version>
 		<sm-core.jodatime.version>2.0</sm-core.jodatime.version>
 		<sm-core.jodatime-hibernate.version>1.3</sm-core.jodatime-hibernate.version>
@@ -462,6 +462,7 @@
 			</plugin>
 			<!-- minify -->
 			<!-- match with JDK (use 1.7.2 with JDK 1.7) -->
+			<!-- match with JDK (use 1.7.2 with JDK 1.7) -->
 			<!--
 			<plugin>
 				<groupId>com.samaxes.maven</groupId>