diff --git a/api/api-facade/api-database/src/main/java/org/eclipse/dirigible/api/v3/db/DatabaseFacade.java b/api/api-facade/api-database/src/main/java/org/eclipse/dirigible/api/v3/db/DatabaseFacade.java
index fae4f3b8f73..0bd8c94fb37 100644
--- a/api/api-facade/api-database/src/main/java/org/eclipse/dirigible/api/v3/db/DatabaseFacade.java
+++ b/api/api-facade/api-database/src/main/java/org/eclipse/dirigible/api/v3/db/DatabaseFacade.java
@@ -641,10 +641,6 @@ public static final Connection getConnection(String databaseType, String datasou
}
Connection connection = dataSource.getConnection();
- if(((WrappedDataSource) dataSource).getDatabaseName().equals(DATABASE_NAME_HDB)) {
- connection.setClientInfo("APPLICATIONUSER", UserFacade.getName());
- }
-
return connection;
}
diff --git a/api/api-facade/api-git/pom.xml b/api/api-facade/api-git/pom.xml
index 34e732c8e10..b48eb76bb11 100644
--- a/api/api-facade/api-git/pom.xml
+++ b/api/api-facade/api-git/pom.xml
@@ -44,9 +44,15 @@
org.eclipse.dirigible
- dirigible-core
+ dirigible-core-git
7.0.0-SNAPSHOT
+
+ org.eclipse.dirigible
+ dirigible-commons-test
+ 7.0.0-SNAPSHOT
+ test
+
org.eclipse.dirigible
dirigible-api-facade-platform
diff --git a/api/api-facade/api-git/src/main/java/org/eclipse/dirigible/api/v4/git/GitFacade.java b/api/api-facade/api-git/src/main/java/org/eclipse/dirigible/api/v4/git/GitFacade.java
index a194e2c7c76..ce88857e414 100644
--- a/api/api-facade/api-git/src/main/java/org/eclipse/dirigible/api/v4/git/GitFacade.java
+++ b/api/api-facade/api-git/src/main/java/org/eclipse/dirigible/api/v4/git/GitFacade.java
@@ -23,8 +23,8 @@
import org.eclipse.dirigible.core.workspace.json.WorkspaceGitHelper;
import org.eclipse.dirigible.core.workspace.service.WorkspacesCoreService;
import org.eclipse.dirigible.repository.api.IRepository;
+import org.eclipse.jgit.api.Status;
import org.eclipse.jgit.api.errors.*;
-
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -39,26 +39,26 @@ public static void initRepository(String username, String email, String workspac
IWorkspace workspaceObject = workspacesCoreService.getWorkspace(workspaceName);
IProject projectObject = workspaceObject.getProject(projectName);
String user = UserFacade.getName();
- File tempGitDirectory = GitFileUtils.getGitDirectory(user, workspaceName, repositoryName);
- boolean isExistingGitRepository = tempGitDirectory != null;
+ File gitDirectory = GitFileUtils.getGitDirectoryByRepositoryName(workspaceName, repositoryName);
+ boolean isExistingGitRepository = gitDirectory != null;
if (!isExistingGitRepository) {
- tempGitDirectory = GitFileUtils.createGitDirectory(user, workspaceName, repositoryName);
+ gitDirectory = GitFileUtils.createGitDirectory(user, workspaceName, repositoryName);
} else {
throw new RefAlreadyExistsException("Git repository already exists");
}
- GitFileUtils.copyProjectToDirectory(projectObject, tempGitDirectory);
+ GitFileUtils.copyProjectToDirectory(projectObject, gitDirectory);
projectObject.delete();
- File projectGitDirectory = new File(tempGitDirectory, projectObject.getName());
+ File projectGitDirectory = new File(gitDirectory, projectObject.getName());
GitFileUtils gitFileUtils = new GitFileUtils();
- GitConnectorFactory.initRepository(tempGitDirectory.getCanonicalPath(), false);
+ GitConnectorFactory.initRepository(gitDirectory.getCanonicalPath(), false);
gitFileUtils.importProjectFromGitRepositoryToWorkspace(projectGitDirectory, projectObject.getPath());
//the code below is needed because otherwise getHistory method will throw an error in the git perspective
- IGitConnector gitConnector = GitConnectorFactory.getConnector(tempGitDirectory.getCanonicalPath());
+ IGitConnector gitConnector = GitConnectorFactory.getConnector(gitDirectory.getCanonicalPath());
gitConnector.add(IGitConnector.GIT_ADD_ALL_FILE_PATTERN);
gitConnector.commit(commitMessage, username, email, true);
}
@@ -76,7 +76,8 @@ public static void commit(String username, String email, final String workspaceN
gitConnector.commit(commitMessage, username, email, add);
}
- public static List getGitRepositories(String user, String workspaceName) {
+ public static List getGitRepositories(String workspaceName) {
+ String user = UserFacade.getName();
IWorkspace workspaceObject = workspacesCoreService.getWorkspace(workspaceName);
if (!workspaceObject.exists()) {
return null;
@@ -104,26 +105,24 @@ public static List getGitRepositories(String user, String wor
return gitRepositories;
}
- public static List getHistory(String user, String repositoryName, String workspaceName, String path) throws GitConnectorException {
+ public static List getHistory(String repositoryName, String workspaceName, String path) throws GitConnectorException {
try {
- File gitDirectory = GitFileUtils.getGitDirectory(user, workspaceName, repositoryName);
- IGitConnector gitConnector = GitConnectorFactory.getConnector(gitDirectory.getCanonicalPath());
- List history = gitConnector.getHistory(path);
+ List history = getConnector(workspaceName, repositoryName).getHistory(path);
return history;
} catch (Exception e) {
throw new GitConnectorException(e);
}
}
- public static void deleteRepository(String workspace, String repositoryName) throws GitConnectorException {
+ public static void deleteRepository(String workspaceName, String repositoryName) throws GitConnectorException {
try {
- File gitRepository = GitFileUtils.getGitDirectoryByRepositoryName(workspace, repositoryName);
+ File gitRepository = GitFileUtils.getGitDirectoryByRepositoryName(workspaceName, repositoryName);
if (gitRepository == null) {
throw new RefNotFoundException("Repository not found");
}
- IWorkspace workspaceApi = workspacesCoreService.getWorkspace(workspace);
+ IWorkspace workspaceApi = workspacesCoreService.getWorkspace(workspaceName);
IProject[] workspaceProjects = workspaceApi.getProjects().toArray(new IProject[0]);
for (IProject next : workspaceProjects) {
if (next.exists()) {
@@ -137,4 +136,72 @@ public static void deleteRepository(String workspace, String repositoryName) thr
}
}
+ public static IGitConnector cloneRepository(String workspaceName, String repositoryUri, String username, String password, String branch) throws IOException, GitAPIException {
+ String user = UserFacade.getName();
+ File gitDirectory = GitFileUtils.createGitDirectory(user, workspaceName, repositoryUri);
+ return GitConnectorFactory.cloneRepository(gitDirectory.getCanonicalPath(), repositoryUri, username, password, branch);
+ }
+
+ public static void pull(String workspaceName, String repositoryName, String username, String password) throws GitAPIException, IOException, GitConnectorException {
+ getConnector(workspaceName, repositoryName).pull(username, password);
+ }
+
+ public static void push(String workspaceName, String repositoryName, String username, String password) throws GitAPIException, IOException, GitConnectorException {
+ getConnector(workspaceName, repositoryName).push(username, password);
+ }
+
+ public static void checkout(String workspaceName, String repositoryName, String branchName) throws GitAPIException, IOException, GitConnectorException {
+ getConnector(workspaceName, repositoryName).checkout(branchName);
+ }
+
+ public static void createBranch(String workspaceName, String repositoryName, String branchName, String startingPoint) throws GitAPIException, IOException, GitConnectorException {
+ getConnector(workspaceName, repositoryName).createBranch(branchName, startingPoint);
+ }
+
+ public static void hardReset(String workspaceName, String repositoryName) throws GitAPIException, IOException, GitConnectorException {
+ getConnector(workspaceName, repositoryName).hardReset();
+ }
+
+ public static void rebase(String workspaceName, String repositoryName, String branchName) throws GitAPIException, IOException, GitConnectorException {
+ getConnector(workspaceName, repositoryName).rebase(branchName);
+ }
+
+ public static Status status(String workspaceName, String repositoryName) throws GitAPIException, IOException, GitConnectorException {
+ return getConnector(workspaceName, repositoryName).status();
+ }
+
+ public static String getBranch(String workspaceName, String repositoryName) throws GitAPIException, IOException, GitConnectorException {
+ return getConnector(workspaceName, repositoryName).getBranch();
+ }
+
+ public static List getLocalBranches(String workspaceName, String repositoryName) throws GitAPIException, IOException, GitConnectorException {
+ return getConnector(workspaceName, repositoryName).getLocalBranches();
+ }
+
+ public static List getRemoteBranches(String workspaceName, String repositoryName) throws GitAPIException, IOException, GitConnectorException {
+ return getConnector(workspaceName, repositoryName).getRemoteBranches();
+ }
+
+ public static List getUnstagedChanges(String workspaceName, String repositoryName) throws GitAPIException, IOException, GitConnectorException {
+ return getConnector(workspaceName, repositoryName).getUnstagedChanges();
+ }
+
+ public static List getStagedChanges(String workspaceName, String repositoryName) throws GitAPIException, IOException, GitConnectorException {
+ return getConnector(workspaceName, repositoryName).getStagedChanges();
+ }
+
+ public static String getFileContent(String workspaceName, String repositoryName, String filePath, String revStr) throws GitAPIException, IOException, GitConnectorException {
+ return getConnector(workspaceName, repositoryName).getFileContent(filePath, revStr);
+ }
+
+ private static IGitConnector getConnector(String workspaceName, String repositoryName) throws GitConnectorException {
+ try {
+ String user = UserFacade.getName();
+ File gitDirectory = GitFileUtils.getGitDirectory(user, workspaceName, repositoryName);
+ IGitConnector gitConnector = GitConnectorFactory.getConnector(gitDirectory.getCanonicalPath());
+ return gitConnector;
+ } catch (IOException e) {
+ throw new GitConnectorException(e);
+ }
+ }
}
diff --git a/api/api-facade/api-git/src/test/java/org/eclipse/dirigible/api/v4/git/test/GitFacadeTest.java b/api/api-facade/api-git/src/test/java/org/eclipse/dirigible/api/v4/git/test/GitFacadeTest.java
index 6c51577a67c..9595a30cd29 100644
--- a/api/api-facade/api-git/src/test/java/org/eclipse/dirigible/api/v4/git/test/GitFacadeTest.java
+++ b/api/api-facade/api-git/src/test/java/org/eclipse/dirigible/api/v4/git/test/GitFacadeTest.java
@@ -53,13 +53,13 @@ public void testInitRepositoryAndCommit() throws GitAPIException, GitConnectorEx
IProject project = workspace.createProject(projectName);
project.createFile("www/oldFile", "str".getBytes(StandardCharsets.UTF_8));
GitFacade.initRepository(user, email, workspaceName, projectName, repository, "Initial commit");
- List repos = GitFacade.getGitRepositories(user, workspaceName);
+ List repos = GitFacade.getGitRepositories(workspaceName);
assertTrue(repos.size() == 1);
project.createFile("www/newFile", "str".getBytes(StandardCharsets.UTF_8));
String message = "Second commit";
GitFacade.commit(username, email, workspaceName, repository, message, true);
- List history = GitFacade.getHistory(user, repository, workspaceName, projectName);
+ List history = GitFacade.getHistory(repository, workspaceName, projectName);
assertTrue(history.size() == 2);
assertTrue(history.get(0).getMessage().equals(message));
GitFacade.deleteRepository(workspaceName, repository);
diff --git a/api/api-facade/api-tests/pom.xml b/api/api-facade/api-tests/pom.xml
index 526f285ccb5..0f48a6e6eaf 100644
--- a/api/api-facade/api-tests/pom.xml
+++ b/api/api-facade/api-tests/pom.xml
@@ -107,6 +107,11 @@
dirigible-api-facade-spark
7.0.0-SNAPSHOT
+
+ org.eclipse.dirigible
+ dirigible-api-facade-git
+ 7.0.0-SNAPSHOT
+
org.eclipse.dirigible
dirigible-ext-spark
@@ -197,6 +202,11 @@
dirigible-api-javascript-platform
7.0.0-SNAPSHOT
+
+ org.eclipse.dirigible
+ dirigible-api-javascript-git
+ 7.0.0-SNAPSHOT
+
org.eclipse.dirigible
dirigible-ext-redis
diff --git a/api/api-facade/api-tests/src/main/java/org/eclipse/dirigible/api/v3/test/AbstractApiSuiteTest.java b/api/api-facade/api-tests/src/main/java/org/eclipse/dirigible/api/v3/test/AbstractApiSuiteTest.java
index a8240ed9ec3..30b4ee404a2 100644
--- a/api/api-facade/api-tests/src/main/java/org/eclipse/dirigible/api/v3/test/AbstractApiSuiteTest.java
+++ b/api/api-facade/api-tests/src/main/java/org/eclipse/dirigible/api/v3/test/AbstractApiSuiteTest.java
@@ -200,6 +200,7 @@ private void registerModulesUtilsV4() {
TEST_MODULES.add("utils/v4/url/escapePath.js");
TEST_MODULES.add("utils/v4/url/escapeForm.js");
TEST_MODULES.add("utils/v4/qrcode/qrCode.js");
+ TEST_MODULES.add("git/v4/client/local.js");
}
protected void registerModulesV3() {
diff --git a/api/api-facade/api-tests/src/main/resources/META-INF/dirigible/git/v4/client/local.js b/api/api-facade/api-tests/src/main/resources/META-INF/dirigible/git/v4/client/local.js
new file mode 100644
index 00000000000..9427e7e1230
--- /dev/null
+++ b/api/api-facade/api-tests/src/main/resources/META-INF/dirigible/git/v4/client/local.js
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
+const git = require('git/v4/client');
+const assertTrue = require('utils/v4/assert').assertTrue;
+const workspaceManager = require("platform/v4/workspace");
+
+const user = 'dirigible';
+const email = 'dirigible@eclipse.com';
+const workspaceName = 'test-workspace';
+const projectName = 'test-project';
+const repositoryName = projectName;
+
+const workspace = workspaceManager.createWorkspace(workspaceName);
+project = workspace.createProject(projectName);
+let firstFile = project.createFile("firstFile.js");
+firstFile.setText('first file content');
+
+git.initRepository(user, email, workspaceName, projectName, repositoryName, 'initial commit');
+
+let repos = git.getGitRepositories(workspaceName);
+console.log("Repository name " + repos[0].getName())
+assertTrue(repos[0].getName() === repositoryName);
+
+let secondFile = project.createFile("secondFile.js");
+secondFile.setText('second file content');
+console.log("Getting staged changes...");
+let staged = git.getStagedChanges(workspaceName, repositoryName);
+console.log("Staged changes count: " + staged.size())
+assertTrue(staged.size() === 0);
+
+console.log("Getting unstaged changes...");
+let unstaged = git.getUnstagedChanges(workspaceName, repositoryName);
+console.log("Unstaged changes count: " + unstaged.size())
+assertTrue(unstaged.size() === 1);
+
+git.commit(user, email, workspaceName, repositoryName, "second file added", true);
+const his = git.getHistory(repositoryName, workspaceName, projectName);
+
+console.log("History size: " + his.size())
+assertTrue(his.size() === 2);
+
+let branches = git.getLocalBranches(workspaceName, repositoryName);
+console.log("Local branches size: " + branches.size());
+assertTrue(branches.size() === 1);
+
+git.createBranch(workspaceName, repositoryName, 'new-branch', 'master');
+branches = git.getLocalBranches(workspaceName, repositoryName);
+console.log("New local branches size: " + branches.size());
+assertTrue(branches.size() === 2);
+
+const status = git.status(workspaceName, repositoryName);
+console.log("Status is clean: " + status.isClean());
+assertTrue(status.isClean() === true);
+
+console.log("Deleting test repo...");
+git.deleteRepository(workspaceName, repositoryName);
+console.log("Repositories size at the end: " + git.getGitRepositories(workspaceName).size());
+assertTrue(git.getGitRepositories(workspaceName).size() === 0);
\ No newline at end of file
diff --git a/api/api-javascript/api-git/pom.xml b/api/api-javascript/api-git/pom.xml
new file mode 100644
index 00000000000..10c815639fb
--- /dev/null
+++ b/api/api-javascript/api-git/pom.xml
@@ -0,0 +1,25 @@
+
+ 4.0.0
+
+
+ org.eclipse.dirigible
+ dirigible-api-javascript-parent
+ 7.0.0-SNAPSHOT
+ ../pom.xml
+
+
+ API - JavaScript - HTTP
+ dirigible-api-javascript-git
+ Git Module
+ jar
+
+
+ generate-sources
+ api-git
+ git
+
+ ../../../licensing-header.txt
+
+
+
\ No newline at end of file
diff --git a/api/api-javascript/api-utils/src/main/resources/META-INF/dirigible/utils/git.js b/api/api-javascript/api-git/src/main/resources/META-INF/dirigible/git/client.js
similarity index 94%
rename from api/api-javascript/api-utils/src/main/resources/META-INF/dirigible/utils/git.js
rename to api/api-javascript/api-git/src/main/resources/META-INF/dirigible/git/client.js
index ec3827b9f8a..4a0a88d23ae 100644
--- a/api/api-javascript/api-utils/src/main/resources/META-INF/dirigible/utils/git.js
+++ b/api/api-javascript/api-git/src/main/resources/META-INF/dirigible/git/client.js
@@ -9,7 +9,7 @@
* SPDX-FileCopyrightText: 2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
* SPDX-License-Identifier: EPL-2.0
*/
-var git = require('utils/v4/git');
+var git = require('git/v4/client');
for(var propertyName in git) {
exports[propertyName] = git[propertyName];
}
\ No newline at end of file
diff --git a/api/api-javascript/api-git/src/main/resources/META-INF/dirigible/git/v4/client.js b/api/api-javascript/api-git/src/main/resources/META-INF/dirigible/git/v4/client.js
new file mode 100644
index 00000000000..8f97a86be3f
--- /dev/null
+++ b/api/api-javascript/api-git/src/main/resources/META-INF/dirigible/git/v4/client.js
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * SPDX-FileCopyrightText: 2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+exports.initRepository = function (user, email, workspaceName, projectName, repositoryName, commitMessage) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.initRepository(user, email, workspaceName, projectName, repositoryName, commitMessage);
+}
+
+exports.commit = function (user, userEmail, workspaceName, repositoryName, commitMessage, add) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.commit(user, userEmail, workspaceName, repositoryName, commitMessage, add);
+}
+
+exports.getGitRepositories = function (workspaceName) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.getGitRepositories(workspaceName);
+}
+
+exports.getHistory = function(repositoryName, workspaceName, path) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.getHistory(repositoryName, workspaceName, path);
+}
+
+exports.deleteRepository = function(workspaceName, repositoryName) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.deleteRepository(workspaceName, repositoryName);
+}
+
+exports.cloneRepository = function(workspaceName, repositoryUri, username, password, branch) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.cloneRepository(workspaceName, repositoryUri, username, password, branch);
+}
+
+exports.pull = function(workspaceName, repositoryName, username, password) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.pull(workspaceName, repositoryName, username, password);
+}
+
+exports.push = function(workspaceName, repositoryName, username, password) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.push(workspaceName, repositoryName, username, password);
+}
+
+exports.checkout = function(workspaceName, repositoryName, branchName) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.checkout(workspaceName, repositoryName, branchName);
+}
+
+exports.createBranch = function(workspaceName, repositoryName, branchName, startingPoint) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.createBranch(workspaceName, repositoryName, branchName, startingPoint);
+}
+
+exports.hardReset = function(workspaceName, repositoryName) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.hardReset(workspaceName, repositoryName);
+}
+
+exports.rebase = function(workspaceName, repositoryName, branchName) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.rebase(workspaceName, repositoryName, branchName);
+}
+
+exports.status = function(workspaceName, repositoryName) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.status(workspaceName, repositoryName);
+}
+
+exports.getBranch = function(workspaceName, repositoryName) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.getBranch(workspaceName, repositoryName);
+}
+
+exports.getLocalBranches = function(workspaceName, repositoryName) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.getLocalBranches(workspaceName, repositoryName);
+}
+
+exports.getRemoteBranches = function(workspaceName, repositoryName) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.getRemoteBranches(workspaceName, repositoryName);
+}
+
+exports.getUnstagedChanges = function(workspaceName, repositoryName) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.getUnstagedChanges(workspaceName, repositoryName);
+}
+
+exports.getStagedChanges = function(workspaceName, repositoryName) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.getStagedChanges(workspaceName, repositoryName);
+}
+
+exports.getFileContent = function(workspaceName, repositoryName, filePath, revStr) {
+ return org.eclipse.dirigible.api.v4.git.GitFacade.getFileContent(workspaceName, repositoryName, filePath, revStr);
+}
\ No newline at end of file
diff --git a/api/api-javascript/api-utils/src/main/resources/META-INF/dirigible/utils/v4/git.js b/api/api-javascript/api-utils/src/main/resources/META-INF/dirigible/utils/v4/git.js
deleted file mode 100644
index 6f977a883c6..00000000000
--- a/api/api-javascript/api-utils/src/main/resources/META-INF/dirigible/utils/v4/git.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v2.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v20.html
- *
- * SPDX-FileCopyrightText: 2021 SAP SE or an SAP affiliate company and Eclipse Dirigible contributors
- * SPDX-License-Identifier: EPL-2.0
- */
-
-exports.initRepository = function (user, email, workspaceName, projectName, repositoryName, commitMessage) {
- return org.eclipse.dirigible.api.v4.git.GitFacade.initRepository(user, email, workspaceName, projectName, repositoryName, commitMessage);
-}
-
-exports.commit = function (user, userEmail, workspaceName, repositoryName, commitMessage, add) {
- return org.eclipse.dirigible.api.v4.git.GitFacade.commit(user, userEmail, workspaceName, repositoryName, commitMessage, add);
-}
diff --git a/api/api-javascript/pom.xml b/api/api-javascript/pom.xml
index 32bc793f1c3..acece990443 100644
--- a/api/api-javascript/pom.xml
+++ b/api/api-javascript/pom.xml
@@ -33,6 +33,7 @@
api-bpm
api-cms
api-documents
+ api-git
diff --git a/modules/core/core-git/src/main/java/org/eclipse/dirigible/core/git/GitConnectorFactory.java b/modules/core/core-git/src/main/java/org/eclipse/dirigible/core/git/GitConnectorFactory.java
index 24cb1fd0d77..301a50d6080 100644
--- a/modules/core/core-git/src/main/java/org/eclipse/dirigible/core/git/GitConnectorFactory.java
+++ b/modules/core/core-git/src/main/java/org/eclipse/dirigible/core/git/GitConnectorFactory.java
@@ -22,6 +22,7 @@
import org.eclipse.jgit.api.CloneCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.InitCommand;
+import org.eclipse.jgit.api.PullCommand;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.api.errors.InvalidRemoteException;
import org.eclipse.jgit.api.errors.TransportException;
diff --git a/modules/database/database-api/src/main/java/org/eclipse/dirigible/database/api/wrappers/WrappedDataSource.java b/modules/database/database-api/src/main/java/org/eclipse/dirigible/database/api/wrappers/WrappedDataSource.java
index 6c40f810aec..313287f0e2f 100644
--- a/modules/database/database-api/src/main/java/org/eclipse/dirigible/database/api/wrappers/WrappedDataSource.java
+++ b/modules/database/database-api/src/main/java/org/eclipse/dirigible/database/api/wrappers/WrappedDataSource.java
@@ -122,10 +122,6 @@ public Connection getConnection() throws SQLException {
checkConnections();
WrappedConnection wrappedConnection = new WrappedConnection(originalDataSource.getConnection(), this);
- if(this.databaseName == null) {
- this.databaseName = wrappedConnection.getMetaData().getDatabaseProductName();
- }
-
addConnection(wrappedConnection);
wrappedConnection.setAutoCommit(AUTO_COMMIT_ENABLED);
logger.trace("Connection acquired: " + wrappedConnection.hashCode() + " count: " + connections.size());
@@ -143,10 +139,6 @@ public Connection getConnection(String username, String password) throws SQLExce
checkConnections();
WrappedConnection wrappedConnection = new WrappedConnection(originalDataSource.getConnection(username, password), this);
- if(this.databaseName == null) {
- this.databaseName = wrappedConnection.getMetaData().getDatabaseProductName();
- }
-
addConnection(wrappedConnection);
wrappedConnection.setAutoCommit(AUTO_COMMIT_ENABLED);
logger.trace("Connection acquired: " + wrappedConnection.hashCode() + " count: " + connections.size());
diff --git a/modules/database/database-changelog/pom.xml b/modules/database/database-changelog/pom.xml
index a657a5f8468..23a96c6b206 100644
--- a/modules/database/database-changelog/pom.xml
+++ b/modules/database/database-changelog/pom.xml
@@ -85,7 +85,7 @@
org.liquibase
liquibase-core
- 4.4.2
+ ${liquibase-core.version}
diff --git a/modules/database/database-h2/src/test/java/org/eclipse/dirigible/database/h2/test/DatabaseH2Test.java b/modules/database/database-h2/src/test/java/org/eclipse/dirigible/database/h2/test/DatabaseH2Test.java
index 321fcda46c1..229685c42d1 100644
--- a/modules/database/database-h2/src/test/java/org/eclipse/dirigible/database/h2/test/DatabaseH2Test.java
+++ b/modules/database/database-h2/src/test/java/org/eclipse/dirigible/database/h2/test/DatabaseH2Test.java
@@ -97,11 +97,11 @@ public void listTableNamesTest() throws SQLException {
connection = dataSource.getConnection();
List tables = DatabaseMetadataHelper.listTables(connection, null, "INFORMATION_SCHEMA", null);
for (TableMetadata table : tables) {
- if ("CATALOGS".equals(table.getName())) {
+ if ("USERS".equals(table.getName())) {
return;
}
}
- fail("No SYSKEYS table present");
+ fail("No USERS table present");
} finally {
if (connection != null) {
connection.close();
diff --git a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/ISqlKeywords.java b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/ISqlKeywords.java
index 668731b64ea..ef21cbbe76f 100644
--- a/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/ISqlKeywords.java
+++ b/modules/database/database-sql/src/main/java/org/eclipse/dirigible/database/sql/ISqlKeywords.java
@@ -456,6 +456,11 @@ public interface ISqlKeywords {
*/
public static final String METADATA_SYSTEM_TABLE = "SYSTEM TABLE"; //$NON-NLS-1$
+ /**
+ * The Constant METADATA_BASE_TABLE.
+ */
+ public static final String METADATA_BASE_TABLE = "BASE TABLE"; //$NON-NLS-1$
+
/**
* The Constant METADATA_LOCAL_TEMPORARY.
*/
@@ -495,7 +500,7 @@ public interface ISqlKeywords {
* The Constant METADATA_TABLE_TYPES.
*/
public static final List METADATA_TABLE_TYPES = Collections.unmodifiableList(Arrays.asList(METADATA_TABLE, METADATA_VIEW, METADATA_ALIAS,
- METADATA_SYNONYM, METADATA_GLOBAL_TEMPORARY, METADATA_LOCAL_TEMPORARY, METADATA_SYSTEM_TABLE));
+ METADATA_SYNONYM, METADATA_GLOBAL_TEMPORARY, METADATA_LOCAL_TEMPORARY, METADATA_SYSTEM_TABLE, METADATA_BASE_TABLE));
/**
* The Constant KEYWORD_COLUMNSTORE.
diff --git a/modules/engines/engine-javascript-graalvm/.gitignore b/modules/engines/engine-javascript-graalvm/.gitignore
deleted file mode 100644
index 350446b7c20..00000000000
--- a/modules/engines/engine-javascript-graalvm/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-# folders
-dist/
-.settings/
-target/
-derby/
-dirigible_local/
-
-# files
-.DS_Store
-.project
-.classpath
-*.bak
-*.class
-*.jar
-derby.log
-/bin/
diff --git a/modules/odata/odata-core-test/pom.xml b/modules/odata/odata-core-test/pom.xml
index 3de29e428e2..877477691ae 100644
--- a/modules/odata/odata-core-test/pom.xml
+++ b/modules/odata/odata-core-test/pom.xml
@@ -57,7 +57,7 @@
org.liquibase
liquibase-core
- ${liquibase.version}
+ ${liquibase-core.version}
@@ -68,7 +68,7 @@
com.h2database
h2
- 1.4.200
+ ${h2database.version}
@@ -103,6 +103,5 @@
1.8
../../../licensing-header.txt
- 3.8.1
diff --git a/modules/odata/odata-core-test/src/test/java/org/eclipse/dirigible/engine/odata2/sql/ODataSQLProcessorTest.java b/modules/odata/odata-core-test/src/test/java/org/eclipse/dirigible/engine/odata2/sql/ODataSQLProcessorTest.java
index 36b584d1458..928edf0a699 100644
--- a/modules/odata/odata-core-test/src/test/java/org/eclipse/dirigible/engine/odata2/sql/ODataSQLProcessorTest.java
+++ b/modules/odata/odata-core-test/src/test/java/org/eclipse/dirigible/engine/odata2/sql/ODataSQLProcessorTest.java
@@ -663,16 +663,12 @@ public void testExpand() throws Exception {
List entries = resultFeed.getEntries();
assertEquals("There shall be exactly 3 entries", 3, entries.size());
Map firstEntryProperties = entries.get(0).getProperties();
- assertEquals(1982, firstEntryProperties.get("Year"));
- assertEquals("Moskvitch", firstEntryProperties.get("Make"));
- assertEquals("412", firstEntryProperties.get("Model"));
+ assertEquals(1998, firstEntryProperties.get("Year"));
+ assertEquals("Ford", firstEntryProperties.get("Make"));
+ assertEquals("Focus", firstEntryProperties.get("Model"));
List drivers = ((ODataDeltaFeedImpl) (firstEntryProperties.get("Drivers"))).getEntries();
- assertEquals(2, drivers.size());
- Map firstDriverProperties = drivers.get(0).getProperties();
- assertEquals("Johnny", firstDriverProperties.get("FirstName"));
- Map secondDriverProperties = drivers.get(1).getProperties();
- assertEquals("Natalie", secondDriverProperties.get("FirstName"));
+ assertEquals(0, drivers.size());
}
@Test
@@ -778,17 +774,14 @@ public void testOrderByExpandedEntityProperty() throws Exception {
List entries = resultFeed.getEntries();
assertEquals("The limit must work with expand", 3, entries.size());
Map firstEntryProperties = entries.get(0).getProperties();
- assertEquals(1982, firstEntryProperties.get("Year"));
- assertEquals("Moskvitch", firstEntryProperties.get("Make"));
- assertEquals("412", firstEntryProperties.get("Model"));
+ assertEquals(2021, firstEntryProperties.get("Year"));
+ assertEquals("BMW", firstEntryProperties.get("Make"));
+ assertEquals("530e", firstEntryProperties.get("Model"));
List drivers = ((ODataDeltaFeedImpl) (firstEntryProperties.get("Drivers"))).getEntries();
- assertEquals(2, drivers.size());
+ assertEquals(1, drivers.size());
Map firstDriverProperties = drivers.get(0).getProperties();
- assertEquals("Natalie", firstDriverProperties.get("FirstName"));
- Map secondDriverProperties = drivers.get(1).getProperties();
- assertEquals("Johnny", secondDriverProperties.get("FirstName"));
-
+ assertEquals("Zahari", firstDriverProperties.get("FirstName"));
Response responseAsc = OData2RequestBuilder.createRequest(sf) //
.segments("Cars") //
@@ -802,9 +795,9 @@ public void testOrderByExpandedEntityProperty() throws Exception {
List entriesAsc = resultFeedAsc.getEntries();
assertEquals("The limit must work with expand", 3, entriesAsc.size());
Map firstEntryPropertiesAsc = entriesAsc.get(0).getProperties();
- assertEquals(2015, firstEntryPropertiesAsc.get("Year"));
+ assertEquals(1998, firstEntryPropertiesAsc.get("Year"));
assertEquals("Ford", firstEntryPropertiesAsc.get("Make"));
- assertEquals("S-Max", firstEntryPropertiesAsc.get("Model"));
+ assertEquals("Focus", firstEntryPropertiesAsc.get("Model"));
List driversAsc = ((ODataDeltaFeedImpl) (firstEntryPropertiesAsc.get("Drivers"))).getEntries();
assertEquals(0, driversAsc.size());
@@ -823,16 +816,14 @@ public void testOrderByExpandedEntityProperties() throws Exception {
List entries = resultFeed.getEntries();
assertEquals("The limit must work with expand", 3, entries.size());
Map firstEntryProperties = entries.get(0).getProperties();
- assertEquals(1982, firstEntryProperties.get("Year"));
- assertEquals("Moskvitch", firstEntryProperties.get("Make"));
- assertEquals("412", firstEntryProperties.get("Model"));
+ assertEquals(2021, firstEntryProperties.get("Year"));
+ assertEquals("BMW", firstEntryProperties.get("Make"));
+ assertEquals("530e", firstEntryProperties.get("Model"));
List drivers = ((ODataDeltaFeedImpl) (firstEntryProperties.get("Drivers"))).getEntries();
- assertEquals(2, drivers.size());
+ assertEquals(1, drivers.size());
Map firstDriverProperties = drivers.get(0).getProperties();
- assertEquals("Natalie", firstDriverProperties.get("FirstName"));
- Map secondDriverProperties = drivers.get(1).getProperties();
- assertEquals("Johnny", secondDriverProperties.get("FirstName"));
+ assertEquals("Zahari", firstDriverProperties.get("FirstName"));
}
}
\ No newline at end of file
diff --git a/modules/odata/odata-core-test/src/test/resources/META-INF/Car.json b/modules/odata/odata-core-test/src/test/resources/META-INF/Car.json
index 30dbfd3a38f..086ebc21fb5 100644
--- a/modules/odata/odata-core-test/src/test/resources/META-INF/Car.json
+++ b/modules/odata/odata-core-test/src/test/resources/META-INF/Car.json
@@ -3,7 +3,7 @@
"edmTypeFqn": "org.eclipse.dirigible.engine.odata2.sql.entities.Car",
"sqlTable" : "CARS",
"Make" : "MAKE",
- "Year" : "YEAR",
+ "Year" : "PRODUCTION_YEAR",
"Model" : "MODEL",
"Price" : "PRICE",
"Updated" : "UPDATED",
diff --git a/modules/odata/odata-core-test/src/test/resources/data/Cars.csv b/modules/odata/odata-core-test/src/test/resources/data/Cars.csv
index e664745be17..34510c507bd 100644
--- a/modules/odata/odata-core-test/src/test/resources/data/Cars.csv
+++ b/modules/odata/odata-core-test/src/test/resources/data/Cars.csv
@@ -1,4 +1,4 @@
-ID;MAKE;MODEL;YEAR;UPDATED;PRICE
+ID;MAKE;MODEL;PRODUCTION_YEAR;UPDATED;PRICE
639cac17-4cfd-4d94-b5d0-111fd5488423;BMW;530e;2021;2021-06-07T08:12:39;67000
ec20bbaf-ee7a-4405-91d0-7ad8be889270;Ford;S-Max;2015;2017-12-04T10:12:39;10000
7990d49f-cfaf-48ab-8c6f-adbe7aaa069e;Peugeot;308;2010;2011-01-01T10:12:39;8000
diff --git a/modules/odata/odata-core-test/src/test/resources/liquibase/changelog.schema.xml b/modules/odata/odata-core-test/src/test/resources/liquibase/changelog.schema.xml
index b5ce8902661..f54d83015cd 100644
--- a/modules/odata/odata-core-test/src/test/resources/liquibase/changelog.schema.xml
+++ b/modules/odata/odata-core-test/src/test/resources/liquibase/changelog.schema.xml
@@ -21,7 +21,7 @@
-
+
diff --git a/pom.xml b/pom.xml
index 673ff111fd5..1d90629fb15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -670,7 +670,7 @@
UTF-8
11
3.0.2
- 3.0.0
+ 3.1.0
src/main/resources/META-INF/dirigible
3.8.0
11
@@ -692,7 +692,7 @@
1.7.5
1.7.12
1.2.10
- 1.4.200
+ 2.0.206
10.12.1.1
5.16.0
1.0
@@ -704,13 +704,14 @@
2.3.3
4.2.rc1
2.2.2
- 5.5.0.201909110433-r
+ 6.0.0.202111291000-r
1.6.4
2.0.11
2.6.0
4.0.2
3.12.7
3.0.3
+ 4.6.2
3.0.0
none
diff --git a/releng/anonymous-all/src/main/resources/logback.xml b/releng/anonymous-all/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/anonymous-all/src/main/resources/logback.xml
+++ b/releng/anonymous-all/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/anonymous-runtime/src/main/resources/logback.xml b/releng/anonymous-runtime/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/anonymous-runtime/src/main/resources/logback.xml
+++ b/releng/anonymous-runtime/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/desktop-all/src/main/resources/logback.xml b/releng/desktop-all/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/desktop-all/src/main/resources/logback.xml
+++ b/releng/desktop-all/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/openshift-all/src/main/resources/logback.xml b/releng/openshift-all/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/openshift-all/src/main/resources/logback.xml
+++ b/releng/openshift-all/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/sap-all-ephemeral/src/main/resources/logback.xml b/releng/sap-all-ephemeral/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/sap-all-ephemeral/src/main/resources/logback.xml
+++ b/releng/sap-all-ephemeral/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/sap-all/src/main/resources/logback.xml b/releng/sap-all/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/sap-all/src/main/resources/logback.xml
+++ b/releng/sap-all/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/sap-cf-base/src/main/resources/logback.xml b/releng/sap-cf-base/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/sap-cf-base/src/main/resources/logback.xml
+++ b/releng/sap-cf-base/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/sap-cms/src/main/resources/logback.xml b/releng/sap-cms/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/sap-cms/src/main/resources/logback.xml
+++ b/releng/sap-cms/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/sap-kyma-base/src/main/resources/logback.xml b/releng/sap-kyma-base/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/sap-kyma-base/src/main/resources/logback.xml
+++ b/releng/sap-kyma-base/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/sap-runtime-ephemeral/src/main/resources/logback.xml b/releng/sap-runtime-ephemeral/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/sap-runtime-ephemeral/src/main/resources/logback.xml
+++ b/releng/sap-runtime-ephemeral/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/server-all/Dockerfile-base b/releng/server-all/Dockerfile-base
index 2fb0aebaad0..65c651ba59d 100644
--- a/releng/server-all/Dockerfile-base
+++ b/releng/server-all/Dockerfile-base
@@ -1,9 +1,9 @@
# Docker descriptor for Dirigible
# License - http://www.eclipse.org/legal/epl-v20.html
-FROM tomcat:8.5.43-jdk11-openjdk
+FROM tomcat:8-jre11-openjdk
-RUN rm -R /usr/local/tomcat/webapps/*
+RUN rm -R /usr/local/tomcat/webapps/
COPY target/ROOT.war $CATALINA_HOME/webapps/
RUN unzip $CATALINA_HOME/webapps/ROOT.war -d $CATALINA_HOME/webapps/ROOT
RUN rm $CATALINA_HOME/webapps/ROOT.war
diff --git a/releng/server-all/src/main/resources/logback.xml b/releng/server-all/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/server-all/src/main/resources/logback.xml
+++ b/releng/server-all/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/server-keycloak-all/src/main/resources/logback.xml b/releng/server-keycloak-all/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/server-keycloak-all/src/main/resources/logback.xml
+++ b/releng/server-keycloak-all/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/server-minimal/src/main/resources/logback.xml b/releng/server-minimal/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/server-minimal/src/main/resources/logback.xml
+++ b/releng/server-minimal/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/server-oauth/src/main/resources/logback.xml b/releng/server-oauth/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/server-oauth/src/main/resources/logback.xml
+++ b/releng/server-oauth/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/server-runtime-keycloak/src/main/resources/logback.xml b/releng/server-runtime-keycloak/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/server-runtime-keycloak/src/main/resources/logback.xml
+++ b/releng/server-runtime-keycloak/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/server-runtime/src/main/resources/logback.xml b/releng/server-runtime/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/server-runtime/src/main/resources/logback.xml
+++ b/releng/server-runtime/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
diff --git a/releng/server-vertx/pom.xml b/releng/server-vertx/pom.xml
index ff64ab00b6c..a04d31b2e99 100644
--- a/releng/server-vertx/pom.xml
+++ b/releng/server-vertx/pom.xml
@@ -250,7 +250,7 @@
junit
junit
- 4.13.2
+ ${junit.version}
test
diff --git a/releng/trial-all/src/main/resources/logback.xml b/releng/trial-all/src/main/resources/logback.xml
index e964d6cc9b9..47b4d257c4e 100644
--- a/releng/trial-all/src/main/resources/logback.xml
+++ b/releng/trial-all/src/main/resources/logback.xml
@@ -1,6 +1,13 @@
+
+
+
true
@@ -17,21 +24,21 @@
- ../logs/dirigible-core-${date}.log
+ ${LOGS_DIR}/logs/dirigible-core-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-apps-${date}.log
+ ${LOGS_DIR}/logs/dirigible-apps-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n
- ../logs/dirigible-base-${date}.log
+ ${LOGS_DIR}/logs/dirigible-base-${date}.log
%date %level [%thread] %logger{10} [%file:%line] %msg%n