Merge pull request #1179 from apromore/task-AP-4439

Upgrade gradle and minor js changes

Apromore-Core-Components/Apromore-Portal/build.gradle

@@ -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')

Apromore-Core-Components/Apromore-Portal/src/main/java/org/apromore/portal/dialogController/LoginController.java

@@ -111,7 +111,6 @@ private void setupLocale() {
     I18nSession i18nSession = new I18nSession(i18nConfig);
     UserSessionManager.setCurrentI18nSession(i18nSession);
     i18nSession.applyLocaleFromClient();
-    LabelUtils.reloadLabels();
   }
 
   @Override

Apromore-Custom-Plugins/Log-Animation-Portal-Plugin/build.gradle

@@ -18,3 +18,8 @@ dependencies {
 
 
 }
+
+jar {
+
+    archiveBaseName='log-animation-ce'
+}

Apromore-Custom-Plugins/build.gradle

@@ -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')
 
 
 

Apromore-Frontend/src/loganimation/dataRequester.js

@@ -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);

build.gradle

@@ -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"
 	}
 }
 
@@ -50,7 +50,7 @@ subprojects {
 		}
 
 		maven {
-			url = uri('http://repository.springsource.com/maven/bundles/external')
+			url = uri('https://repository.springsource.com/maven/bundles/external')
 		}
 	}
 

gradle/wrapper/gradle-wrapper.properties

@@ -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