diff --git a/karma-app/README.md b/karma-app/README.md
index 878d72f2f..2ac8fade3 100644
--- a/karma-app/README.md
+++ b/karma-app/README.md
@@ -42,9 +42,9 @@ You can set maximum heap size for karma on the main window. Once you change it,
```
brew doctor
brew update
- brew tap caskroom/cask
- brew cask install xquartz
- brew install wine
+ brew tap homebrew/cask
+ brew install --cask xquartz
+ brew install --cask wine-stable
```
* if building on Linux: `sudo apt-get install wine`
diff --git a/karma-app/build b/karma-app/build
index 73b3ddebe..e366cd5fd 100755
--- a/karma-app/build
+++ b/karma-app/build
@@ -47,39 +47,33 @@ wget https://github.com/alseambusher/karma-app-deps/archive/master.zip
unzip master.zip
mv karma-app-deps-master/*.tar.gz .
rm -rf karma-app-deps-master master.zip
-
# download tomcat binary
-wget http://mirror.cc.columbia.edu/pub/software/apache/tomcat/tomcat-8/v8.5.30/bin/apache-tomcat-8.5.30.zip
+wget https://dlcdn.apache.org/tomcat/tomcat-8/v8.5.72/bin/apache-tomcat-8.5.72.zip
unzip apache-tomcat-*.zip
rm apache-tomcat-*.zip
-
mv apache-tomcat* tomcat
rm -rf tomcat/webapps/*
mv *.war tomcat/webapps
chmod +x tomcat/bin/*.sh
-
cp $CURRENT/conf/* tomcat/conf/
rm -rf $CURRENT/desktop/app/tomcat
mv tomcat $CURRENT/desktop/app/
-
cd $CURRENT/desktop/app/tomcat/webapps
mkdir ROOT
mv ROOT.war ROOT/ROOT.zip
cd ROOT
unzip ROOT.zip
-
cd $CURRENT/desktop
npm install
npm run prerelease
cd app
-
tar -xzvf $CURRENT/target/jre*windows*.tar.gz
electron-packager . --platform=win32 --arch=x64 --icon=../resources/icons/karma.ico --overwrite
rm -rf jre*
tar -xzvf $CURRENT/target/jre*macosx*.tar.gz
-electron-packager . --platform=darwin --arch=x64 --icon=../resources/icons/karma.icns --overwrite
+electron-packager . --platform=darwin --arch=x64 --icon=../resources/icons/karma.icns --overwrite
rm -rf jre*
tar -xzvf $CURRENT/target/jre*linux*.tar.gz
electron-packager . --platform=linux --arch=x64 --icon=../resources/icons/karma.png --overwrite
@@ -88,13 +82,11 @@ rm -rf jre*
cp -rf Karma-darwin* $CURRENT/target/Karma-Mac
cp -rf Karma-linux* $CURRENT/target/Karma-Linux
cp -rf Karma-win* $CURRENT/target/Karma-Windows
-
set +e
rm -rf Karma-*
cd $CURRENT/target
rm *.tar.gz
-
set -e
#put our license
for build_folder in `ls |grep Karma`
@@ -102,7 +94,6 @@ do
mv $build_folder/LICENSE $build_folder/LICENSE.electron.packager
cp $CURRENT/../LICENSE.txt $build_folder/
done
-
if [ "$1" == "--archive" ]
then
for i in `ls |grep 'Karma-*'`
diff --git a/karma-app/desktop/app/app.html b/karma-app/desktop/app/app.html
index e6d139d64..227910704 100644
--- a/karma-app/desktop/app/app.html
+++ b/karma-app/desktop/app/app.html
@@ -5,8 +5,7 @@
Karma
-
-
+
diff --git a/karma-app/desktop/package.json b/karma-app/desktop/package.json
index d421d535c..6fc69d9cf 100644
--- a/karma-app/desktop/package.json
+++ b/karma-app/desktop/package.json
@@ -30,11 +30,11 @@
},
"devDependencies": {
"chai": "^3.5.0",
- "electron": "10.2.0",
+ "electron": "11.5.0",
"electron-builder": "^5.12.1",
"electron-mocha": "^3.0.0",
"fs-jetpack": "^0.9.0",
- "gulp": "^3.9.0",
+ "gulp": "^4.0.2",
"gulp-batch": "^1.0.5",
"gulp-less": "^3.0.3",
"gulp-plumber": "^1.1.0",
diff --git a/karma-app/desktop/src/background.js b/karma-app/desktop/src/background.js
index 52748a6ea..f7e63cf66 100644
--- a/karma-app/desktop/src/background.js
+++ b/karma-app/desktop/src/background.js
@@ -39,7 +39,11 @@ app.on('ready', function () {
var mainWindow = createWindow('main', {
width: 1000,
- height: 600
+ height: 600,
+ webPreferences: {
+ nodeIntegration: true,
+ enableRemoteModule: true
+ },
});
mainWindow.loadURL('file://' + __dirname + '/app.html');
diff --git a/karma-web/pom.xml b/karma-web/pom.xml
index 80c8d20e1..feff2fb9c 100644
--- a/karma-web/pom.xml
+++ b/karma-web/pom.xml
@@ -1,36 +1,36 @@
- 4.0.0
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 4.0.0
war
-
- edu.isi
- karma-common-web
- 0.0.1-SNAPSHOT
- ../karma-common-web
-
+
+ edu.isi
+ karma-common-web
+ 0.0.1-SNAPSHOT
+ ../karma-common-web
+
- karma-web
+ karma-web
-
-
+
+
org.apache.commons
commons-lang3
-
+
de.micromata.jak
JavaAPIforKml
-
+
-
+
@@ -80,104 +80,99 @@
-
+
-
-
- tomcat-deploy
-
-
-
-
-
- org.codehaus.mojo
- tomcat-maven-plugin
-
- -XX:MaxPermSize=128m
- TomcatServer
- /
- http://localhost:8080/manager/text
- true
-
-
-
-
- cleaningService
- package
+
+
+ tomcat-deploy
+
+
+
+
+
+ org.codehaus.mojo
+ tomcat-maven-plugin
+
+ -XX:MaxPermSize=128m
+ TomcatServer
+ /
+ http://localhost:8080/manager/text
+ true
+
+
+
+
+ cleaningService
+ package
deploy
-
- TomcatServer
- /cleaningService
- http://localhost:8080/manager/text
- ${project.basedir}/external_webapps/cleaningService.war
- true
-
-
-
- clusterService
- package
+
+ TomcatServer
+ /cleaningService
+ http://localhost:8080/manager/text
+ ${project.basedir}/external_webapps/cleaningService.war
+ true
+
+
+
+ clusterService
+ package
deploy
-
- TomcatServer
- /clusterService
- http://localhost:8080/manager/text
- ${project.basedir}/external_webapps/cluster-1.0.war
- true
-
-
-
- openrdfworkbench
- package
+
+ TomcatServer
+ /clusterService
+ http://localhost:8080/manager/text
+ ${project.basedir}/external_webapps/cluster-1.0.war
+ true
+
+
+
+ openrdfworkbench
+ package
deploy
-
- TomcatServer
- /openrdf-workbench
- http://localhost:8080/manager/text
- ${project.basedir}/external_webapps/openrdf-workbench.war
- true
-
-
-
- openrdfsesame
- package
+
+ TomcatServer
+ /openrdf-workbench
+ http://localhost:8080/manager/text
+ ${project.basedir}/external_webapps/openrdf-workbench.war
+ true
+
+
+
+ openrdfsesame
+ package
deploy
-
- TomcatServer
- /openrdf-sesame
- http://localhost:8080/manager/text
- ${project.basedir}/external_webapps/openrdf-sesame.war
- true
-
-
-
-
-
-
-
-
-
-
+
+ TomcatServer
+ /openrdf-sesame
+ http://localhost:8080/manager/text
+ ${project.basedir}/external_webapps/openrdf-sesame.war
+ true
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/karma-web/src/main/webapp/uiLibs/less/css/styles-03d-fixed-pixel.less b/karma-web/src/main/webapp/uiLibs/less/css/styles-03d-fixed-pixel.less
index f48754b98..38d43abb3 100644
--- a/karma-web/src/main/webapp/uiLibs/less/css/styles-03d-fixed-pixel.less
+++ b/karma-web/src/main/webapp/uiLibs/less/css/styles-03d-fixed-pixel.less
@@ -306,7 +306,7 @@ body
{
border-left-color: @table-even-vertical-grid-border-color; //@color-even-dark;
}
-.wk-row-even:first-child,
+.wk-row-even:first-child
{
border-top-color: @color-even-dark;
}
diff --git a/pom.xml b/pom.xml
index 8029866ae..858c5061f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
true
- 9.4.41.v20210516
+ 9.4.43.v20210629
UTF-8
@@ -268,25 +268,25 @@
antlr
${antlr.version}
-
- org.jdom
- jdom
- ${jdom.version}
-
-
- maven-cobertura-plugin
- maven-plugins
-
-
- maven-findbugs-plugin
- maven-plugins
-
-
- com.ibm.icu
- icu4j
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
com.ibm.icu
icu4j
@@ -505,7 +505,7 @@
java
-
+