Merge pull request #459 from khoa-nd/master

Merged

pom.xml

@@ -27,7 +27,6 @@
     <aspectj.version>1.8.1</aspectj.version>
     <spring-data-jpa.version>1.9.0.RELEASE</spring-data-jpa.version>
     <spring-data-elasticsearch>1.3.0.RELEASE</spring-data-elasticsearch>
-    <spring-data-couchbase>1.3.0.RELEASE</spring-data-couchbase>
     <hsqldb.version>2.3.2</hsqldb.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
@@ -40,7 +39,7 @@
     <frontend-maven-plugin.nodeVersion>v0.10.31</frontend-maven-plugin.nodeVersion>
     <frontend-maven-plugin.npmVersion>1.4.26</frontend-maven-plugin.npmVersion>
     <sass-maven-plugin.version>1.1.1</sass-maven-plugin.version>
-    <commons-io.version>1.3.2</commons-io.version>
+    <commons-io.version>2.4</commons-io.version>
     <log4j.version>1.2.17</log4j.version>
     <elasticsearch.version>1.7.2</elasticsearch.version>
     <commons-codec.version>1.9</commons-codec.version>
@@ -270,10 +269,6 @@
                     <resource>
                       <directory>src/main/resources/local</directory>
                     </resource>
-                    <resource>
-                      <directory>src/main/resources/couchbase_view</directory>
-                      <targetPath>couchbase_view</targetPath>
-                    </resource>
                     <resource>
                       <directory>src/main/resources/template</directory>
                       <targetPath>template</targetPath>
@@ -318,10 +313,6 @@
                     <resource>
                       <directory>src/main/resources/staging</directory>
                     </resource>
-                    <resource>
-                      <directory>src/main/resources/couchbase_view</directory>
-                      <targetPath>couchbase_view</targetPath>
-                    </resource>
                     <resource>
                       <directory>src/main/resources/template</directory>
                       <targetPath>template</targetPath>
@@ -366,10 +357,6 @@
                     <resource>
                       <directory>src/main/resources/staging</directory>
                     </resource>
-                    <resource>
-                      <directory>src/main/resources/couchbase_view</directory>
-                      <targetPath>couchbase_view</targetPath>
-                    </resource>
                     <resource>
                       <directory>src/main/resources/template</directory>
                       <targetPath>template</targetPath>
@@ -414,10 +401,6 @@
                     <resource>
                       <directory>src/main/resources/production</directory>
                     </resource>
-                    <resource>
-                      <directory>src/main/resources/couchbase_view</directory>
-                      <targetPath>couchbase_view</targetPath>
-                    </resource>
                     <resource>
                       <directory>src/main/resources/template</directory>
                       <targetPath>template</targetPath>
@@ -510,17 +493,63 @@
       <scope>provided</scope>
     </dependency>
 
+    <!--<dependency>-->
+      <!--<groupId>com.itextpdf</groupId>-->
+      <!--<artifactId>itextpdf</artifactId>-->
+      <!--<version>5.5.7</version>-->
+    <!--</dependency>-->
 
     <!--<dependency>-->
-    <!--<groupId>org.slf4j</groupId>-->
-    <!--<artifactId>slf4j-api</artifactId>-->
-    <!--<version>${slf4j.version}</version>-->
+      <!--<groupId>org.jfree</groupId>-->
+      <!--<artifactId>jfreechart</artifactId>-->
+      <!--<version>1.0.19</version>-->
     <!--</dependency>-->
+
     <!--<dependency>-->
-    <!--<groupId>org.slf4j</groupId>-->
-    <!--<artifactId>slf4j-log4j12</artifactId>-->
-    <!--<version>${slf4j.version}</version>-->
+      <!--<groupId>net.sourceforge.htmlunit</groupId>-->
+      <!--<artifactId>htmlunit</artifactId>-->
+      <!--<version>2.19</version>-->
+    <!--</dependency>-->
+
+    <!--<dependency>-->
+      <!--<groupId>commons-io</groupId>-->
+      <!--<artifactId>commons-io</artifactId>-->
+      <!--<version>2.42.4</version>-->
+    <!--</dependency>-->
+
+    <dependency>
+      <groupId>org.xhtmlrenderer</groupId>
+      <artifactId>flying-saucer-pdf</artifactId>
+      <version>9.0.8</version>
+    </dependency>
+
+    <!--<dependency>-->
+      <!--<groupId>org.mozilla</groupId>-->
+      <!--<artifactId>rhino</artifactId>-->
+      <!--<version>1.7.7</version>-->
+    <!--</dependency>-->
+
+    <!--<dependency>-->
+      <!--<groupId>org.seleniumhq.selenium</groupId>-->
+      <!--<artifactId>selenium-java</artifactId>-->
+      <!--<version>2.48.2</version>-->
     <!--</dependency>-->
+
+    <!--<dependency>-->
+      <!--<groupId>xerces</groupId>-->
+      <!--<artifactId>xercesImpl</artifactId>-->
+      <!--<version>2.11.0</version>-->
+    <!--</dependency>-->
+
+
+
+
+
+
+
+
+
+
     <!-- Log Framework -->
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -589,11 +618,6 @@
       <artifactId>spring-data-elasticsearch</artifactId>
       <version>${spring-data-elasticsearch}</version>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-couchbase</artifactId>
-      <version>${spring-data-couchbase}</version>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
@@ -763,7 +787,7 @@
       <version>${commons-lang3.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
+      <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
       <version>${commons-io.version}</version>
     </dependency>