From a43cf6058b99adc950ae638337fb17cbbdb62524 Mon Sep 17 00:00:00 2001 From: Kolea PLESCO Date: Tue, 9 Apr 2024 10:52:15 +0300 Subject: [PATCH] updates xpath validator --- Makefile | 6 +++--- infra/airflow-cluster/Dockerfile | 4 ++-- infra/airflow-cluster/docker-compose-worker.yaml | 2 +- infra/airflow-cluster/docker-compose.yaml | 2 +- infra/airflow/Dockerfile | 4 ++-- infra/airflow/docker-compose.yaml | 2 +- infra/aws/airflow.yml | 10 +++++----- infra/aws/worker.yml | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 440654d68..62913e4ce 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ ENV_FILE := .env PROJECT_PATH = $(shell pwd) AIRFLOW_INFRA_FOLDER ?= ${PROJECT_PATH}/.airflow RML_MAPPER_PATH = ${PROJECT_PATH}/.rmlmapper/rmlmapper.jar -XML_PROCESSOR_PATH = ${PROJECT_PATH}/.saxon/saxon-he-10.6.jar +XML_PROCESSOR_PATH = ${PROJECT_PATH}/.saxon/saxon-he-10.9.jar LIMES_ALIGNMENT_PATH = $(PROJECT_PATH)/.limes/limes.jar HOSTNAME = $(shell hostname) CAROOT = $(shell pwd)/infra/traefik/certs @@ -222,8 +222,8 @@ init-limes: init-saxon: @ echo -e "$(BUILD_PRINT)Saxon folder initialization $(END_BUILD_PRINT)" - @ wget -c https://kumisystems.dl.sourceforge.net/project/saxon/Saxon-HE/10/Java/SaxonHE10-6J.zip -P .saxon/ - @ cd .saxon && unzip SaxonHE10-6J.zip && rm -rf SaxonHE10-6J.zip + @ wget -c https://github.com/Saxonica/Saxon-HE/releases/download/SaxonHE10-9/SaxonHE10-9J.zip -P .saxon/ + @ cd .saxon && unzip SaxonHE10-9J.zip && rm -rf SaxonHE10-9J.zip start-project-services: | start-airflow start-mongo init-rml-mapper init-limes start-allegro-graph start-metabase stop-project-services: | stop-airflow stop-mongo stop-allegro-graph stop-metabase diff --git a/infra/airflow-cluster/Dockerfile b/infra/airflow-cluster/Dockerfile index 90cd6323e..f572786a5 100644 --- a/infra/airflow-cluster/Dockerfile +++ b/infra/airflow-cluster/Dockerfile @@ -18,8 +18,8 @@ RUN mkdir -p ./.rmlmapper RUN wget -c https://github.com/RMLio/rmlmapper-java/releases/download/v6.2.2/rmlmapper-6.2.2-r371-all.jar -O ./.rmlmapper/rmlmapper.jar -RUN wget -c https://kumisystems.dl.sourceforge.net/project/saxon/Saxon-HE/10/Java/SaxonHE10-6J.zip -P .saxon/ -RUN cd .saxon && unzip SaxonHE10-6J.zip && rm -rf SaxonHE10-6J.zip +RUN wget -c https://kumisystems.dl.sourceforge.net/project/saxon/Saxon-HE/10/Java/SaxonHE10-9J.zip -P .saxon/ +RUN cd .saxon && unzip SaxonHE10-9J.zip && rm -rf SaxonHE10-9J.zip RUN mkdir -p ./.limes diff --git a/infra/airflow-cluster/docker-compose-worker.yaml b/infra/airflow-cluster/docker-compose-worker.yaml index f394e54d7..070c5c6b9 100644 --- a/infra/airflow-cluster/docker-compose-worker.yaml +++ b/infra/airflow-cluster/docker-compose-worker.yaml @@ -76,7 +76,7 @@ x-airflow-common: PYTHONPATH: /opt/airflow/ AIRFLOW_HOME: /opt/airflow RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar - XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar + XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar DAG_LOGGER_CONFIG_HANDLERS: ${DAG_LOGGER_CONFIG_HANDLERS} volumes: diff --git a/infra/airflow-cluster/docker-compose.yaml b/infra/airflow-cluster/docker-compose.yaml index 8b134a72d..cc0c7e942 100644 --- a/infra/airflow-cluster/docker-compose.yaml +++ b/infra/airflow-cluster/docker-compose.yaml @@ -78,7 +78,7 @@ x-airflow-common: PYTHONPATH: /opt/airflow/ AIRFLOW_HOME: /opt/airflow RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar - XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar + XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar DAG_LOGGER_CONFIG_HANDLERS: ${DAG_LOGGER_CONFIG_HANDLERS} volumes: diff --git a/infra/airflow/Dockerfile b/infra/airflow/Dockerfile index 076f48713..409c94dcf 100644 --- a/infra/airflow/Dockerfile +++ b/infra/airflow/Dockerfile @@ -18,8 +18,8 @@ RUN mkdir -p ./.rmlmapper ./dags ./ted_sws ./temp RUN wget -c https://github.com/RMLio/rmlmapper-java/releases/download/v6.2.2/rmlmapper-6.2.2-r371-all.jar -O ./.rmlmapper/rmlmapper.jar -RUN wget -c https://kumisystems.dl.sourceforge.net/project/saxon/Saxon-HE/10/Java/SaxonHE10-6J.zip -P .saxon/ -RUN cd .saxon && unzip SaxonHE10-6J.zip && rm -rf SaxonHE10-6J.zip +RUN wget -c https://kumisystems.dl.sourceforge.net/project/saxon/Saxon-HE/10/Java/SaxonHE10-9J.zip -P .saxon/ +RUN cd .saxon && unzip SaxonHE10-9J.zip && rm -rf SaxonHE10-9J.zip RUN mkdir -p ./.limes RUN wget -c https://github.com/dice-group/LIMES/releases/download/1.7.9/limes.jar -P ./.limes diff --git a/infra/airflow/docker-compose.yaml b/infra/airflow/docker-compose.yaml index e196b4078..026e4bd98 100644 --- a/infra/airflow/docker-compose.yaml +++ b/infra/airflow/docker-compose.yaml @@ -68,7 +68,7 @@ x-airflow-common: PYTHONPATH: /opt/airflow/ AIRFLOW_HOME: /opt/airflow RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar - XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar + XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar DAG_LOGGER_CONFIG_HANDLERS: ${DAG_LOGGER_CONFIG_HANDLERS} volumes: diff --git a/infra/aws/airflow.yml b/infra/aws/airflow.yml index e7e4f5b43..d7db49d2c 100644 --- a/infra/aws/airflow.yml +++ b/infra/aws/airflow.yml @@ -32,7 +32,7 @@ services: PYTHONPATH: /opt/airflow/ LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar - XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar + XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar AIRFLOW_UID: ${AIRFLOW_UID} image: ${AIRFLOW_IMAGE_URI} logging: @@ -77,7 +77,7 @@ services: PYTHONPATH: /opt/airflow/ LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar - XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar + XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar healthcheck: test: ["CMD-SHELL", 'airflow jobs check --job-type SchedulerJob --hostname "$${HOSTNAME}"'] interval: 10s @@ -125,7 +125,7 @@ services: PYTHONPATH: /opt/airflow/ LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar - XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar + XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar image: ${AIRFLOW_IMAGE_URI} logging: driver: awslogs @@ -168,7 +168,7 @@ services: PYTHONPATH: /opt/airflow/ LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar - XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar + XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar image: ${AIRFLOW_IMAGE_URI} logging: driver: awslogs @@ -215,7 +215,7 @@ services: PYTHONPATH: /opt/airflow/ LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar - XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar + XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar image: ${AIRFLOW_IMAGE_URI} labels: ecs-local.task-definition-input.type: remote diff --git a/infra/aws/worker.yml b/infra/aws/worker.yml index c9a8a865b..28b4b39f4 100644 --- a/infra/aws/worker.yml +++ b/infra/aws/worker.yml @@ -28,7 +28,7 @@ services: PYTHONPATH: /opt/airflow/ LIMES_ALIGNMENT_PATH: /opt/airflow/.limes/limes.jar RML_MAPPER_PATH: /opt/airflow/.rmlmapper/rmlmapper.jar - XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.6.jar + XML_PROCESSOR_PATH: /opt/airflow/.saxon/saxon-he-10.9.jar image: ${AIRFLOW_IMAGE_URI} # hostname: "worker1" ports: