Upgrade UUI Database to PostgresSQL

Change-Id: I9fcfe72edb8b40efee7c30a72b53812ba0ac656a
Issue-ID: USECASEUI-236
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

diff --git a/server/pom.xml b/server/pom.xml
index 5ef9f20..d0d10aa 100644 (file)
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -71,6 +71,22 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-rest</artifactId>
         </dependency>
+        <dependency>
+                       <groupId>org.elasticsearch.client</groupId>
+                       <artifactId>elasticsearch-rest-high-level-client</artifactId>
+                       <version>6.6.0</version>
+                        <exclusions>
+                <exclusion>
+                    <groupId>org.elasticsearch</groupId>
+                    <artifactId>elasticsearch</artifactId>
+                </exclusion>
+              </exclusions>
+               </dependency>
+                <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>6.6.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-rest-hal-browser</artifactId>
@@ -83,11 +99,18 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mariadb.jdbc</groupId>
-            <artifactId>mariadb-java-client</artifactId>
-            <version>2.2.2</version>
-        </dependency>
+               <!-- postgresql  dependency-->
+               <dependency>
+                       <groupId>postgresql</groupId>
+                       <artifactId>postgresql</artifactId>
+                       <version>9.1-901-1.jdbc4</version>
+               </dependency>
+               
+               <dependency>
+                       <groupId>org.postgresql</groupId>
+                       <artifactId>postgresql</artifactId>
+                       <scope>runtime</scope>
+               </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -326,4 +349,4 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
-</project>
+</project>
\ No newline at end of file

diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties
index 7402b51..48fb0e7 100644 (file)
--- a/server/src/main/resources/application.properties
+++ b/server/src/main/resources/application.properties
@@ -14,17 +14,17 @@
 ## limitations under the License.
 ##
 ## General App Properties
-server.contextPath=/api/usecaseui/server/v1
+server.contextPath=/api/usecaseui-server/v1
 server.port=8082
 spring.http.multipart.max-file-size=128MB
 spring.http.multipart.max-request-size=128MB
 
 ## App DB Properties
-spring.datasource.url=jdbc:mysql://localhost:3306/uui
-spring.datasource.username=root
-spring.datasource.password=root
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
-spring.database.driver.classname=org.mariadb.jdbc.Driver
+spring.datasource.url=jdbc:postgresql://localhost:5432/uui
+spring.datasource.username=uui
+spring.datasource.password=uui
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
+spring.database.driver.classname=org.postgresql.Driver
 spring.jpa.show-sql=false
 spring.jpa.properties.hibernate.format_sql=false