From 9d2e32a28dd0ab37bfc8f9a3da17a68b755b299d Mon Sep 17 00:00:00 2001
From: David Georg Reichelt <davidgeorg_reichelt@dagere.de>
Date: Thu, 23 Jun 2022 20:25:37 +0200
Subject: [PATCH] Fix Kieker download: Switch to 2.0.0-SNAPSHOT and asure the
first snapshot is used if two snapshots are available
---
frameworks/Kieker/config | 2 +-
frameworks/common-functions.sh | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/frameworks/Kieker/config b/frameworks/Kieker/config
index 5ed8d82..0ac4c6e 100644
--- a/frameworks/Kieker/config
+++ b/frameworks/Kieker/config
@@ -7,7 +7,7 @@ JAVA_BIN="java"
RSCRIPT_PATH="../stats.csv.r"
DATA_DIR="${BASE_DIR}/data"
-AGENT="${BASE_DIR}/kieker-1.15-SNAPSHOT-aspectj.jar"
+AGENT="${BASE_DIR}/kieker-2.0.0-SNAPSHOT-aspectj.jar"
BATCH_MODE="yes"
diff --git a/frameworks/common-functions.sh b/frameworks/common-functions.sh
index 6193880..66b0d00 100644
--- a/frameworks/common-functions.sh
+++ b/frameworks/common-functions.sh
@@ -25,9 +25,15 @@ function getKiekerAgent() {
if [ ! -f $AGENT ]
then
# get agent
- export VERSION_PATH=`curl "https://oss.sonatype.org/service/local/repositories/snapshots/content/net/kieker-monitoring/kieker/" | grep '<resourceURI>' | sed 's/ *<resourceURI>//g' | sed 's/<\/resourceURI>//g' | grep '/$'`
+ export VERSION_PATH=`curl "https://oss.sonatype.org/service/local/repositories/snapshots/content/net/kieker-monitoring/kieker/" | grep '<resourceURI>' | sed 's/ *<resourceURI>//g' | sed 's/<\/resourceURI>//g' | grep '/$' | grep -v ".xml" | head -n 1`
export AGENT_PATH=`curl "${VERSION_PATH}" | grep 'aspectj.jar</resourceURI' | sort | sed 's/ *<resourceURI>//g' | sed 's/<\/resourceURI>//g' | tail -1`
curl "${AGENT_PATH}" > "${AGENT}"
+
+ if [ ! -f $AGENT ] | [ -s $AGENT ]
+ then
+ echo "Kieker download from $AGENT_PATH failed; please asure that a correct Kieker AspectJ file is present!"
+ fi
+
fi
}
--
GitLab