Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade gradle and minor js changes #1179

Merged
merged 1 commit into from
Aug 6, 2021
Merged

Upgrade gradle and minor js changes #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Apromore-Core-Components/Apromore-Portal/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ group = 'org.apromore'
version = '1.1'
description = 'Apromore Portal'

repositories {
maven {
url "http://mavensync.zkoss.org/maven2"
}
}
dependencies {

implementation project(':Apromore-Core-Components:Apromore-Manager')
Expand Down
1 change: 0 additions & 1 deletion ...s/Apromore-Portal/src/main/java/org/apromore/portal/dialogController/LoginController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ private void setupLocale() {
I18nSession i18nSession = new I18nSession(i18nConfig);
UserSessionManager.setCurrentI18nSession(i18nSession);
i18nSession.applyLocaleFromClient();
LabelUtils.reloadLabels();
}

@Override
Expand Down
5 changes: 5 additions & 0 deletions Apromore-Custom-Plugins/Log-Animation-Portal-Plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,8 @@ dependencies {


}

jar {

archiveBaseName='log-animation-ce'
}
2 changes: 1 addition & 1 deletion ...erer-Portal-Plugin/src/main/resources/static/processdiscoverer/js/ap/processdiscoverer.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 22 additions & 22 deletions Apromore-Custom-Plugins/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,33 @@ version = '7.21-SNAPSHOT'

dependencies {

runtime project(':Apromore-Custom-Plugins:About-Portal-Plugin')
runtime project(':Apromore-Custom-Plugins:Account-Portal-Plugin')
runtime project(':Apromore-Custom-Plugins:Access-Control-Portal-Plugin')
runtime project(':Apromore-Custom-Plugins:File-Portal-Plugin')
runtime project(':Apromore-Custom-Plugins:CSVExporter-Logic')
runtimeOnly project(':Apromore-Custom-Plugins:About-Portal-Plugin')
runtimeOnly project(':Apromore-Custom-Plugins:Account-Portal-Plugin')
runtimeOnly project(':Apromore-Custom-Plugins:Access-Control-Portal-Plugin')
runtimeOnly project(':Apromore-Custom-Plugins:File-Portal-Plugin')
runtimeOnly project(':Apromore-Custom-Plugins:CSVExporter-Logic')

runtime project(':Apromore-Custom-Plugins:Apromore-Editor')
runtime project(':Apromore-Custom-Plugins:Calendar-Portal')
runtime project(':Apromore-Custom-Plugins:CSVImporter-Logic')
runtime project(':Apromore-Custom-Plugins:CSVImporter-Portal')
runtimeOnly project(':Apromore-Custom-Plugins:Apromore-Editor')
runtimeOnly project(':Apromore-Custom-Plugins:Calendar-Portal')
runtimeOnly project(':Apromore-Custom-Plugins:CSVImporter-Logic')
runtimeOnly project(':Apromore-Custom-Plugins:CSVImporter-Portal')
// runtime project(':Apromore-Custom-Plugins:CSVExporter-Portal')
runtime project(':Apromore-Custom-Plugins:User-Admin-Portal-Plugin')
runtime project(':Apromore-Custom-Plugins:SplitMiner-Logic')
runtimeOnly project(':Apromore-Custom-Plugins:User-Admin-Portal-Plugin')
runtimeOnly project(':Apromore-Custom-Plugins:SplitMiner-Logic')

// runtime project(':Apromore-Custom-Plugins:Generic-Portal-Plugin')
runtime project(':Apromore-Custom-Plugins:Log-Animation-Logic')
runtime project(':Apromore-Custom-Plugins:Log-Animation-Portal-Plugin')
runtime project(':Apromore-Custom-Plugins:Log-Animation-Portal-Plugin-API')
runtime project(':Apromore-Custom-Plugins:Log-Logic')
runtime project(':Apromore-Core-Components:Apromore-BPMNEditor')
runtimeOnly project(':Apromore-Custom-Plugins:Log-Animation-Logic')
runtimeOnly project(':Apromore-Custom-Plugins:Log-Animation-Portal-Plugin')
runtimeOnly project(':Apromore-Custom-Plugins:Log-Animation-Portal-Plugin-API')
runtimeOnly project(':Apromore-Custom-Plugins:Log-Logic')
runtimeOnly project(':Apromore-Core-Components:Apromore-BPMNEditor')

runtime project(':Apromore-Custom-Plugins:Merge-Logic')
runtime project(':Apromore-Custom-Plugins:Similarity-Search-Logic')
runtime project(':Apromore-Custom-Plugins:Process-Discoverer-Logic')
runtime project(':Apromore-Custom-Plugins:Merge-Portal-Plugin')
runtime project(':Apromore-Custom-Plugins:Similarity-Search-Portal-Plugin')
runtime project(':Apromore-Custom-Plugins:Process-Discoverer-Portal-Plugin')
runtimeOnly project(':Apromore-Custom-Plugins:Merge-Logic')
runtimeOnly project(':Apromore-Custom-Plugins:Similarity-Search-Logic')
runtimeOnly project(':Apromore-Custom-Plugins:Process-Discoverer-Logic')
runtimeOnly project(':Apromore-Custom-Plugins:Merge-Portal-Plugin')
runtimeOnly project(':Apromore-Custom-Plugins:Similarity-Search-Portal-Plugin')
runtimeOnly project(':Apromore-Custom-Plugins:Process-Discoverer-Portal-Plugin')



Expand Down
2 changes: 1 addition & 1 deletion Apromore-Frontend/src/loganimation/dataRequester.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default class DataRequester {
this._hasDataRequestError = false;
this._pluginExecutionId = pluginExecutionId;

this._workerProxy = new Worker("../" + 'loganimation2' + "/js/ap/dataRequestWorker.js");
this._workerProxy = new Worker("/zkau/web/" + 'loganimation2' + "/js/ap/dataRequestWorker.js");
let self = this;
this._workerProxy.onmessage = function(e) {
console.log('DataRequester - response received: requestToken=' + e.data.requestToken);
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
classpath "org.springframework.boot:spring-boot-gradle-plugin:2.4.4"
classpath "io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE"
classpath "com.gorylenko.gradle-git-properties:gradle-git-properties:2.3.1-rc1"
classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0"
classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.16.1"
}
}

Expand Down Expand Up @@ -50,7 +50,7 @@ subprojects {
}

maven {
url = uri('http://repository.springsource.com/maven/bundles/external')
url = uri('https://repository.springsource.com/maven/bundles/external')
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists