shopizer-developers
Changes
pom.xml 3(+3 -0)
shopizer-canadapost/.classpath 5(+0 -5)
shopizer-canadapost/pom.xml 35(+32 -3)
shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties 7(+0 -7)
shopizer-shipping-distance-module/pom.xml 35(+32 -3)
shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties 7(+0 -7)
shopizer-shipping-distance-module/target/test-classes/spring/processors/shopizer-core-shipping-processors.xml 25(+0 -25)
sm-core/.classpath 1(+1 -0)
sm-core/.project 7(+7 -0)
sm-core/pom.xml 20(+19 -1)
sm-core-modules/.classpath 1(+1 -0)
sm-search/.classpath 1(+1 -0)
sm-search/.project 13(+13 -0)
sm-search/pom.xml 8(+8 -0)
sm-shop/SALESMANAGER.h2.db 0(+0 -0)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java 2(+1 -1)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/CustomProductGroupsController.java 2(+1 -1)
sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingConfigsController.java 2(+1 -1)
sm-shop/src/test/java/com/salesmanager/test/shop/controller/category/rest/CategoryManagementAPITest.java 4(+2 -2)
sm-shop/src/test/java/com/salesmanager/test/shop/controller/customer/rest/CustomerRESTControllerTest.java 4(+2 -2)
Details
pom.xml 3(+3 -0)
diff --git a/pom.xml b/pom.xml
index 7a08fe1..f0e4b9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,10 @@
<module>sm-core-model</module>
<module>sm-core-modules</module>
<module>sm-core</module>
+ <module>sm-search</module>
<module>sm-shop</module>
+ <module>shopizer-canadapost</module>
+ <module>shopizer-shipping-distance-module</module>
</modules>
<repositories>
shopizer-canadapost/.classpath 5(+0 -5)
diff --git a/shopizer-canadapost/.classpath b/shopizer-canadapost/.classpath
index 62d4b8e..c30f415 100644
--- a/shopizer-canadapost/.classpath
+++ b/shopizer-canadapost/.classpath
@@ -6,11 +6,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
shopizer-canadapost/pom.xml 35(+32 -3)
diff --git a/shopizer-canadapost/pom.xml b/shopizer-canadapost/pom.xml
index 23563df..64cbfcf 100644
--- a/shopizer-canadapost/pom.xml
+++ b/shopizer-canadapost/pom.xml
@@ -13,11 +13,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java-version>1.8</java-version>
- <sm-core-model.version>2.5.0-SNAPSHOT</sm-core-model.version>
- <sm-core-modules.version>2.5.0-SNAPSHOT</sm-core-modules.version>
+ <sm-core-model.version>2.0.5-SNAPSHOT</sm-core-model.version>
+ <sm-core-modules.version>2.0.5-SNAPSHOT</sm-core-modules.version>
- <jackson-version>1.9.13</jackson-version>
+ <jackson-version>2.7.4</jackson-version>
<org.springframework-version>4.2.1.RELEASE</org.springframework-version>
<junit.version>4.9</junit.version>
<org.aspectj-version>1.6.10</org.aspectj-version>
@@ -27,11 +27,19 @@
</properties>
<!-- mvn clean deploy -->
+ <!--
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
+ -->
+
+ <parent>
+ <groupId>com.shopizer</groupId>
+ <artifactId>shopizer</artifactId>
+ <version>2.0.5-SNAPSHOT</version>
+ </parent>
@@ -140,11 +148,32 @@
<!-- Jackson JSON Processor -->
+ <!--
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson-version}</version>
</dependency>
+ -->
+
+ <!-- Jackson JSON Processor -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
<dependency>
<groupId>commons-io</groupId>
diff --git a/shopizer-shipping-distance-module/.classpath b/shopizer-shipping-distance-module/.classpath
index 62d4b8e..c30f415 100644
--- a/shopizer-shipping-distance-module/.classpath
+++ b/shopizer-shipping-distance-module/.classpath
@@ -6,11 +6,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
shopizer-shipping-distance-module/pom.xml 35(+32 -3)
diff --git a/shopizer-shipping-distance-module/pom.xml b/shopizer-shipping-distance-module/pom.xml
index f8c5803..ad9ec25 100644
--- a/shopizer-shipping-distance-module/pom.xml
+++ b/shopizer-shipping-distance-module/pom.xml
@@ -14,11 +14,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java-version>1.8</java-version>
- <sm-core-model.version>2.5.0-SNAPSHOT</sm-core-model.version>
- <sm-core-modules.version>2.5.0-SNAPSHOT</sm-core-modules.version>
+ <sm-core-model.version>2.0.5-SNAPSHOT</sm-core-model.version>
+ <sm-core-modules.version>2.0.5-SNAPSHOT</sm-core-modules.version>
- <jackson-version>1.9.13</jackson-version>
+ <jackson-version>2.7.4</jackson-version>
<org.springframework-version>4.2.1.RELEASE</org.springframework-version>
<junit.version>4.9</junit.version>
<org.aspectj-version>1.6.10</org.aspectj-version>
@@ -30,11 +30,19 @@
</properties>
<!-- mvn clean deploy -->
+ <!--
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
+ -->
+
+ <parent>
+ <groupId>com.shopizer</groupId>
+ <artifactId>shopizer</artifactId>
+ <version>2.0.5-SNAPSHOT</version>
+ </parent>
@@ -154,11 +162,32 @@
</dependency>
<!-- Jackson JSON Processor -->
+ <!--
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>${jackson-version}</version>
</dependency>
+ -->
+
+ <!-- Jackson JSON Processor -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
<!-- JSR 303 with Hibernate Validator -->
sm-core/.classpath 1(+1 -0)
diff --git a/sm-core/.classpath b/sm-core/.classpath
index 8c4866c..7108320 100644
--- a/sm-core/.classpath
+++ b/sm-core/.classpath
@@ -25,6 +25,7 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
sm-core/.project 7(+7 -0)
diff --git a/sm-core/.project b/sm-core/.project
index e8eaab5..28b4f11 100644
--- a/sm-core/.project
+++ b/sm-core/.project
@@ -16,12 +16,19 @@
</arguments>
</buildCommand>
<buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
diff --git a/sm-core/.settings/org.eclipse.m2e.core.prefs b/sm-core/.settings/org.eclipse.m2e.core.prefs
index 41475ee..14b697b 100644
--- a/sm-core/.settings/org.eclipse.m2e.core.prefs
+++ b/sm-core/.settings/org.eclipse.m2e.core.prefs
@@ -1,4 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
-resolveWorkspaceProjects=false
+resolveWorkspaceProjects=true
version=1
diff --git a/sm-core/.settings/org.eclipse.wst.common.component b/sm-core/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..5e61104
--- /dev/null
+++ b/sm-core/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="sm-core">
+ <wb-resource deploy-path="/" source-path="/src/main/java"/>
+ <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+ </wb-module>
+</project-modules>
diff --git a/sm-core/.settings/org.eclipse.wst.common.project.facet.core.xml b/sm-core/.settings/org.eclipse.wst.common.project.facet.core.xml
index 017b6f4..6302d3e 100644
--- a/sm-core/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/sm-core/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<installed facet="java" version="1.8"/>
+ <installed facet="jst.utility" version="1.0"/>
</faceted-project>
diff --git a/sm-core/.settings/org.eclipse.wst.validation.prefs b/sm-core/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/sm-core/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
sm-core/pom.xml 20(+19 -1)
diff --git a/sm-core/pom.xml b/sm-core/pom.xml
index 4d7763b..64cfd49 100644
--- a/sm-core/pom.xml
+++ b/sm-core/pom.xml
@@ -24,6 +24,7 @@
<javax.inject.version>1</javax.inject.version>
<javax.el.version>2.2.4</javax.el.version>
<drools.version>5.6.0.Final</drools.version>
+ <jackson-version>2.7.4</jackson-version>
</properties>
<dependencies>
@@ -112,7 +113,24 @@
<version>${commons-collections4.version}</version>
</dependency>
-
+ <!-- Jackson JSON Processor -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson-version}</version>
+ </dependency>
<!-- https://mvnrepository.com/artifact/commons-validator/commons-validator -->
diff --git a/sm-core/src/test/java/com/salesmanager/test/utils/ImportIntegrationModule.java b/sm-core/src/test/java/com/salesmanager/test/utils/ImportIntegrationModule.java
index 1cbdd80..5d82fa9 100644
--- a/sm-core/src/test/java/com/salesmanager/test/utils/ImportIntegrationModule.java
+++ b/sm-core/src/test/java/com/salesmanager/test/utils/ImportIntegrationModule.java
@@ -7,12 +7,12 @@ import java.util.Map;
import javax.inject.Inject;
-import org.codehaus.jackson.map.ObjectMapper;
import org.junit.Ignore;
import org.junit.runner.RunWith;
import org.springframework.boot.test.SpringApplicationConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.salesmanager.core.business.exception.ServiceException;
import com.salesmanager.core.business.services.reference.loader.IntegrationModulesLoader;
import com.salesmanager.core.business.services.system.ModuleConfigurationService;
sm-core-modules/.classpath 1(+1 -0)
diff --git a/sm-core-modules/.classpath b/sm-core-modules/.classpath
index 01edbc4..9dd5796 100644
--- a/sm-core-modules/.classpath
+++ b/sm-core-modules/.classpath
@@ -15,6 +15,7 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
diff --git a/sm-core-modules/.settings/org.eclipse.jdt.core.prefs b/sm-core-modules/.settings/org.eclipse.jdt.core.prefs
index d59e09c..1ab2bb5 100644
--- a/sm-core-modules/.settings/org.eclipse.jdt.core.prefs
+++ b/sm-core-modules/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,8 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.8
diff --git a/sm-core-modules/.settings/org.eclipse.wst.common.component b/sm-core-modules/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..2a6dbf0
--- /dev/null
+++ b/sm-core-modules/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="sm-core-modules">
+ <wb-resource deploy-path="/" source-path="/src/main/java"/>
+ </wb-module>
+</project-modules>
diff --git a/sm-core-modules/.settings/org.eclipse.wst.common.project.facet.core.xml b/sm-core-modules/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..fb95c45
--- /dev/null
+++ b/sm-core-modules/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <installed facet="java" version="1.8"/>
+ <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/sm-core-modules/.settings/org.eclipse.wst.validation.prefs b/sm-core-modules/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/sm-core-modules/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
sm-search/.classpath 1(+1 -0)
diff --git a/sm-search/.classpath b/sm-search/.classpath
index fc5f96c..62d4b8e 100644
--- a/sm-search/.classpath
+++ b/sm-search/.classpath
@@ -25,6 +25,7 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
sm-search/.project 13(+13 -0)
diff --git a/sm-search/.project b/sm-search/.project
index a3be8fb..3b40581 100644
--- a/sm-search/.project
+++ b/sm-search/.project
@@ -6,18 +6,31 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
diff --git a/sm-search/.settings/org.eclipse.wst.common.component b/sm-search/.settings/org.eclipse.wst.common.component
new file mode 100644
index 0000000..c1f223a
--- /dev/null
+++ b/sm-search/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="sm-search">
+ <wb-resource deploy-path="/" source-path="/src/main/java"/>
+ <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+ </wb-module>
+</project-modules>
diff --git a/sm-search/.settings/org.eclipse.wst.common.project.facet.core.xml b/sm-search/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 0000000..fb95c45
--- /dev/null
+++ b/sm-search/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <installed facet="java" version="1.8"/>
+ <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/sm-search/.settings/org.eclipse.wst.validation.prefs b/sm-search/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..04cad8c
--- /dev/null
+++ b/sm-search/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,2 @@
+disabled=06target
+eclipse.preferences.version=1
sm-search/pom.xml 8(+8 -0)
diff --git a/sm-search/pom.xml b/sm-search/pom.xml
index e17328b..0209c17 100644
--- a/sm-search/pom.xml
+++ b/sm-search/pom.xml
@@ -36,11 +36,19 @@
</properties>
<!-- mvn clean deploy -->
+ <!--
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
</parent>
+ -->
+
+ <parent>
+ <groupId>com.shopizer</groupId>
+ <artifactId>shopizer</artifactId>
+ <version>2.0.5-SNAPSHOT</version>
+ </parent>
<scm>
<connection>scm:svn:http://svn.shopizer.com/branches/v2/sm-search/</connection>
diff --git a/sm-shop/.settings/org.eclipse.m2e.core.prefs b/sm-shop/.settings/org.eclipse.m2e.core.prefs
index 41475ee..14b697b 100644
--- a/sm-shop/.settings/org.eclipse.m2e.core.prefs
+++ b/sm-shop/.settings/org.eclipse.m2e.core.prefs
@@ -1,4 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
-resolveWorkspaceProjects=false
+resolveWorkspaceProjects=true
version=1
diff --git a/sm-shop/.settings/org.eclipse.wst.common.component b/sm-shop/.settings/org.eclipse.wst.common.component
index 8c8ba22..b7e7066 100644
--- a/sm-shop/.settings/org.eclipse.wst.common.component
+++ b/sm-shop/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,24 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+ <dependent-module archiveName="sm-core-2.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/sm-core/sm-core">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="sm-core-modules-2.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/sm-core-modules/sm-core-modules">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shopizer-shipping-distance-processor-2.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shopizer-shipping-distance-processor/shopizer-shipping-distance-processor">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="shopizer-shipping-canadapost-module-2.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/shopizer-shipping-canadapost-module/shopizer-shipping-canadapost-module">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="sm-core-model-2.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/sm-core-model/sm-core-model">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
+ <dependent-module archiveName="sm-search-2.0.5-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/sm-search/sm-search">
+ <dependency-type>uses</dependency-type>
+ </dependent-module>
<property name="context-root" value="sm-shop"/>
<property name="java-output-path" value="/sm-shop/target/classes"/>
</wb-module>
sm-shop/SALESMANAGER.h2.db 0(+0 -0)
diff --git a/sm-shop/SALESMANAGER.h2.db b/sm-shop/SALESMANAGER.h2.db
index 9b3d2ad..d72a99a 100644
Binary files a/sm-shop/SALESMANAGER.h2.db and b/sm-shop/SALESMANAGER.h2.db differ
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java
index 2f968ac..916507b 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/customers/CustomerOptionsSetController.java
@@ -1,5 +1,6 @@
package com.salesmanager.shop.admin.controller.customers;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.salesmanager.core.business.services.customer.attribute.CustomerOptionService;
import com.salesmanager.core.business.services.customer.attribute.CustomerOptionSetService;
import com.salesmanager.core.business.services.customer.attribute.CustomerOptionValueService;
@@ -12,7 +13,6 @@ import com.salesmanager.shop.admin.controller.ControllerConstants;
import com.salesmanager.shop.admin.model.web.Menu;
import com.salesmanager.shop.constants.Constants;
import com.salesmanager.shop.utils.LabelUtils;
-import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpHeaders;
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/CustomProductGroupsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/CustomProductGroupsController.java
index 8a60252..a436d27 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/CustomProductGroupsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/products/CustomProductGroupsController.java
@@ -1,5 +1,6 @@
package com.salesmanager.shop.admin.controller.products;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.salesmanager.core.business.services.catalog.category.CategoryService;
import com.salesmanager.core.business.services.catalog.product.ProductService;
import com.salesmanager.core.business.services.catalog.product.relationship.ProductRelationshipService;
@@ -16,7 +17,6 @@ import com.salesmanager.shop.admin.model.web.Menu;
import com.salesmanager.shop.constants.Constants;
import com.salesmanager.shop.utils.LabelUtils;
import org.apache.commons.lang3.StringUtils;
-import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpHeaders;
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingConfigsController.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingConfigsController.java
index 388242c..7e46187 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingConfigsController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/controller/shipping/ShippingConfigsController.java
@@ -9,7 +9,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.inject.Inject;
import org.apache.commons.lang3.StringUtils;
-import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -27,6 +26,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import com.salesmanager.core.model.merchant.MerchantStore;
import com.salesmanager.core.model.reference.country.Country;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.salesmanager.core.business.services.reference.country.CountryService;
import com.salesmanager.core.model.reference.language.Language;
import com.salesmanager.core.model.shipping.ShippingConfiguration;
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java
index ed5b2fb..d367540 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/admin/model/web/Menu.java
@@ -1,11 +1,13 @@
package com.salesmanager.shop.admin.model.web;
-import org.codehaus.jackson.annotate.JsonProperty;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
public class Menu implements Serializable {
/**
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java b/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java
index f67def5..55aabdd 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/controller/ReferenceController.java
@@ -1,5 +1,6 @@
package com.salesmanager.shop.controller;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.salesmanager.core.business.exception.ServiceException;
import com.salesmanager.core.business.services.reference.country.CountryService;
import com.salesmanager.core.business.services.reference.language.LanguageService;
@@ -13,7 +14,6 @@ import com.salesmanager.shop.constants.Constants;
import com.salesmanager.shop.utils.DateUtil;
import com.salesmanager.shop.utils.LanguageUtils;
import org.apache.commons.lang3.StringUtils;
-import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.HttpHeaders;
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java b/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java
index e3e0604..affb7ae 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/filter/AdminFilter.java
@@ -1,5 +1,8 @@
package com.salesmanager.shop.filter;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.salesmanager.core.business.services.merchant.MerchantStoreService;
import com.salesmanager.core.business.services.reference.language.LanguageService;
import com.salesmanager.core.business.services.user.UserService;
@@ -11,9 +14,7 @@ import com.salesmanager.shop.admin.model.web.Menu;
import com.salesmanager.shop.constants.Constants;
import com.salesmanager.shop.utils.LanguageUtils;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
diff --git a/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java b/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
index 1247f80..7d6ef05 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/filter/StoreFilter.java
@@ -1,5 +1,6 @@
package com.salesmanager.shop.filter;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.salesmanager.core.business.services.catalog.category.CategoryService;
import com.salesmanager.core.business.services.catalog.product.ProductService;
import com.salesmanager.core.business.services.content.ContentService;
@@ -37,7 +38,6 @@ import com.salesmanager.shop.utils.LanguageUtils;
import com.salesmanager.shop.utils.WebApplicationCacheUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.i18n.LocaleContextHolder;
diff --git a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/category/rest/CategoryManagementAPITest.java b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/category/rest/CategoryManagementAPITest.java
index 71a1bf8..e60fb50 100644
--- a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/category/rest/CategoryManagementAPITest.java
+++ b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/category/rest/CategoryManagementAPITest.java
@@ -1,11 +1,11 @@
package com.salesmanager.test.shop.controller.category.rest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
import com.salesmanager.shop.model.catalog.category.Category;
import com.salesmanager.shop.model.catalog.category.CategoryDescription;
import com.salesmanager.shop.model.catalog.category.PersistableCategory;
import com.salesmanager.shop.model.catalog.category.ReadableCategory;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.ObjectWriter;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.http.*;
diff --git a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/customer/rest/CustomerRESTControllerTest.java b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/customer/rest/CustomerRESTControllerTest.java
index 6a4af9d..3e31873 100644
--- a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/customer/rest/CustomerRESTControllerTest.java
+++ b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/customer/rest/CustomerRESTControllerTest.java
@@ -1,5 +1,7 @@
package com.salesmanager.test.shop.controller.customer.rest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
import com.salesmanager.shop.model.customer.Address;
import com.salesmanager.shop.model.customer.Customer;
import com.salesmanager.shop.model.customer.PersistableCustomer;
@@ -8,8 +10,6 @@ import com.salesmanager.shop.model.customer.attribute.CustomerOptionDescription;
import com.salesmanager.shop.model.customer.attribute.CustomerOptionValueDescription;
import com.salesmanager.shop.model.customer.attribute.PersistableCustomerOption;
import com.salesmanager.shop.model.customer.attribute.PersistableCustomerOptionValue;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.ObjectWriter;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.http.*;
diff --git a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/product/rest/ProductManagementAPITest.java b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/product/rest/ProductManagementAPITest.java
index a2c847c..1d531c0 100644
--- a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/product/rest/ProductManagementAPITest.java
+++ b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/product/rest/ProductManagementAPITest.java
@@ -1,5 +1,7 @@
package com.salesmanager.test.shop.controller.product.rest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
import com.salesmanager.core.model.catalog.product.attribute.ProductOptionType;
import com.salesmanager.shop.model.catalog.category.Category;
import com.salesmanager.shop.model.catalog.manufacturer.Manufacturer;
@@ -10,8 +12,6 @@ import com.salesmanager.shop.model.catalog.product.attribute.PersistableProductO
import com.salesmanager.shop.model.catalog.product.attribute.PersistableProductOptionValue;
import com.salesmanager.shop.model.catalog.product.attribute.ProductOptionDescription;
import com.salesmanager.shop.model.catalog.product.attribute.ProductOptionValueDescription;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.ObjectWriter;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.http.*;
diff --git a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/store/rest/ContactAPITest.java b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/store/rest/ContactAPITest.java
index b9bb1dd..c78d128 100644
--- a/sm-shop/src/test/java/com/salesmanager/test/shop/controller/store/rest/ContactAPITest.java
+++ b/sm-shop/src/test/java/com/salesmanager/test/shop/controller/store/rest/ContactAPITest.java
@@ -1,9 +1,9 @@
package com.salesmanager.test.shop.controller.store.rest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
import com.salesmanager.core.business.utils.ajax.AjaxResponse;
import com.salesmanager.shop.model.shop.ContactForm;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.ObjectWriter;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.http.*;