Upgrade the JDBC driver and MySQL scripts

wso2-attic · Oct 25, 2018 · afa60ed · afa60ed
1 parent ae1671a
commit afa60ed
Show file tree

Hide file tree

Showing 49 changed files with 1,818 additions and 723 deletions.
diff --git a/integrator-analytics/Vagrantfile b/integrator-analytics/Vagrantfile
@@ -32,7 +32,6 @@ if ARGV[0] == '--updates'
   TOKEN = [ERB::Util.url_encode(USERNAME), ERB::Util.url_encode(PASSWORD)].join(':')
 else
   # initializing USERNAME and PASSWORD
-  print "Using the Vagrant boxes with no updates...\n"
   USERNAME = ""
   PASSWORD = ""
 end

diff --git a/integrator-analytics/analytics-dashboard/conf/dashboard/deployment.yaml b/integrator-analytics/analytics-dashboard/conf/dashboard/deployment.yaml
@@ -393,7 +393,7 @@ wso2.datasources:
         jdbcUrl: 'jdbc:mysql://172.28.128.3:3306/WSO2_EI_ANALYTICS_DB?useSSL=false'
         username: root
         password: wso2carbon
-        driverClassName: com.mysql.jdbc.Driver
+        driverClassName: com.mysql.cj.jdbc.Driver
         maxPoolSize: 50
         idleTimeout: 60000
         connectionTestQuery: SELECT 1

diff --git a/integrator-analytics/analytics-dashboard/provisioner/product_provisioner.sh b/integrator-analytics/analytics-dashboard/provisioner/product_provisioner.sh
@@ -17,7 +17,7 @@
 WSO2_SERVER=wso2ei
 WSO2_SERVER_VERSION=6.4.0
 WSO2_SERVER_PACK=${WSO2_SERVER}-${WSO2_SERVER_VERSION}*.zip
-MYSQL_CONNECTOR=mysql-connector-java-5.1.*-bin.jar
+MYSQL_CONNECTOR=mysql-connector-java-*.jar
 JDK_ARCHIVE=jdk-8u*-linux-x64.tar.gz
 WORKING_DIRECTORY=/home/vagrant
 JAVA_HOME=/opt/java/
@@ -48,7 +48,7 @@ echo "Successfully set up ${WSO2_SERVER}-${WSO2_SERVER_VERSION} server"
 
 # add the MySQL driver
 echo "Copying the MySQL driver to the server pack..."
-cp ${WORKING_DIRECTORY}/${MYSQL_CONNECTOR} ${WORKING_DIRECTORY}/${WSO2_SERVER}-${WSO2_SERVER_VERSION}/wso2/analytics/lib/${MYSQL_CONNECTOR}
+cp ${WORKING_DIRECTORY}/${MYSQL_CONNECTOR} ${WORKING_DIRECTORY}/${WSO2_SERVER}-${WSO2_SERVER_VERSION}/wso2/analytics/lib/
 if [ "$?" -eq "0" ];
 then
   echo "Successfully copied the MySQL driver to the server pack."

diff --git a/integrator-analytics/analytics-worker/conf/worker/deployment.yaml b/integrator-analytics/analytics-worker/conf/worker/deployment.yaml
@@ -436,7 +436,7 @@ wso2.datasources:
           jdbcUrl: 'jdbc:mysql://172.28.128.3:3306/WSO2_EI_ANALYTICS_DB?useSSL=false'
           username: root
           password: wso2carbon
-          driverClassName: com.mysql.jdbc.Driver
+          driverClassName: com.mysql.cj.jdbc.Driver
           maxPoolSize: 50
           idleTimeout: 60000
           validationTimeout: 30000

diff --git a/integrator-analytics/analytics-worker/provisioner/product_provisioner.sh b/integrator-analytics/analytics-worker/provisioner/product_provisioner.sh
@@ -17,7 +17,7 @@
 WSO2_SERVER=wso2ei
 WSO2_SERVER_VERSION=6.4.0
 WSO2_SERVER_PACK=${WSO2_SERVER}-${WSO2_SERVER_VERSION}*.zip
-MYSQL_CONNECTOR=mysql-connector-java-5.1.*-bin.jar
+MYSQL_CONNECTOR=mysql-connector-java-*.jar
 JDK_ARCHIVE=jdk-8u*-linux-x64.tar.gz
 WORKING_DIRECTORY=/home/vagrant
 JAVA_HOME=/opt/java/
@@ -48,7 +48,7 @@ echo "Successfully set up ${WSO2_SERVER}-${WSO2_SERVER_VERSION} server"
 
 # add the MySQL driver
 echo "Copying the MySQL driver to the server pack..."
-cp ${WORKING_DIRECTORY}/${MYSQL_CONNECTOR} ${WORKING_DIRECTORY}/${WSO2_SERVER}-${WSO2_SERVER_VERSION}/wso2/analytics/lib/${MYSQL_CONNECTOR}
+cp ${WORKING_DIRECTORY}/${MYSQL_CONNECTOR} ${WORKING_DIRECTORY}/${WSO2_SERVER}-${WSO2_SERVER_VERSION}/wso2/analytics/lib/
 if [ "$?" -eq "0" ];
 then
   echo "Successfully copied the MySQL driver to the server pack."

diff --git a/integrator-analytics/integrator/conf/datasources/master-datasources.xml b/integrator-analytics/integrator/conf/datasources/master-datasources.xml
@@ -35,7 +35,7 @@
                     <url>jdbc:mysql://172.28.128.3:3306/WSO2_EI_ANALYTICS_DB?autoReconnect=true</url>
                     <username>root</username>
                     <password>wso2carbon</password>
-                    <driverClassName>com.mysql.jdbc.Driver</driverClassName>
+                    <driverClassName>com.mysql.cj.jdbc.Driver</driverClassName>
                     <maxActive>50</maxActive>
                     <maxWait>60000</maxWait>
                     <validationQuery>SELECT 1</validationQuery>

diff --git a/integrator-analytics/integrator/provisioner/product_provisioner.sh b/integrator-analytics/integrator/provisioner/product_provisioner.sh
@@ -16,7 +16,7 @@
 WSO2_SERVER=wso2ei
 WSO2_SERVER_VERSION=6.4.0
 WSO2_SERVER_PACK=${WSO2_SERVER}-${WSO2_SERVER_VERSION}*.zip
-MYSQL_CONNECTOR=mysql-connector-java-5.1.*-bin.jar
+MYSQL_CONNECTOR=mysql-connector-java-*.jar
 JDK_ARCHIVE=jdk-8u*-linux-x64.tar.gz
 WORKING_DIRECTORY=/home/vagrant
 JAVA_HOME=/opt/java/
@@ -47,7 +47,7 @@ echo "Successfully set up ${WSO2_SERVER}-${WSO2_SERVER_VERSION} server"
 
 # add the MySQL driver
 echo "Copying the MySQL driver to the server pack..."
-cp ${WORKING_DIRECTORY}/${MYSQL_CONNECTOR} ${WORKING_DIRECTORY}/${WSO2_SERVER}-${WSO2_SERVER_VERSION}/lib/${MYSQL_CONNECTOR}
+cp ${WORKING_DIRECTORY}/${MYSQL_CONNECTOR} ${WORKING_DIRECTORY}/${WSO2_SERVER}-${WSO2_SERVER_VERSION}/lib/
 if [ "$?" -eq "0" ];
 then
   echo "Successfully copied the MySQL driver to the server pack."

diff --git a/integrator-analytics/mysql/provisioner/db_provisioner.sh b/integrator-analytics/mysql/provisioner/db_provisioner.sh
@@ -18,7 +18,7 @@ WORKING_DIRECTORY=/home/vagrant
 
 # run product db script
 echo "Execute the database scripts..."
-mysql -u${DB_USER} -p${DB_PASSWORD} -e "source ${WORKING_DIRECTORY}/mysql/scripts/mysql.sql"
+mysql -u${DB_USER} -p${DB_PASSWORD} -e "source ${WORKING_DIRECTORY}/mysql/scripts/mysql5.7.sql"
 echo "Successfully executed the database scripts."
 
 # grants root access to MySQL server from any host