From 46ff99850ff526a61bea69765a8006e3c3bfc9af Mon Sep 17 00:00:00 2001 From: farshad68 Date: Wed, 26 Mar 2025 14:56:58 +0100 Subject: [PATCH 1/3] make version SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7578ce7..6332bca 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 4.0.0 org.hobbit evaluation-storage - 1.0.9 + 1.0.9-SNAPSHOT From 8847eed575c6832cf646d16b9e5ce1df107ae443 Mon Sep 17 00:00:00 2001 From: farshad68 Date: Wed, 26 Mar 2025 15:18:53 +0100 Subject: [PATCH 2/3] increase to version 1.0.10-SNAPSHOT --- Makefile | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a26109b..5f7af0f 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,8 @@ build: mvn clean package -U -Dmaven.test.skip=true dockerize: - docker build -t hobbitproject/defaultevaluationstorage:1.0.9 . + docker build -t hobbitproject/defaultevaluationstorage:1.0.10-SNAPSHOT . push: - docker tag hobbitproject/defaultevaluationstorage:1.0.9 hobbitproject/defaultevaluationstorage:latest + docker tag hobbitproject/defaultevaluationstorage:1.0.10-SNAPSHOT hobbitproject/defaultevaluationstorage:latest docker push hobbitproject/defaultevaluationstorage diff --git a/pom.xml b/pom.xml index 6332bca..282c599 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ 4.0.0 org.hobbit evaluation-storage - 1.0.9-SNAPSHOT + 1.0.10-SNAPSHOT From 0b094f5e1a8f7a727955ab9c749ebf41e617895d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20R=C3=B6der?= Date: Wed, 26 Mar 2025 15:21:38 +0100 Subject: [PATCH 3/3] Fixed logging issues. --- Dockerfile | 2 +- adjust-logging.sh | 0 pom.xml | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) mode change 100755 => 100644 adjust-logging.sh diff --git a/Dockerfile b/Dockerfile index 93308ee..2b44f59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ ADD adjust-logging.sh /evalrun/adjust-logging.sh WORKDIR /evalrun -CMD adjust-logging.sh && java -cp evaluation-storage.jar:. org.hobbit.core.run.ComponentStarter org.hobbit.evaluationstorage.EvaluationStorage +CMD sh adjust-logging.sh && java -cp evaluation-storage.jar:. org.hobbit.core.run.ComponentStarter org.hobbit.evaluationstorage.EvaluationStorage diff --git a/adjust-logging.sh b/adjust-logging.sh old mode 100755 new mode 100644 diff --git a/pom.xml b/pom.xml index 2a3f079..55e74c0 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,22 @@ commons-collections4 4.1 + + + + + org.slf4j + slf4j-api + 1.7.15 + + + + org.slf4j + slf4j-log4j12 + 1.7.15 + + junit