You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2020/01/22 15:33:16 UTC
[airavata] branch mft-integration updated: Fixing ansibles and API
server distribution
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch mft-integration
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/mft-integration by this push:
new 6097a2d Fixing ansibles and API server distribution
6097a2d is described below
commit 6097a2d548795354923932ad8e1cc9fd546abb47
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Wed Jan 22 10:33:01 2020 -0500
Fixing ansibles and API server distribution
---
dev-tools/ansible/roles/common/defaults/main.yml | 4 ++--
modules/distribution/pom.xml | 5 +++++
.../registry/registry-core/src/main/resources/expcatalog-mysql.sql | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/dev-tools/ansible/roles/common/defaults/main.yml b/dev-tools/ansible/roles/common/defaults/main.yml
index e5635e1..881faeb 100644
--- a/dev-tools/ansible/roles/common/defaults/main.yml
+++ b/dev-tools/ansible/roles/common/defaults/main.yml
@@ -22,5 +22,5 @@ keystore_src_path: "airavata.jks"
client_truststore_src_path: "airavata.jks"
cred_keystore_src_path: "airavata_sym.jks"
-apache_maven_version: "apache-maven-3.6.2"
-apache_maven_url: "https://www-eu.apache.org/dist/maven/maven-3/3.6.2/binaries/apache-maven-3.6.2-bin.tar.gz"
+apache_maven_version: "apache-maven-3.6.3"
+apache_maven_url: "https://www-eu.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz"
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 245723a..126702b 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -400,6 +400,11 @@
<artifactId>profile-service-server</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>3.3.2.Final</version>
+ </dependency>
<!-- Needed for IamAdminServices Keycloak client -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
index 7e8bf7d..b093aa3 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
@@ -337,7 +337,7 @@ CREATE TABLE TASK (
CURRENT_RETRY int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (TASK_ID),
FOREIGN KEY (PARENT_PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE TASK_STATUS (
STATUS_ID varchar(255),
@@ -418,4 +418,4 @@ CREATE TABLE PROCESS_WORKFLOW
CREATION_TIME timestamp DEFAULT NOW(),
PRIMARY KEY (PROCESS_ID, WORKFLOW_ID),
FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;