shopizer-memoizeit
Changes
pom.xml 10(+9 -1)
shopizer-canadapost/pom.xml 6(+6 -0)
shopizer-shipping-distance-module/pom.xml 12(+12 -0)
sm-core/pom.xml 7(+7 -0)
sm-search/pom.xml 12(+12 -0)
sm-shop/pom.xml 51(+47 -4)
Details
pom.xml 10(+9 -1)
diff --git a/pom.xml b/pom.xml
index 67c335c..b377cd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,11 +32,12 @@
<org.apache.httpcomponent.version>4.5.2</org.apache.httpcomponent.version>
<javax.inject.version>1</javax.inject.version>
<javax.el.version>2.2.4</javax.el.version>
-
+ <javax.servlet-api-version>3.0.1</javax.servlet-api-version>
<!-- external systems -->
<c3p0-version>0.9.5.2</c3p0-version>
<org.elasticsearch-version>2.4.1</org.elasticsearch-version>
<infinispan.version>6.0.2.Final</infinispan.version>
+ <mysql-jdbc-version>5.1.40</mysql-jdbc-version>
<!-- DON'T AS IT OVERWRITES SPRING -->
<!--<spring.version>4.2.1.RELEASE</spring.version>-->
<!--<spring-data.version>Gosling-RELEASE</spring-data.version>-->
@@ -62,6 +63,13 @@
<artifactId>validation-api</artifactId>
<version>1.1.0.Final</version>
</dependency>
+
+ <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql-jdbc-version}</version>
+ </dependency>
shopizer-canadapost/pom.xml 6(+6 -0)
diff --git a/shopizer-canadapost/pom.xml b/shopizer-canadapost/pom.xml
index dc8b176..ccf9a10 100644
--- a/shopizer-canadapost/pom.xml
+++ b/shopizer-canadapost/pom.xml
@@ -162,6 +162,12 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
<version>1.19</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
shopizer-shipping-distance-module/pom.xml 12(+12 -0)
diff --git a/shopizer-shipping-distance-module/pom.xml b/shopizer-shipping-distance-module/pom.xml
index ea7a168..c4b64ee 100644
--- a/shopizer-shipping-distance-module/pom.xml
+++ b/shopizer-shipping-distance-module/pom.xml
@@ -145,6 +145,12 @@
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Jackson JSON Processor -->
@@ -173,6 +179,12 @@
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
sm-core/pom.xml 7(+7 -0)
diff --git a/sm-core/pom.xml b/sm-core/pom.xml
index 1f829da..00fe233 100644
--- a/sm-core/pom.xml
+++ b/sm-core/pom.xml
@@ -117,6 +117,13 @@
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>${commons-validator.version}</version>
+
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
sm-search/pom.xml 12(+12 -0)
diff --git a/sm-search/pom.xml b/sm-search/pom.xml
index b2fdf80..7026086 100644
--- a/sm-search/pom.xml
+++ b/sm-search/pom.xml
@@ -131,6 +131,12 @@
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>${org.elasticsearch-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
@@ -138,6 +144,12 @@
<groupId>io.searchbox</groupId>
<artifactId>jest</artifactId>
<version>${io.searchbox.jest-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
sm-shop/pom.xml 51(+47 -4)
diff --git a/sm-shop/pom.xml b/sm-shop/pom.xml
index 26b39a4..27697c6 100644
--- a/sm-shop/pom.xml
+++ b/sm-shop/pom.xml
@@ -21,6 +21,8 @@
<!--<dbh2.version>1.4.187</dbh2.version>-->
<main.basedir>${basedir}/../..</main.basedir>
<m2eclipse.wtp.contextRoot>/</m2eclipse.wtp.contextRoot>
+
+
</properties>
<dependencies>
@@ -51,6 +53,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
+ <scope>provided</scope>
</dependency>
@@ -71,6 +74,15 @@
</dependency>
+ <!-- ... -->
+ <!--<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
+
+ </dependency>-->
+ <!-- ... -->
+
+
<dependency>
<groupId>org.springframework.mobile</groupId>
<artifactId>spring-mobile-device</artifactId>
@@ -81,6 +93,12 @@
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
<version>3.0.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
@@ -91,13 +109,24 @@
</dependency>
+ <!--<dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <version>1.1.0.Final</version>
+ </dependency>-->
+
+
<!-- Servlet -->
+
+ <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>${javax.servlet-api-version}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>-->
+
+
<dependency>
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
@@ -108,12 +137,25 @@
<groupId>javax.servlet.jsp.jstl</groupId>
<artifactId>jstl-api</artifactId>
<version>1.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.glassfish.web</groupId>
<artifactId>jstl-impl</artifactId>
<version>1.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<!-- https://mvnrepository.com/artifact/javax/javaee-api -->
<!--
@@ -123,11 +165,12 @@
<version>7.0</version>
</dependency>
-->
+
</dependencies>
-
+
</project>