X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ui%2Fpom.xml;h=1a77fc807a1e7f0db31cf2aa6e7a1c1b7f63dd96;hb=ca3ea7d1c8ddbdc60adb7f51426c2c6509158097;hp=46c647f54445ea364aa6b52891b9dbd84027befa;hpb=34585c7411632c339ac147898e02f3ada118eb51;p=validation.git

diff --git a/ui/pom.xml b/ui/pom.xml
index 46c647f..1a77fc8 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -14,8 +14,8 @@
 
     <groupId>org.akraino.validation</groupId>
     <artifactId>ui</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
-    <name>AECBlueprintValidationUI Maven Webapp</name>
+    <version>0.4.6-SNAPSHOT</version>
+    <name>Bluval UI Maven Webapp</name>
     <packaging>war</packaging>
 
     <properties>
@@ -35,7 +35,7 @@
         <maven-war-plugin-version>2.0.2</maven-war-plugin-version>
         <maven-deploy-plugin-version>2.8</maven-deploy-plugin-version>
         <eelf-core-version>1.0.0</eelf-core-version>
-        <jackson.version>2.8.10</jackson.version>
+        <jackson.version>2.9.9</jackson.version>
         <c3p0.version>0.9.5.2</c3p0.version>
         <io.searchbox.jest.version>2.0.0</io.searchbox.jest.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
@@ -52,6 +52,7 @@
         <tomcat.download.path>http://archive.apache.org/dist/tomcat/tomcat-8/v8.0.37/bin</tomcat.download.path>
         <tomcat.download.name>apache-tomcat-8.0.37</tomcat.download.name>
         <maven-assembly-plugin.version>3.0.0</maven-assembly-plugin.version>
+        <mysql-connector.version>8.0.17</mysql-connector.version>
     </properties>
 
     <repositories>
@@ -64,7 +65,7 @@
 
     <build>
         <!-- The war file name carries no version number -->
-        <finalName>AECBlueprintValidationUI</finalName>
+        <finalName>bluvalui</finalName>
 
         <plugins>
             <plugin>
@@ -144,6 +145,8 @@
                 </configuration>
             </plugin>
 
+            <!-- Currently, the docker-maven-plugin is used only for the
+                development mode -->
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
@@ -156,26 +159,26 @@
                             <build>
                                 <from>tomcat:8.5.37</from>
                                 <assembly>
-                                    <descriptorRef>artifact</descriptorRef>
+                                    <descriptor>${project.basedir}/ui-docker-assembly.xml</descriptor>
                                 </assembly>
                                 <runCmds>
                                     <!-- must be all on one line; use CDATA
                                         to turn off the Eclipse formatter -->
-                                    <run><![CDATA[mv /maven/*.war /usr/local/tomcat/webapps]]></run>
+                                    <run><![CDATA[mv /maven/target/*.war /usr/local/tomcat/webapps; mv /maven/docker-files/index.jsp /usr/local/tomcat/webapps/ROOT; mv /maven/docker-files/server.xml /usr/local/tomcat/conf; rm -fr /maven]]></run>
                                 </runCmds>
                             </build>
                         </image>
                         <image>
-                            <name>akraino/validation:dev-mariadb-latest</name>
+                            <name>akraino/validation:dev-mysql-latest</name>
                             <build>
-                                <from>mariadb:10.4.6</from>
+                                <from>mysql:5.6</from>ll
                                 <assembly>
                                     <descriptorRef>project</descriptorRef>
                                 </assembly>
                                 <runCmds>
                                     <!-- must be all on one line; use CDATA
                                         to turn off the Eclipse formatter -->
-                                    <run><![CDATA[mv /maven/db-scripts/EcompSdkDDLMySql_2_4_Common.sql /docker-entrypoint-initdb.d ; mv /maven/db-scripts/EcompSdkDDLMySql_2_4_OS.sql /docker-entrypoint-initdb.d ; mv /maven/db-scripts/EcompSdkDMLMySql_2_4_Common.sql /docker-entrypoint-initdb.d ; mv /maven/db-scripts/EcompSdkDMLMySql_2_4_OS.sql /docker-entrypoint-initdb.d ; mv /maven/db-scripts/akraino-blueprint_validation_db.sql /docker-entrypoint-initdb.d ; rm -fr /maven]]></run>
+                                    <run><![CDATA[mv /maven/db-scripts/EcompSdkDDLMySql_2_4_Common.sql /docker-entrypoint-initdb.d ; mv /maven/db-scripts/EcompSdkDDLMySql_2_4_OS.sql /docker-entrypoint-initdb.d ; mv /maven/db-scripts/EcompSdkDMLMySql_2_4_Common.sql /docker-entrypoint-initdb.d ; mv /maven/db-scripts/EcompSdkDMLMySql_2_4_OS.sql /docker-entrypoint-initdb.d ; mv /maven/db-scripts/akraino_blueprint_validation_db.sql /docker-entrypoint-initdb.d ; rm -fr /maven]]></run>
                                 </runCmds>
                             </build>
                         </image>
@@ -371,6 +374,11 @@
             <artifactId>commons-httpclient</artifactId>
             <version>${commons-httpclient.version}</version>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql-connector.version}</version>
+        </dependency>
 
     </dependencies>
 </project>