From c4c4ed7546dc2f238136d2a4bbefc8dba4bd2d2d Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 15 Mar 2023 13:37:20 +0000 Subject: [PATCH 01/47] fix: upgrade @babel/core from 7.20.12 to 7.21.0 Snyk has created this PR to upgrade @babel/core from 7.20.12 to 7.21.0. See this package in npm: https://www.npmjs.com/package/@babel/core See this project in Snyk: https://app.snyk.io/org/anbo-de/project/ecfffb51-80a4-4ded-82da-25622cd9d89d?utm_source=github&utm_medium=referral&page=upgrade-pr --- .../package-lock.json | 248 ++++++++++-------- qanary-configuration-frontend/package.json | 4 +- 2 files changed, 144 insertions(+), 108 deletions(-) diff --git a/qanary-configuration-frontend/package-lock.json b/qanary-configuration-frontend/package-lock.json index 29dfc1d8..0025c584 100644 --- a/qanary-configuration-frontend/package-lock.json +++ b/qanary-configuration-frontend/package-lock.json @@ -17,7 +17,7 @@ "react-scripts": "^5.0.1" }, "devDependencies": { - "@babel/core": "^7.20.12", + "@babel/core": "^7.21.0", "axios": "^0.21.2" } }, @@ -27,10 +27,24 @@ "integrity": "sha512-+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g==" }, "node_modules/@ampproject/remapping": { - "version": "2.1.1", - "license": "Apache-2.0", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", + "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", "dependencies": { - "@jridgewell/trace-mapping": "^0.3.0" + "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@ampproject/remapping/node_modules/@jridgewell/gen-mapping": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", + "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "dependencies": { + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10" }, "engines": { "node": ">=6.0.0" @@ -56,20 +70,20 @@ } }, "node_modules/@babel/core": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", - "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz", + "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==", "dependencies": { - "@ampproject/remapping": "^2.1.0", + "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", + "@babel/generator": "^7.21.0", "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helpers": "^7.20.7", - "@babel/parser": "^7.20.7", + "@babel/helper-module-transforms": "^7.21.0", + "@babel/helpers": "^7.21.0", + "@babel/parser": "^7.21.0", "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.12", - "@babel/types": "^7.20.7", + "@babel/traverse": "^7.21.0", + "@babel/types": "^7.21.0", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -110,12 +124,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz", - "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==", + "version": "7.21.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz", + "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==", "dependencies": { - "@babel/types": "^7.20.7", + "@babel/types": "^7.21.3", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" }, "engines": { @@ -248,12 +263,12 @@ } }, "node_modules/@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz", + "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==", "dependencies": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" + "@babel/template": "^7.20.7", + "@babel/types": "^7.21.0" }, "engines": { "node": ">=6.9.0" @@ -293,9 +308,9 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", - "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", + "version": "7.21.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz", + "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==", "dependencies": { "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-module-imports": "^7.18.6", @@ -303,8 +318,8 @@ "@babel/helper-split-export-declaration": "^7.18.6", "@babel/helper-validator-identifier": "^7.19.1", "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.10", - "@babel/types": "^7.20.7" + "@babel/traverse": "^7.21.2", + "@babel/types": "^7.21.2" }, "engines": { "node": ">=6.9.0" @@ -430,13 +445,13 @@ } }, "node_modules/@babel/helpers": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz", - "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==", + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz", + "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==", "dependencies": { "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.13", - "@babel/types": "^7.20.7" + "@babel/traverse": "^7.21.0", + "@babel/types": "^7.21.0" }, "engines": { "node": ">=6.9.0" @@ -456,9 +471,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.13.tgz", - "integrity": "sha512-gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw==", + "version": "7.21.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz", + "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==", "bin": { "parser": "bin/babel-parser.js" }, @@ -1772,18 +1787,18 @@ } }, "node_modules/@babel/traverse": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz", - "integrity": "sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==", + "version": "7.21.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz", + "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==", "dependencies": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", + "@babel/generator": "^7.21.3", "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", + "@babel/helper-function-name": "^7.21.0", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.13", - "@babel/types": "^7.20.7", + "@babel/parser": "^7.21.3", + "@babel/types": "^7.21.3", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1792,9 +1807,9 @@ } }, "node_modules/@babel/types": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", - "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", + "version": "7.21.3", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz", + "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==", "dependencies": { "@babel/helper-string-parser": "^7.19.4", "@babel/helper-validator-identifier": "^7.19.1", @@ -2636,8 +2651,9 @@ } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.0.5", - "license": "MIT", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", "engines": { "node": ">=6.0.0" } @@ -2660,16 +2676,17 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.11", - "license": "MIT" + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", - "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "version": "0.3.17", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", + "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" } }, "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": { @@ -16574,9 +16591,23 @@ "integrity": "sha512-+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g==" }, "@ampproject/remapping": { - "version": "2.1.1", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", + "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==", "requires": { - "@jridgewell/trace-mapping": "^0.3.0" + "@jridgewell/gen-mapping": "^0.1.0", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "dependencies": { + "@jridgewell/gen-mapping": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz", + "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==", + "requires": { + "@jridgewell/set-array": "^1.0.0", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + } } }, "@babel/code-frame": { @@ -16593,20 +16624,20 @@ "integrity": "sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==" }, "@babel/core": { - "version": "7.20.12", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", - "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz", + "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==", "requires": { - "@ampproject/remapping": "^2.1.0", + "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", + "@babel/generator": "^7.21.0", "@babel/helper-compilation-targets": "^7.20.7", - "@babel/helper-module-transforms": "^7.20.11", - "@babel/helpers": "^7.20.7", - "@babel/parser": "^7.20.7", + "@babel/helper-module-transforms": "^7.21.0", + "@babel/helpers": "^7.21.0", + "@babel/parser": "^7.21.0", "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.12", - "@babel/types": "^7.20.7", + "@babel/traverse": "^7.21.0", + "@babel/types": "^7.21.0", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -16632,12 +16663,13 @@ } }, "@babel/generator": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.7.tgz", - "integrity": "sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==", + "version": "7.21.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz", + "integrity": "sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA==", "requires": { - "@babel/types": "^7.20.7", + "@babel/types": "^7.21.3", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" } }, @@ -16736,12 +16768,12 @@ } }, "@babel/helper-function-name": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz", - "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==", + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz", + "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==", "requires": { - "@babel/template": "^7.18.10", - "@babel/types": "^7.19.0" + "@babel/template": "^7.20.7", + "@babel/types": "^7.21.0" } }, "@babel/helper-hoist-variables": { @@ -16769,9 +16801,9 @@ } }, "@babel/helper-module-transforms": { - "version": "7.20.11", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", - "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", + "version": "7.21.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz", + "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==", "requires": { "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-module-imports": "^7.18.6", @@ -16779,8 +16811,8 @@ "@babel/helper-split-export-declaration": "^7.18.6", "@babel/helper-validator-identifier": "^7.19.1", "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.10", - "@babel/types": "^7.20.7" + "@babel/traverse": "^7.21.2", + "@babel/types": "^7.21.2" } }, "@babel/helper-optimise-call-expression": { @@ -16870,13 +16902,13 @@ } }, "@babel/helpers": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz", - "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==", + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz", + "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==", "requires": { "@babel/template": "^7.20.7", - "@babel/traverse": "^7.20.13", - "@babel/types": "^7.20.7" + "@babel/traverse": "^7.21.0", + "@babel/types": "^7.21.0" } }, "@babel/highlight": { @@ -16890,9 +16922,9 @@ } }, "@babel/parser": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.13.tgz", - "integrity": "sha512-gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw==" + "version": "7.21.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz", + "integrity": "sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ==" }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { "version": "7.16.7", @@ -17740,26 +17772,26 @@ } }, "@babel/traverse": { - "version": "7.20.13", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz", - "integrity": "sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==", + "version": "7.21.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz", + "integrity": "sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ==", "requires": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.7", + "@babel/generator": "^7.21.3", "@babel/helper-environment-visitor": "^7.18.9", - "@babel/helper-function-name": "^7.19.0", + "@babel/helper-function-name": "^7.21.0", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.13", - "@babel/types": "^7.20.7", + "@babel/parser": "^7.21.3", + "@babel/types": "^7.21.3", "debug": "^4.1.0", "globals": "^11.1.0" } }, "@babel/types": { - "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", - "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", + "version": "7.21.3", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz", + "integrity": "sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg==", "requires": { "@babel/helper-string-parser": "^7.19.4", "@babel/helper-validator-identifier": "^7.19.1", @@ -18370,7 +18402,9 @@ } }, "@jridgewell/resolve-uri": { - "version": "3.0.5" + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" }, "@jridgewell/set-array": { "version": "1.1.2", @@ -18387,15 +18421,17 @@ } }, "@jridgewell/sourcemap-codec": { - "version": "1.4.11" + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==" }, "@jridgewell/trace-mapping": { - "version": "0.3.14", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz", - "integrity": "sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==", + "version": "0.3.17", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", + "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" } }, "@nicolo-ribaudo/eslint-scope-5-internals": { diff --git a/qanary-configuration-frontend/package.json b/qanary-configuration-frontend/package.json index 08997fb8..154c0350 100644 --- a/qanary-configuration-frontend/package.json +++ b/qanary-configuration-frontend/package.json @@ -3,7 +3,7 @@ "version": "1.0.3", "private": true, "dependencies": { - "@babel/core": "7.20.12", + "@babel/core": "7.21.0", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^12.1.2", "@testing-library/user-event": "^7.2.1", @@ -34,7 +34,7 @@ ] }, "devDependencies": { - "@babel/core": "7.20.12", + "@babel/core": "7.21.0", "axios": "^0.21.2" } } From 2d3c758968ad4515252e15486517b9e6339bc205 Mon Sep 17 00:00:00 2001 From: heinpa Date: Tue, 4 Apr 2023 16:51:36 +0200 Subject: [PATCH 02/47] reactivate Qanary pipeline gerbil-execute endpoint --- qanary_commons/pom.xml | 4 ++-- .../eu/wdaqua/qanary/commons/QanaryQuestion.java | 12 +++++++----- qanary_pipeline-template/pom.xml | 2 +- .../eu/wdaqua/qanary/web/QanaryGerbilController.java | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/qanary_commons/pom.xml b/qanary_commons/pom.xml index 3b74371d..96de99f0 100644 --- a/qanary_commons/pom.xml +++ b/qanary_commons/pom.xml @@ -2,7 +2,7 @@ 4.0.0 eu.wdaqua.qanary qa.commons - 3.7.1 + 3.8.0 org.springframework.boot spring-boot-starter-parent @@ -299,4 +299,4 @@ - \ No newline at end of file + diff --git a/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java b/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java index 76945ddf..dfe1d5f7 100644 --- a/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java +++ b/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java @@ -603,21 +603,23 @@ public String getJsonResult() throws SparqlQueryFailed { + " ?a a qa:AnnotationOfAnswerJson . " // + " ?a oa:hasBody ?answer . " // + " ?answer rdf:value ?json . " // -// + " ?a a qa:AnnotationOfAnswerJSON . " // -// + " ?a oa:hasBody ?json " // -// TODO: this should be body of AnswerJson with rdf:value answer + "}"; logger.debug("getJsonResult: SELECT using:\n{}", sparql); ResultSet resultset = this.getQanaryTripleStoreConnector().select(sparql); - // the default value has to be null to distinguish missing values from empty values + // OLD: the default value has to be null to distinguish missing values from empty values + // NEW: returning null would result in "null" being part of the response JSON, + // return an empty string instead. + // This way, a distinction is still possible: + // missing values: "" + // empty values: [] String sparqlAnnotation = null; while (resultset.hasNext()) { sparqlAnnotation = resultset.next().get("json").asLiteral().toString(); } if (sparqlAnnotation == null) { - return sparqlAnnotation; + return ""; } else { return sparqlAnnotation.replace("\\\"", "\""); } diff --git a/qanary_pipeline-template/pom.xml b/qanary_pipeline-template/pom.xml index 3f7e81f1..cbe7a112 100644 --- a/qanary_pipeline-template/pom.xml +++ b/qanary_pipeline-template/pom.xml @@ -5,7 +5,7 @@ 4.0.0 qa.pipeline eu.wdaqua.qanary - 3.7.3 + 3.8.0 org.springframework.boot spring-boot-starter-parent diff --git a/qanary_pipeline-template/src/main/java/eu/wdaqua/qanary/web/QanaryGerbilController.java b/qanary_pipeline-template/src/main/java/eu/wdaqua/qanary/web/QanaryGerbilController.java index 08e7a145..fe1b70a9 100644 --- a/qanary_pipeline-template/src/main/java/eu/wdaqua/qanary/web/QanaryGerbilController.java +++ b/qanary_pipeline-template/src/main/java/eu/wdaqua/qanary/web/QanaryGerbilController.java @@ -198,7 +198,7 @@ public ResponseEntity gerbil( } String questionText = myQanaryQuestion.getTextualRepresentation(); String sparqlQueryString = myQanaryQuestion.getSparqlResult(); // returns empty String if no Query was found - String jsonAnswerString = "{}"; // TODO: myQanaryQuestion.getJsonResult(); // returns empty String if no answer was found + String jsonAnswerString = myQanaryQuestion.getJsonResult(); GerbilExecuteResponse obj = new GerbilExecuteResponse(Jackson2ObjectMapperBuilder.json().build(), // questionText, language, sparqlQueryString, jsonAnswerString); From f433f1198664800a09625eae9b6e64228f8219b5 Mon Sep 17 00:00:00 2001 From: heinpa Date: Tue, 9 May 2023 20:12:57 +0200 Subject: [PATCH 03/47] catch NullPointerException for no response --- .../java/eu/wdaqua/qanary/commons/QanaryQuestion.java | 4 ++-- .../wdaqua/qanary/web/messages/GerbilExecuteResponse.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java b/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java index dfe1d5f7..fedd8a20 100644 --- a/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java +++ b/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java @@ -582,11 +582,11 @@ public class SparqlAnnotation { } public String getSparqlResult() throws SparqlQueryFailed { - // added try and catch to prevent indexOutOfBoundsException, returns empty String if no Query was found + // added try and catch to prevent indexOutOfBoundsException and NullPointerException, returns empty String if no Query was found String sparqlResult = ""; try { sparqlResult = this.getSparqlResults().get(0).query; - } catch (IndexOutOfBoundsException e) { + } catch (IndexOutOfBoundsException | NullPointerException e) { logger.warn("No SPARQL Query found, index out of bounds"); } return sparqlResult; diff --git a/qanary_pipeline-template/src/main/java/eu/wdaqua/qanary/web/messages/GerbilExecuteResponse.java b/qanary_pipeline-template/src/main/java/eu/wdaqua/qanary/web/messages/GerbilExecuteResponse.java index a6af1481..e9785cb7 100644 --- a/qanary_pipeline-template/src/main/java/eu/wdaqua/qanary/web/messages/GerbilExecuteResponse.java +++ b/qanary_pipeline-template/src/main/java/eu/wdaqua/qanary/web/messages/GerbilExecuteResponse.java @@ -88,12 +88,12 @@ public GerbilExecuteResponse(ObjectMapper objectMapper, String questionText, Str QueryObj queryObj = new QueryObj(sparqlQueryString); - JsonNode answersObj2 = null; + List answersArray = new LinkedList<>(); + //JsonNode answersObj2 = null; if (jsonAnswerString != null && jsonAnswerString.length() > 0) { - answersObj2 = objectMapper.readTree(jsonAnswerString); + JsonNode answersObj2 = objectMapper.readTree(jsonAnswerString); + answersArray.add(answersObj2); } - List answersArray = new LinkedList<>(); - answersArray.add(answersObj2); LinkedList questionsArray = new LinkedList<>(); Question question = new Question(queryObj, answersArray, questionDataArray); From 8bd30bfbd8f9d727ee2b55d38dbd0fd4adec4074 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Mon, 3 Jul 2023 19:09:01 +0000 Subject: [PATCH 04/47] fix: upgrade de.codecentric:spring-boot-admin-starter-client from 2.6.7 to 2.7.10 Snyk has created this PR to upgrade de.codecentric:spring-boot-admin-starter-client from 2.6.7 to 2.7.10. See this package in Maven Repository: https://mvnrepository.com/artifact/de.codecentric/spring-boot-admin-starter-client/ See this project in Snyk: https://app.snyk.io/org/anbo-de/project/fa2494f3-77ea-4f01-adf8-9cae41ab9a6c?utm_source=github&utm_medium=referral&page=upgrade-pr --- qanary_component-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qanary_component-template/pom.xml b/qanary_component-template/pom.xml index 4e85b1f5..6c584b32 100644 --- a/qanary_component-template/pom.xml +++ b/qanary_component-template/pom.xml @@ -14,7 +14,7 @@ 11 - 2.6.7 + 2.7.10 From 679989996f5af160be4d83853258c9e98abc269a Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Mon, 3 Jul 2023 19:41:16 +0000 Subject: [PATCH 05/47] fix: upgrade org.apache.jena:jena-arq from 4.7.0 to 4.8.0 Snyk has created this PR to upgrade org.apache.jena:jena-arq from 4.7.0 to 4.8.0. See this package in Maven Repository: https://mvnrepository.com/artifact/org.apache.jena/jena-arq/ See this project in Snyk: https://app.snyk.io/org/anbo-de/project/058df90d-5302-40f9-adb6-ef041cb23519?utm_source=github&utm_medium=referral&page=upgrade-pr --- qanary_commons/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qanary_commons/pom.xml b/qanary_commons/pom.xml index 500f350b..c68e4841 100644 --- a/qanary_commons/pom.xml +++ b/qanary_commons/pom.xml @@ -13,7 +13,7 @@ 2.7.10 ${java.version} ${java.version} - 4.7.0 + 4.8.0 [8.0.0,9.0.0) 4.4.0 From 7bbc0102e16618f295ebdaa45d622b88bdf8bc1a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 9 Jul 2023 14:51:20 +0000 Subject: [PATCH 06/47] build(deps): bump tough-cookie in /qanary-configuration-frontend Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.0.0 to 4.1.3. - [Release notes](https://github.com/salesforce/tough-cookie/releases) - [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md) - [Commits](https://github.com/salesforce/tough-cookie/compare/v4.0.0...v4.1.3) --- updated-dependencies: - dependency-name: tough-cookie dependency-type: indirect ... Signed-off-by: dependabot[bot] --- .../package-lock.json | 61 ++++++++++++++----- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/qanary-configuration-frontend/package-lock.json b/qanary-configuration-frontend/package-lock.json index 29dfc1d8..5b164ac2 100644 --- a/qanary-configuration-frontend/package-lock.json +++ b/qanary-configuration-frontend/package-lock.json @@ -8,6 +8,7 @@ "name": "qanary-configuration-frontend", "version": "1.0.3", "dependencies": { + "@babel/core": "7.20.12", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^12.1.2", "@testing-library/user-event": "^7.2.1", @@ -17,7 +18,7 @@ "react-scripts": "^5.0.1" }, "devDependencies": { - "@babel/core": "^7.20.12", + "@babel/core": "7.20.12", "axios": "^0.21.2" } }, @@ -13360,6 +13361,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -15236,22 +15242,23 @@ } }, "node_modules/tough-cookie": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", - "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dependencies": { "psl": "^1.1.33", "punycode": "^2.1.1", - "universalify": "^0.1.2" + "universalify": "^0.2.0", + "url-parse": "^1.5.3" }, "engines": { "node": ">=6" } }, "node_modules/tough-cookie/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", "engines": { "node": ">= 4.0.0" } @@ -15526,6 +15533,15 @@ "punycode": "^2.1.0" } }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -25980,6 +25996,11 @@ "side-channel": "^1.0.4" } }, + "querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" + }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -27344,19 +27365,20 @@ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==" }, "tough-cookie": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", - "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "requires": { "psl": "^1.1.33", "punycode": "^2.1.1", - "universalify": "^0.1.2" + "universalify": "^0.2.0", + "url-parse": "^1.5.3" }, "dependencies": { "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==" } } }, @@ -27550,6 +27572,15 @@ "punycode": "^2.1.0" } }, + "url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "requires": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", From 7fe56e93348ee044f16b1b9b3fffe966d8a9299d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 08:10:52 +0000 Subject: [PATCH 07/47] build(deps): bump semver in /qanary-configuration-frontend Bumps [semver](https://github.com/npm/node-semver) from 6.3.0 to 6.3.1. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v6.3.1/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v6.3.0...v6.3.1) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] --- .../package-lock.json | 108 +++++++++--------- 1 file changed, 56 insertions(+), 52 deletions(-) diff --git a/qanary-configuration-frontend/package-lock.json b/qanary-configuration-frontend/package-lock.json index 29dfc1d8..85101e6c 100644 --- a/qanary-configuration-frontend/package-lock.json +++ b/qanary-configuration-frontend/package-lock.json @@ -8,6 +8,7 @@ "name": "qanary-configuration-frontend", "version": "1.0.3", "dependencies": { + "@babel/core": "7.20.12", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^12.1.2", "@testing-library/user-event": "^7.2.1", @@ -17,7 +18,7 @@ "react-scripts": "^5.0.1" }, "devDependencies": { - "@babel/core": "^7.20.12", + "@babel/core": "7.20.12", "axios": "^0.21.2" } }, @@ -3673,9 +3674,9 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -3859,9 +3860,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -3918,9 +3919,9 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -5657,9 +5658,9 @@ } }, "node_modules/css-loader/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -7823,9 +7824,9 @@ } }, "node_modules/fork-ts-checker-webpack-plugin/node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -10483,9 +10484,9 @@ } }, "node_modules/jest-snapshot/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -12581,9 +12582,9 @@ } }, "node_modules/postcss-loader/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -13702,9 +13703,9 @@ } }, "node_modules/react-scripts/node_modules/semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dependencies": { "lru-cache": "^6.0.0" }, @@ -14245,8 +14246,9 @@ } }, "node_modules/semver": { - "version": "6.3.0", - "license": "ISC", + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "bin": { "semver": "bin/semver.js" } @@ -19137,9 +19139,9 @@ } }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } @@ -19233,9 +19235,9 @@ } }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } @@ -19272,9 +19274,9 @@ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } @@ -20593,9 +20595,9 @@ }, "dependencies": { "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } @@ -22163,9 +22165,9 @@ } }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } @@ -24042,9 +24044,9 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" }, "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } @@ -25477,9 +25479,9 @@ }, "dependencies": { "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } @@ -26226,9 +26228,9 @@ }, "dependencies": { "semver": { - "version": "7.3.5", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", - "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "requires": { "lru-cache": "^6.0.0" } @@ -26594,7 +26596,9 @@ } }, "semver": { - "version": "6.3.0" + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" }, "send": { "version": "0.18.0", From d9a84156762401f5005ca27b11e928d310c97c8d Mon Sep 17 00:00:00 2001 From: heinpa Date: Tue, 8 Aug 2023 16:16:28 +0200 Subject: [PATCH 08/47] simplify query to get AnnotationOfAnswerSPARQL --- .../wdaqua/qanary/commons/QanaryQuestion.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java b/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java index fedd8a20..bdbcc2d9 100644 --- a/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java +++ b/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java @@ -545,14 +545,16 @@ public List getSparqlResults() throws SparqlQueryFailed { + " } \n" // + " OPTIONAL { ?a qa:score ?confidence . } \n" // + " OPTIONAL { ?a qa:overKnowledgeGraph ?kb . } \n" // - + " ?a oa:annotatedAt ?time1 . \n" // - + " { \n" // - + " SELECT ?time1 { \n" // - + " ?a a qa:AnnotationOfAnswerSPARQL . \n" // - + " ?a oa:annotatedAt ?time1 . \n" // - + " } \n" // - + " ORDER BY DESC(?time1) \n" // - + " LIMIT 1 \n" // + + " OPTIONAL { \n" // + + " ?a oa:annotatedAt ?time1 . \n" // + + " { \n" // + + " SELECT ?time1 { \n" // + + " ?a a qa:AnnotationOfAnswerSPARQL . \n" // + + " ?a oa:annotatedAt ?time1 . \n" // + + " } \n" // + + " ORDER BY DESC(?time1) \n" // + + " LIMIT 1 \n" // + + " } \n" // + " } \n" // + "} \n" // + "ORDER BY DESC(?score) \n"; From f0b77226745901364c326827672083b64722bb10 Mon Sep 17 00:00:00 2001 From: Paul Heinze Date: Tue, 22 Aug 2023 13:23:40 +0000 Subject: [PATCH 09/47] formatting of sparql query --- .../wdaqua/qanary/commons/QanaryQuestion.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java b/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java index bdbcc2d9..27713361 100644 --- a/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java +++ b/qanary_commons/src/main/java/eu/wdaqua/qanary/commons/QanaryQuestion.java @@ -546,15 +546,15 @@ public List getSparqlResults() throws SparqlQueryFailed { + " OPTIONAL { ?a qa:score ?confidence . } \n" // + " OPTIONAL { ?a qa:overKnowledgeGraph ?kb . } \n" // + " OPTIONAL { \n" // - + " ?a oa:annotatedAt ?time1 . \n" // - + " { \n" // - + " SELECT ?time1 { \n" // - + " ?a a qa:AnnotationOfAnswerSPARQL . \n" // - + " ?a oa:annotatedAt ?time1 . \n" // - + " } \n" // - + " ORDER BY DESC(?time1) \n" // - + " LIMIT 1 \n" // - + " } \n" // + + " ?a oa:annotatedAt ?time1 . \n" // + + " { \n" // + + " SELECT ?time1 { \n" // + + " ?a a qa:AnnotationOfAnswerSPARQL . \n" // + + " ?a oa:annotatedAt ?time1 . \n" // + + " } \n" // + + " ORDER BY DESC(?time1) \n" // + + " LIMIT 1 \n" // + + " } \n" // + " } \n" // + "} \n" // + "ORDER BY DESC(?score) \n"; From ccfcb592603d54d0eda86b9021932edcb5965291 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Thu, 24 Aug 2023 01:32:57 +0000 Subject: [PATCH 10/47] fix: upgrade org.apache.jena:jena-rdfconnection from 4.7.0 to 4.9.0 Snyk has created this PR to upgrade org.apache.jena:jena-rdfconnection from 4.7.0 to 4.9.0. See this package in Maven Repository: https://mvnrepository.com/artifact/org.apache.jena/jena-rdfconnection/ See this project in Snyk: https://app.snyk.io/org/anbo-de/project/058df90d-5302-40f9-adb6-ef041cb23519?utm_source=github&utm_medium=referral&page=upgrade-pr --- qanary_commons/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qanary_commons/pom.xml b/qanary_commons/pom.xml index a46c5deb..9319db76 100644 --- a/qanary_commons/pom.xml +++ b/qanary_commons/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent 2.6.7 - + @@ -15,7 +15,7 @@ 2.7.10 ${java.version} ${java.version} - 4.7.0 + 4.9.0 [8.0.0,9.0.0) 4.4.0 From 3773bb263385ac78b7b3498e1b42ad64284fb36e Mon Sep 17 00:00:00 2001 From: caldoe <60075860+caldoe@users.noreply.github.com> Date: Sat, 26 Aug 2023 14:13:39 +0200 Subject: [PATCH 11/47] Update pipeline auto deployment Update stardog server for auto deployment --- service_config/files/pipeline | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service_config/files/pipeline b/service_config/files/pipeline index 8a1a0093..f2fa33f2 100644 --- a/service_config/files/pipeline +++ b/service_config/files/pipeline @@ -1,6 +1,6 @@ QANARY_PROCESS_ALLOW-ADDITIONAL-TRIPLES=false SERVER_HOST=http://demos.swe.htwk-leipzig.de -STARDOG_URL=https://sd-6845aa75.stardog.cloud:5820 +STARDOG_URL=https://sd-f961e5f7.stardog.cloud:5820 STARDOG_PASSWORD=SECRETS_STARDOG_PASSWORD STARDOG_USERNAME=qanary MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE=* From b109d1dd7bf8422feb05d58e3ee224c3d5a3220b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Aug 2023 03:06:36 +0000 Subject: [PATCH 12/47] build(deps): bump @adobe/css-tools in /qanary-configuration-frontend Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.0.1 to 4.3.1. - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md) - [Commits](https://github.com/adobe/css-tools/commits) --- updated-dependencies: - dependency-name: "@adobe/css-tools" dependency-type: indirect ... Signed-off-by: dependabot[bot] --- qanary-configuration-frontend/package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qanary-configuration-frontend/package-lock.json b/qanary-configuration-frontend/package-lock.json index 0045bd03..d92a74b7 100644 --- a/qanary-configuration-frontend/package-lock.json +++ b/qanary-configuration-frontend/package-lock.json @@ -23,9 +23,9 @@ } }, "node_modules/@adobe/css-tools": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz", - "integrity": "sha512-+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g==" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz", + "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==" }, "node_modules/@ampproject/remapping": { "version": "2.1.1", @@ -16565,9 +16565,9 @@ }, "dependencies": { "@adobe/css-tools": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz", - "integrity": "sha512-+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g==" + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.1.tgz", + "integrity": "sha512-/62yikz7NLScCGAAST5SHdnjaDJQBDq0M2muyRTpf2VQhw6StBg2ALiu73zSJQ4fMVLA+0uBhBHAle7Wg+2kSg==" }, "@ampproject/remapping": { "version": "2.1.1", From 34af6bb5a6554dbd00fc422617c8df19a31bb825 Mon Sep 17 00:00:00 2001 From: caldoe <60075860+caldoe@users.noreply.github.com> Date: Fri, 1 Sep 2023 12:46:53 +0200 Subject: [PATCH 13/47] Update autodeployment add new Stardog endpoint --- service_config/files/pipeline | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service_config/files/pipeline b/service_config/files/pipeline index f2fa33f2..1983fcd2 100644 --- a/service_config/files/pipeline +++ b/service_config/files/pipeline @@ -1,7 +1,7 @@ QANARY_PROCESS_ALLOW-ADDITIONAL-TRIPLES=false SERVER_HOST=http://demos.swe.htwk-leipzig.de -STARDOG_URL=https://sd-f961e5f7.stardog.cloud:5820 +STARDOG_URL=https://sd-174feb1e.stardog.cloud:5820 STARDOG_PASSWORD=SECRETS_STARDOG_PASSWORD -STARDOG_USERNAME=qanary +STARDOG_USERNAME=readwrite MANAGEMENT_ENDPOINTS_WEB_EXPOSURE_INCLUDE=* SERVER_PORT=40111 From 1fc75c974871abd831bccd3298d2dc511368e445 Mon Sep 17 00:00:00 2001 From: Andreas Both Date: Mon, 4 Sep 2023 04:22:51 +0200 Subject: [PATCH 14/47] removed comments --- .../eu/wdaqua/qanary/web/messages/GerbilExecuteResponse.java | 1 - 1 file changed, 1 deletion(-) diff --git a/qanary_pipeline-template/src/main/java/eu/wdaqua/qanary/web/messages/GerbilExecuteResponse.java b/qanary_pipeline-template/src/main/java/eu/wdaqua/qanary/web/messages/GerbilExecuteResponse.java index e9785cb7..00735e1e 100644 --- a/qanary_pipeline-template/src/main/java/eu/wdaqua/qanary/web/messages/GerbilExecuteResponse.java +++ b/qanary_pipeline-template/src/main/java/eu/wdaqua/qanary/web/messages/GerbilExecuteResponse.java @@ -89,7 +89,6 @@ public GerbilExecuteResponse(ObjectMapper objectMapper, String questionText, Str QueryObj queryObj = new QueryObj(sparqlQueryString); List answersArray = new LinkedList<>(); - //JsonNode answersObj2 = null; if (jsonAnswerString != null && jsonAnswerString.length() > 0) { JsonNode answersObj2 = objectMapper.readTree(jsonAnswerString); answersArray.add(answersObj2); From 1fa07c1d9113d0bfadf507de2ed7280b8dba4e51 Mon Sep 17 00:00:00 2001 From: Andreas Both Date: Mon, 4 Sep 2023 04:24:11 +0200 Subject: [PATCH 15/47] Update pom.xml --- qanary_commons/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qanary_commons/pom.xml b/qanary_commons/pom.xml index 500f350b..c9d811e3 100644 --- a/qanary_commons/pom.xml +++ b/qanary_commons/pom.xml @@ -2,7 +2,7 @@ 4.0.0 eu.wdaqua.qanary qa.commons - 3.7.5 + 3.7.6 org.springframework.boot spring-boot-starter-parent From 4d2e0376224c436e85edbdad01bd22b1ff5e5fb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 07:20:41 +0000 Subject: [PATCH 16/47] build(deps): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/docker-deployment.yml | 2 +- .github/workflows/maven.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 896224e3..2b7a0b33 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/docker-deployment.yml b/.github/workflows/docker-deployment.yml index c68a72d9..69abdf24 100644 --- a/.github/workflows/docker-deployment.yml +++ b/.github/workflows/docker-deployment.yml @@ -15,7 +15,7 @@ jobs: with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build the Docker images and Push to Dockerhub run: bash -c ./service_config/build_images.sh - name: Init update diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5ce8daa3..89ee6e0a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 17 uses: actions/setup-java@v3 with: From 2a118443f4d42d14320565bac2830c4bd30df04a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 07:59:20 +0000 Subject: [PATCH 17/47] build(deps): bump docker/login-action from 2 to 3 Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/docker-deployment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-deployment.yml b/.github/workflows/docker-deployment.yml index c68a72d9..67039393 100644 --- a/.github/workflows/docker-deployment.yml +++ b/.github/workflows/docker-deployment.yml @@ -11,7 +11,7 @@ jobs: STARDOG_PASSWORD: ${{ secrets.STARDOG_PASSWORD }} steps: - name: Docker Login - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USER }} password: ${{ secrets.DOCKER_PASSWORD }} From d1806c7c9f882388aa2355e130366ae6ed79dbe7 Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Fri, 15 Sep 2023 10:02:54 +0200 Subject: [PATCH 18/47] Update select_highestScore_AnnotationOfAnswerSPARQL.rq --- .../queries/select_highestScore_AnnotationOfAnswerSPARQL.rq | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_highestScore_AnnotationOfAnswerSPARQL.rq b/qanary_commons/src/main/resources/queries/select_highestScore_AnnotationOfAnswerSPARQL.rq index c95510e4..817c0711 100644 --- a/qanary_commons/src/main/resources/queries/select_highestScore_AnnotationOfAnswerSPARQL.rq +++ b/qanary_commons/src/main/resources/queries/select_highestScore_AnnotationOfAnswerSPARQL.rq @@ -5,8 +5,8 @@ PREFIX rdf: PREFIX xsd: SELECT * +FROM ?graph WHERE { - GRAPH ?graph { ?newAnnotation rdf:type qa:AnnotationOfAnswerSPARQL . ?newAnnotation oa:hasTarget ?targetQuestion . ?newAnnotation oa:hasBody ?selectQueryThatShouldComputeTheAnswer . @@ -25,6 +25,5 @@ WHERE { ?newAnnotation oa:annotatedBy ?application . } -} ORDER BY DESC(?confidence) LIMIT 1 From 5b5dded84847c31a2a235dc2b8e9d91475f945cf Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 10:27:43 +0200 Subject: [PATCH 19/47] Create select_all_AnnotationOfRelation.rq --- .../queries/select_all_AnnotationOfRelation.rq | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 qanary_commons/src/main/resources/queries/select_all_AnnotationOfRelation.rq diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfRelation.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfRelation.rq new file mode 100644 index 00000000..2b56c7df --- /dev/null +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfRelation.rq @@ -0,0 +1,16 @@ +@prefix qa: . +@prefix oa: . + + a qa:AnnotationOfRelation . + oa:hasTarget [ + a oa:SpecificResource; + oa:hasSource ?hasSource ; + oa:hasSelector [ + a oa:TextPositionSelector ; + oa:start ?start ; + oa:end ?end + ] + ] . + oa:hasBody ?hasBody ; + oa:annotatedBy ?annotatedBy ; + oa:annotatedAt ?annotatedAt . From a1ee6eb027f2098739b38dd8591f04c25ce01be0 Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 10:40:08 +0200 Subject: [PATCH 20/47] Update select_all_AnnotationOfAnswerJson.rq --- .../queries/select_all_AnnotationOfAnswerJson.rq | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq index 52c4a138..e94647b5 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq @@ -5,8 +5,9 @@ PREFIX rdf: PREFIX rdfs: PREFIX xsd: -SELECT * WHERE { - GRAPH ?graph { +SELECT * +FROM ?graphURI +WHERE { ?annotationAnswer a qa:AnnotationOfAnswerJson ; oa:hasTarget ?question ; @@ -17,5 +18,4 @@ SELECT * WHERE { ?answer a qa:AnswerJson ; rdf:value ?answerJson . - } -} \ No newline at end of file +} From a45c9b4925cd21402744f177df9270a0878a767f Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 10:42:50 +0200 Subject: [PATCH 21/47] Update select_all_AnnotationOfAnswerJson.rq --- .../select_all_AnnotationOfAnswerJson.rq | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq index e94647b5..ee4f2470 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq @@ -8,14 +8,14 @@ PREFIX xsd: SELECT * FROM ?graphURI WHERE { - ?annotationAnswer - a qa:AnnotationOfAnswerJson ; - oa:hasTarget ?question ; - oa:hasBody ?answer ; - oa:annotatedBy ?service ; - oa:annotatedAt ?time ; - qa:score ?score . + ?annotationAnswer + a qa:AnnotationOfAnswerJson ; + oa:hasTarget ?question ; + oa:hasBody ?answer ; + oa:annotatedBy ?service ; + oa:annotatedAt ?time ; + qa:score ?score . ?answer - a qa:AnswerJson ; - rdf:value ?answerJson . + a qa:AnswerJson ; + rdf:value ?answerJson . } From d1f1ef6b69ecfc1e87b7bc934c96f1990974ff77 Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 10:43:48 +0200 Subject: [PATCH 22/47] Update select_all_AnnotationOfAnswerSPARQL.rq --- .../select_all_AnnotationOfAnswerSPARQL.rq | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerSPARQL.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerSPARQL.rq index cc5476d5..d64a19b9 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerSPARQL.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerSPARQL.rq @@ -4,14 +4,13 @@ PREFIX qa: PREFIX rdf: PREFIX xsd: -SELECT * +SELECT * +FROM ?graph WHERE { - GRAPH ?graph { - ?newAnnotation rdf:type qa:AnnotationOfAnswerSPARQL . - ?newAnnotation oa:hasTarget ?targetQuestion . - ?newAnnotation oa:hasBody ?selectQueryThatShouldComputeTheAnswer . - ?newAnnotation qa:score ?confidence . - ?newAnnotation oa:annotatedAt ?time . - ?newAnnotation oa:annotatedBy ?application . - } + ?annotationId rdf:type qa:AnnotationOfAnswerSPARQL . + ?newAnnotation oa:hasTarget ?hasTarget . + ?newAnnotation oa:hasBody ?hasBody . + ?newAnnotation qa:score ?score . + ?newAnnotation oa:annotatedAt ?annotatedAt . + ?newAnnotation oa:annotatedBy ?annotatedBy . } From e5bd39300979949dd1b73ad41ad661fc5b144b3f Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 10:44:10 +0200 Subject: [PATCH 23/47] Update select_all_AnnotationOfAnswerJson.rq --- .../queries/select_all_AnnotationOfAnswerJson.rq | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq index ee4f2470..6c14d216 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq @@ -10,12 +10,12 @@ FROM ?graphURI WHERE { ?annotationAnswer a qa:AnnotationOfAnswerJson ; - oa:hasTarget ?question ; - oa:hasBody ?answer ; - oa:annotatedBy ?service ; - oa:annotatedAt ?time ; + oa:hasTarget ?hasTarget ; + oa:hasBody ?hasBody ; + oa:annotatedBy ?annotatedBy ; + oa:annotatedAt ?annotatedAt ; qa:score ?score . ?answer a qa:AnswerJson ; - rdf:value ?answerJson . + rdf:value ?value . } From 728c0618ca5b62f01f87604ffc7f54bfad66e67e Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 10:44:18 +0200 Subject: [PATCH 24/47] Update select_all_AnnotationOfAnswerJson.rq --- .../main/resources/queries/select_all_AnnotationOfAnswerJson.rq | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq index 6c14d216..4d52150a 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerJson.rq @@ -15,7 +15,7 @@ WHERE { oa:annotatedBy ?annotatedBy ; oa:annotatedAt ?annotatedAt ; qa:score ?score . - ?answer + ?hasBody a qa:AnswerJson ; rdf:value ?value . } From cd19209c043a295b0fb1621fdacc9b25d16d6a49 Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 12:12:30 +0200 Subject: [PATCH 25/47] Create select_all_AnnotationOfInstance --- .../queries/select_all_AnnotationOfInstance | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance new file mode 100644 index 00000000..03929709 --- /dev/null +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance @@ -0,0 +1,22 @@ +PREFIX rdf: +PREFIX oa: +PREFIX qa: + +SELECT * +FROM ?graph +WHERE { + ?annotationId rdf:type qa:AnnotationOfInstance . + ?annotationId oa:hasTarget [ + a oa:SpecificResource; + oa:hasSource ?hasSource; + oa:hasSelector [ + a oa:TextPositionSelector; + oa:start ?start; + oa:end ?end; + ] + ]. + ?annotationId oa:hasBody ?hasBody ; + oa:annotatedBy ?annotatedBy ; + oa:annotatedAt ?annotatedAt ; + qa:score ?score . +} From f16932695de804dd35f738c8d2ebcdee4466277e Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 13:35:03 +0200 Subject: [PATCH 26/47] Delete qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance --- .../queries/select_all_AnnotationOfInstance | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance deleted file mode 100644 index 03929709..00000000 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance +++ /dev/null @@ -1,22 +0,0 @@ -PREFIX rdf: -PREFIX oa: -PREFIX qa: - -SELECT * -FROM ?graph -WHERE { - ?annotationId rdf:type qa:AnnotationOfInstance . - ?annotationId oa:hasTarget [ - a oa:SpecificResource; - oa:hasSource ?hasSource; - oa:hasSelector [ - a oa:TextPositionSelector; - oa:start ?start; - oa:end ?end; - ] - ]. - ?annotationId oa:hasBody ?hasBody ; - oa:annotatedBy ?annotatedBy ; - oa:annotatedAt ?annotatedAt ; - qa:score ?score . -} From 1da83d9a124cbe2e40c5310c55b82d07010c40e5 Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 13:35:28 +0200 Subject: [PATCH 27/47] Create select_all_AnnotationOfInstance.rq --- .../select_all_AnnotationOfInstance.rq | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance.rq diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance.rq new file mode 100644 index 00000000..03929709 --- /dev/null +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance.rq @@ -0,0 +1,22 @@ +PREFIX rdf: +PREFIX oa: +PREFIX qa: + +SELECT * +FROM ?graph +WHERE { + ?annotationId rdf:type qa:AnnotationOfInstance . + ?annotationId oa:hasTarget [ + a oa:SpecificResource; + oa:hasSource ?hasSource; + oa:hasSelector [ + a oa:TextPositionSelector; + oa:start ?start; + oa:end ?end; + ] + ]. + ?annotationId oa:hasBody ?hasBody ; + oa:annotatedBy ?annotatedBy ; + oa:annotatedAt ?annotatedAt ; + qa:score ?score . +} From 1b858ea3f730bc63b74043145a7b3654d427c4ad Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 14:37:49 +0200 Subject: [PATCH 28/47] Create select_all_AnnotationOfClass.rq --- .../queries/select_all_AnnotationOfClass.rq | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 qanary_commons/src/main/resources/queries/select_all_AnnotationOfClass.rq diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfClass.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfClass.rq new file mode 100644 index 00000000..f4a99d04 --- /dev/null +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfClass.rq @@ -0,0 +1,16 @@ +@prefix qa: . +@prefix oa: . +@prefix xsd: . + +SELECT * +FROM ?graph +WHERE { +?annotationId a qa:AnnotationOfClass . +?annotationId oa:hasTarget [ + a oa:SpecificClass ; + oa:hasSource ?hasSource ; +] . +?annotationId oa:hasBody ?hasBody ; + oa:annotatedBy ?annotatedBy ; + oa:annotatedAt ?annotatedAt . + } From 9f7947a831117541dd927d7bf75a9886e0353237 Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:02:20 +0200 Subject: [PATCH 29/47] Update select_all_AnnotationOfAnswerSPARQL.rq --- .../queries/select_all_AnnotationOfAnswerSPARQL.rq | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerSPARQL.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerSPARQL.rq index d64a19b9..b99540b6 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerSPARQL.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerSPARQL.rq @@ -8,9 +8,9 @@ SELECT * FROM ?graph WHERE { ?annotationId rdf:type qa:AnnotationOfAnswerSPARQL . - ?newAnnotation oa:hasTarget ?hasTarget . - ?newAnnotation oa:hasBody ?hasBody . - ?newAnnotation qa:score ?score . - ?newAnnotation oa:annotatedAt ?annotatedAt . - ?newAnnotation oa:annotatedBy ?annotatedBy . + ?annotationId oa:hasTarget ?hasTarget ; + oa:hasBody ?hasBody ; + qa:score ?score ; + oa:annotatedAt ?annotatedAt ; + oa:annotatedBy ?annotatedBy . } From 7dbcdf07042e728f7aa74f1a2aff34e316596bcc Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:22:01 +0200 Subject: [PATCH 30/47] Create select_all_AnnotationOfSpotInstance.rq --- .../select_all_AnnotationOfSpotInstance.rq | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 qanary_commons/src/main/resources/queries/select_all_AnnotationOfSpotInstance.rq diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfSpotInstance.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfSpotInstance.rq new file mode 100644 index 00000000..bc55a94d --- /dev/null +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfSpotInstance.rq @@ -0,0 +1,20 @@ +PREFIX rdf: +PREFIX oa: +PREFIX qa: + +SELECT * +FROM ?graph +WHERE { + ?annotationId rdf:type qa:AnnotationOfSpotInstance. + ?annotationId oa:hasTarget [ + a oa:SpecificResource; + oa:hasSource ?hasSource; + oa:hasSelector [ + a oa:TextPositionSelector; + oa:start ?start; + oa:end ?end; + ] + ]. + ?annotationId oa:annotatedAt ?annotatedAt ; + oa:annotatedBy ?annotatedBy . +} From a9947e8a49c5aef465cca00c76c6d0b0eac1cbec Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:25:37 +0200 Subject: [PATCH 31/47] Create select_all_AnnotationOfQuestionLanguage.rq --- .../select_all_AnnotationOfQuestionLanguage.rq | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionLanguage.rq diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionLanguage.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionLanguage.rq new file mode 100644 index 00000000..0dd3faba --- /dev/null +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionLanguage.rq @@ -0,0 +1,13 @@ +@prefix qa: . +@prefix oa: . +@prefix xsd: . + +SELECT * +FROM ?graph +WHERE { +?annotationId a qa:AnnotationOfQuestionLanguage . +?annotationId oa:hasTarget ?hasTarget ; + oa:hasBody ?hasBody ; + oa:annotatedBy ?annotatedBy ; + oa:annotatedAt ?annotatedAt . + } From f5ade41ba15e7faa8af0751b75a3a427c877319b Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:31:00 +0200 Subject: [PATCH 32/47] Create select_all_AnnotationOfTextAnswerJson.rq --- .../select_all_AnnotationOfTextAnswerJson.rq | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 qanary_commons/src/main/resources/queries/select_all_AnnotationOfTextAnswerJson.rq diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfTextAnswerJson.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfTextAnswerJson.rq new file mode 100644 index 00000000..a3490000 --- /dev/null +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfTextAnswerJson.rq @@ -0,0 +1,19 @@ +PREFIX qa: +PREFIX oa: +PREFIX dbr: +PREFIX rdf: +PREFIX xsd: +PREFIX rdfs: + +SELECT * +FROM ?graph +WHERE { + ?annotationId rdf:type qa:AnnotationOfTextAnswerJson . + ?annotationId oa:hasTarget ?hasTarget + ?annotationId oa:hasBody ?hasBody . + ?annotationId oa:annotatedAt ?annotatedAt . + ?annotationId oa:annotatedBy . + ?hasBody rdf:type qa:AnswerJson . + ?hasBody rdf:value ?value . + qa:AnswerJson rdfs:subClassOf qa:Answer . + } From 9fe0b0be09f8b6ea12269ea0c69805b41db51924 Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Tue, 19 Sep 2023 09:28:23 +0200 Subject: [PATCH 33/47] Update select_all_AnnotationOfInstance.rq --- .../resources/queries/select_all_AnnotationOfInstance.rq | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance.rq index 03929709..91ecbbc7 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance.rq @@ -17,6 +17,8 @@ WHERE { ]. ?annotationId oa:hasBody ?hasBody ; oa:annotatedBy ?annotatedBy ; - oa:annotatedAt ?annotatedAt ; - qa:score ?score . -} + oa:annotatedAt ?annotatedAt . + OPTIONAL { + ?annotationId qa:score ?score . + } + } From fbe60d8fc65e6be3b6d472f1c5a30a6a960a233b Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Fri, 22 Sep 2023 14:24:37 +0200 Subject: [PATCH 34/47] Update select_all_AnnotationOfQuestionLanguage.rq --- .../queries/select_all_AnnotationOfQuestionLanguage.rq | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionLanguage.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionLanguage.rq index 0dd3faba..19f926cd 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionLanguage.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionLanguage.rq @@ -1,6 +1,6 @@ -@prefix qa: . -@prefix oa: . -@prefix xsd: . +Prefix qa: +Prefix oa: +Prefix xsd: SELECT * FROM ?graph From 1d03cae312c8dde7d098f2601e4bff218e93dbc1 Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Fri, 22 Sep 2023 14:25:08 +0200 Subject: [PATCH 35/47] Update select_all_AnnotationOfRelation.rq --- .../main/resources/queries/select_all_AnnotationOfRelation.rq | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfRelation.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfRelation.rq index 2b56c7df..c8915f27 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfRelation.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfRelation.rq @@ -1,5 +1,5 @@ -@prefix qa: . -@prefix oa: . +PREFIX qa: +PREFIX oa: a qa:AnnotationOfRelation . oa:hasTarget [ From 1036dda4af6dc260485974f0344a2053887dd6f2 Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Fri, 22 Sep 2023 14:25:38 +0200 Subject: [PATCH 36/47] Update select_all_AnnotationOfClass.rq --- .../main/resources/queries/select_all_AnnotationOfClass.rq | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfClass.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfClass.rq index f4a99d04..f377111d 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfClass.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfClass.rq @@ -1,6 +1,6 @@ -@prefix qa: . -@prefix oa: . -@prefix xsd: . +PREFIX qa: +PREFIX oa: +PREFIX xsd: SELECT * FROM ?graph From a0181758a460ca096da09d1417239d829e4fdedb Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Fri, 22 Sep 2023 14:25:52 +0200 Subject: [PATCH 37/47] Update select_all_AnnotationOfQuestionLanguage.rq --- .../queries/select_all_AnnotationOfQuestionLanguage.rq | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionLanguage.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionLanguage.rq index 19f926cd..69b53d65 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionLanguage.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionLanguage.rq @@ -1,6 +1,6 @@ -Prefix qa: -Prefix oa: -Prefix xsd: +PREFIX qa: +PREFIX oa: +PREFIX xsd: SELECT * FROM ?graph From 43caa0b1f64bc32505e5744c7bd43dabc5786282 Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Fri, 22 Sep 2023 14:37:30 +0200 Subject: [PATCH 38/47] Update select_all_AnnotationOfTextAnswerJson.rq --- .../resources/queries/select_all_AnnotationOfTextAnswerJson.rq | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfTextAnswerJson.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfTextAnswerJson.rq index a3490000..c1f1ec17 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfTextAnswerJson.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfTextAnswerJson.rq @@ -12,7 +12,7 @@ WHERE { ?annotationId oa:hasTarget ?hasTarget ?annotationId oa:hasBody ?hasBody . ?annotationId oa:annotatedAt ?annotatedAt . - ?annotationId oa:annotatedBy . + ?annotationId oa:annotatedBy ?annotatedBy . ?hasBody rdf:type qa:AnswerJson . ?hasBody rdf:value ?value . qa:AnswerJson rdfs:subClassOf qa:Answer . From 7332d8454658689196ddf7672ac7f012824d61b8 Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Fri, 22 Sep 2023 14:41:43 +0200 Subject: [PATCH 39/47] Update select_all_AnnotationOfAnswerSPARQL.rq --- .../queries/select_all_AnnotationOfAnswerSPARQL.rq | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerSPARQL.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerSPARQL.rq index b99540b6..d9ef6230 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerSPARQL.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfAnswerSPARQL.rq @@ -9,8 +9,10 @@ FROM ?graph WHERE { ?annotationId rdf:type qa:AnnotationOfAnswerSPARQL . ?annotationId oa:hasTarget ?hasTarget ; - oa:hasBody ?hasBody ; - qa:score ?score ; - oa:annotatedAt ?annotatedAt ; + oa:hasBody ?hasBody . + OPTIONAL { + ?annotationnId qa:score ?score ; + } + ?annotationId oa:annotatedAt ?annotatedAt ; oa:annotatedBy ?annotatedBy . } From 3bcbc480cc37b75d6f1da04be52023c963869df3 Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Fri, 22 Sep 2023 14:51:11 +0200 Subject: [PATCH 40/47] Update select_all_AnnotationOfQuestionTranslation.rq --- .../select_all_AnnotationOfQuestionTranslation.rq | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionTranslation.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionTranslation.rq index 8774205e..599f09b4 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionTranslation.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfQuestionTranslation.rq @@ -1,11 +1,14 @@ PREFIX qa: PREFIX oa: -SELECT ?a ?translation ?time +SELECT * FROM ?graph WHERE { - ?a a qa:AnnotationOfQuestionTranslation . - ?a oa:hasTarget ?targetQuestion . - ?a oa:hasBody ?translation . - FILTER (lang(?translation) = ?language). + ?annotationId a qa:AnnotationOfQuestionTranslation . + ?annotationId oa:hasTarget ?hasTarget ; + oa:hasBody ?hasBody ; + oa:annotatedBy ?annotatedBy ; + oa:annotatedAt ?annotatedAt . + FILTER (lang(?hasBody) = ?language). } + From 07d55652e979226cf5a9268450bae40b54822a59 Mon Sep 17 00:00:00 2001 From: Andreas Both Date: Mon, 2 Oct 2023 01:36:52 +0200 Subject: [PATCH 41/47] upgraded pom version --- qanary_commons/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qanary_commons/pom.xml b/qanary_commons/pom.xml index c68e4841..a0b3f6a5 100644 --- a/qanary_commons/pom.xml +++ b/qanary_commons/pom.xml @@ -2,7 +2,7 @@ 4.0.0 eu.wdaqua.qanary qa.commons - 3.7.5 + 3.7.6 org.springframework.boot spring-boot-starter-parent From 1e3d7069866e7aea85f33816ea2debdd36bb3144 Mon Sep 17 00:00:00 2001 From: anbo-de Date: Mon, 2 Oct 2023 02:00:45 +0200 Subject: [PATCH 42/47] replaced banner.txt for cleaner, fresh Qanary logo --- .../src/main/resources/banner.txt | 40 ++++++++--------- .../src/main/resources/banner.txt | 44 +++++++++---------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qanary_component-template/src/main/resources/banner.txt b/qanary_component-template/src/main/resources/banner.txt index 33b72437..bb109eda 100644 --- a/qanary_component-template/src/main/resources/banner.txt +++ b/qanary_component-template/src/main/resources/banner.txt @@ -1,24 +1,24 @@ -${AnsiColor.GREEN} :]KBQQ@QB9z: - rN@@D;`,-:Z@@@K, - k@@@k `]: |Q@@Q, -${AnsiColor.BRIGHT_GREEN} E@@@o `?Q@@D - r@@Q; #@@@@@` - #Q| :> Q@@@@@` ;jDQ@@QHvQQQQQ> iQQQQQ*FgQ@@Qm' :2&Q@@QKvQBB##: `RRDdOv.?2EEF,;e] `uuuff| -${AnsiColor.CYAN} ,d-rNQ' a@@@@Q ^B@@@@kr;c@@@@@@` Q@@@@@@QQ@@@@@@` ;B@@@@e^:J@@@@@# |QBB#Nd9odDHdZ X; ;wmmeZ, - .:R@@* F@@@@e m@@@@Q: ,@@@@@S ^@@@@@B~ 6@@@@@' e@@@@Q, :@@@@QL `RQB#N$' ;dde:;E` jmmZZF - ^@@@$ D@@@@, k@@@@Q: a@@@@@' R@@@@@. K@@@@Q X@@@@@' k@@@QQ` ?BB#NNr -\*|j$\ ~meeZZ; -${AnsiColor.BRIGHT_BLUE}r@@@@: ;@@@@j |@@@@@\ `@@@@@d ,@@@@@S -@@@@@v >@@@@@i .@@@QQ2 dB#NND \OK9$6. 7mZZaS` -g@@@@` ,Q@@@O Q@@@@@ i@@@@@; Z@@@@@' F@@@@Q` B@@@@@` t@@QQQ, :B#NNgi 6K9$6J .meZaa? -Q@@@@: `.` ^Q@@@$ .@@@@@R Q@@@@Q `@@@@@d `@@@@@f -@@@@@& `Q@QQQK e#NNg&. ;K9$$k_ |eZaaa' -${AnsiColor.BLUE}k@@@@QKe9QQEK@@@@L `@@@@@Q` 'K@@@@@w S@@@@@; ;@@@@@r ,@@@@@Q` ,O@QQQQv z#NNggj z9$$kX- ^eZaaa7 -.R@@@@Buz$@@@@QF` m@@@@@@NQ@&N@@@@@HKQ@@@@@Q ,@@@@@@#B@Q@@@@@QgB@$NQQQQQma&#NNggR: ?$$kEXotaeZaaaa_ - *KQ@@@@@Q@@@Q* /N@@@@Q$; 'K@@@@@Kw@@@@@c ;&@@@@@D? \N@@@@Qe: ,9QQQQ&j;&NggRE ?ZEXwev^uaaaau - `'''` J@@@@Qac/` ''` .'` .'. .'` ..` `:|L|7Zaoaa^ - LQ@@@@Q* 'fj: /aoaao` - '::, ]w; :aaaaa^ - \meJFaaaaor - :LuoSfc;- +       .-==--===-:                                                                                             +     :===:  : .-===:                                                                                           +    ====.   .   .-==-                                                                                          +   ====.        .-===:                                                                                         +  -==:         .=====-        ...                     ..              ..                                       +  =:  -.       .=====:    .-======-=====:   :=====:-=====-.      .:-===--------:    :----:.:::::. ::    :::::. + ...-=-         =====.  .=====:   -=====    -=====-::-====-     -====:   :-----     -----:...:::: :.   .:::::  +  :==-          =====  :=====     =====:   .=====:   :====-   .===--.    :----:    :----:    ... .:    :::::.  + -===.         .====: :=====.    :=====    -====-    -====:   ===-=.     -----.    -----.    :::::.   .:::::   +-====          ====-  =====:     =====-    =====.   .====-   -====-     :-----    .----:    .:::::    :::::.   +=====         -===-  :=====.    .=====.   :=====    -====:   ===-=:     -----.    -----.    :::::.    :::::    +=====:::--:.:====:   :=====.    =====-    =====:    =====   .=-=--:    :-----    :-----    .:::::    ::::::    +.=====:..======-.    .======::-=======:.:-=====    .=====:.:-===---:.:-------:..:-----:    .:::::...::::::.    + .-===========-       .-======-. -======-=====:     :-=====-:.--------. :------::----:      .::::::.::::::     +    .......=====:..      ...       ...   .....        ....      ...       ...                  .....:::::.     +            -======.                                                                          .:.  .:::::      +              ....                                                                           .:.   :::::.      +                                                                                             .::..:::::.       +                                                                                               .::::..         + ${AnsiBackground.DEFAULT}${AnsiColor.GREEN}${spring.application.name} -- ${spring.application.description} ${AnsiBackground.DEFAULT}${AnsiColor.BRIGHT_GREEN}Framework@GitHub: https://github.com/WDAqua/Qanary diff --git a/qanary_pipeline-template/src/main/resources/banner.txt b/qanary_pipeline-template/src/main/resources/banner.txt index ace4032e..0b93d535 100644 --- a/qanary_pipeline-template/src/main/resources/banner.txt +++ b/qanary_pipeline-template/src/main/resources/banner.txt @@ -1,29 +1,29 @@ -${AnsiColor.GREEN} :]KBQQ@QB9z: - rN@@D;`,-:Z@@@K, - k@@@k `]: |Q@@Q, -${AnsiColor.BRIGHT_GREEN} E@@@o `?Q@@D - r@@Q; #@@@@@` - #Q| :> Q@@@@@` ;jDQ@@QHvQQQQQ> iQQQQQ*FgQ@@Qm' :2&Q@@QKvQBB##: `RRDdOv.?2EEF,;e] `uuuff| -${AnsiColor.CYAN} ,d-rNQ' a@@@@Q ^B@@@@kr;c@@@@@@` Q@@@@@@QQ@@@@@@` ;B@@@@e^:J@@@@@# |QBB#Nd9odDHdZ X; ;wmmeZ, - .:R@@* F@@@@e m@@@@Q: ,@@@@@S ^@@@@@B~ 6@@@@@' e@@@@Q, :@@@@QL `RQB#N$' ;dde:;E` jmmZZF - ^@@@$ D@@@@, k@@@@Q: a@@@@@' R@@@@@. K@@@@Q X@@@@@' k@@@QQ` ?BB#NNr -\*|j$\ ~meeZZ; -${AnsiColor.BRIGHT_BLUE}r@@@@: ;@@@@j |@@@@@\ `@@@@@d ,@@@@@S -@@@@@v >@@@@@i .@@@QQ2 dB#NND \OK9$6. 7mZZaS` -g@@@@` ,Q@@@O Q@@@@@ i@@@@@; Z@@@@@' F@@@@Q` B@@@@@` t@@QQQ, :B#NNgi 6K9$6J .meZaa? -Q@@@@: `.` ^Q@@@$ .@@@@@R Q@@@@Q `@@@@@d `@@@@@f -@@@@@& `Q@QQQK e#NNg&. ;K9$$k_ |eZaaa' -${AnsiColor.BLUE}k@@@@QKe9QQEK@@@@L `@@@@@Q` 'K@@@@@w S@@@@@; ;@@@@@r ,@@@@@Q` ,O@QQQQv z#NNggj z9$$kX- ^eZaaa7 -.R@@@@Buz$@@@@QF` m@@@@@@NQ@&N@@@@@HKQ@@@@@Q ,@@@@@@#B@Q@@@@@QgB@$NQQQQQma&#NNggR: ?$$kEXotaeZaaaa_ - *KQ@@@@@Q@@@Q* /N@@@@Q$; 'K@@@@@Kw@@@@@c ;&@@@@@D? \N@@@@Qe: ,9QQQQ&j;&NggRE ?ZEXwev^uaaaau - `'''` J@@@@Qac/` ''` .'` .'. .'` ..` `:|L|7Zaoaa^ - LQ@@@@Q* 'fj: /aoaao` - '::, ]w; :aaaaa^ - \meJFaaaaor - :LuoSfc;- - +       .-==--===-:                                                                                             +     :===:  : .-===:                                                                                           +    ====.   .   .-==-                                                                                          +   ====.        .-===:                                                                                         +  -==:         .=====-        ...                     ..              ..                                       +  =:  -.       .=====:    .-======-=====:   :=====:-=====-.      .:-===--------:    :----:.:::::. ::    :::::. + ...-=-         =====.  .=====:   -=====    -=====-::-====-     -====:   :-----     -----:...:::: :.   .:::::  +  :==-          =====  :=====     =====:   .=====:   :====-   .===--.    :----:    :----:    ... .:    :::::.  + -===.         .====: :=====.    :=====    -====-    -====:   ===-=.     -----.    -----.    :::::.   .:::::   +-====          ====-  =====:     =====-    =====.   .====-   -====-     :-----    .----:    .:::::    :::::.   +=====         -===-  :=====.    .=====.   :=====    -====:   ===-=:     -----.    -----.    :::::.    :::::    +=====:::--:.:====:   :=====.    =====-    =====:    =====   .=-=--:    :-----    :-----    .:::::    ::::::    +.=====:..======-.    .======::-=======:.:-=====    .=====:.:-===---:.:-------:..:-----:    .:::::...::::::.    + .-===========-       .-======-. -======-=====:     :-=====-:.--------. :------::----:      .::::::.::::::     +    .......=====:..      ...       ...   .....        ....      ...       ...                  .....:::::.     +            -======.                                                                          .:.  .:::::      +              ....                                                                           .:.   :::::.      +                                                                                             .::..:::::.       +                                                                                               .::::..         + +${AnsiColor.BLACK} ${AnsiBackground.WHITE}Application Title: Qanary Question Answering System component ${AnsiBackground.DEFAULT} ${AnsiBackground.WHITE}Description: Provides central functionality for each Qanary component (registration) and endpoints for users. ${AnsiBackground.DEFAULT} ${AnsiBackground.WHITE}Framework@GitHub: https://github.com/WDAqua/Qanary ${AnsiBackground.DEFAULT} ${AnsiBackground.DEFAULT}${AnsiColor.DEFAULT}Pipeline Version: ${application.version} ${AnsiBackground.DEFAULT} ${AnsiBackground.DEFAULT}${AnsiColor.DEFAULT}Spring Boot Version: ${spring-boot.version} ${AnsiBackground.DEFAULT} ${AnsiBackground.DEFAULT}${AnsiColor.DEFAULT}Java Version: ${java.version} ${AnsiBackground.DEFAULT} - \ No newline at end of file +${AnsiColor.DEFAULT} \ No newline at end of file From 1c6668775e3887f329d0e6c1a525b502fa3cce2e Mon Sep 17 00:00:00 2001 From: Andreas Both Date: Mon, 2 Oct 2023 04:25:32 +0200 Subject: [PATCH 43/47] Update select_all_AnnotationOfInstance.rq --- .../queries/select_all_AnnotationOfInstance.rq | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance.rq index 91ecbbc7..97f198e2 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfInstance.rq @@ -7,18 +7,18 @@ FROM ?graph WHERE { ?annotationId rdf:type qa:AnnotationOfInstance . ?annotationId oa:hasTarget [ - a oa:SpecificResource; + a oa:SpecificResource; oa:hasSource ?hasSource; oa:hasSelector [ - a oa:TextPositionSelector; - oa:start ?start; - oa:end ?end; - ] - ]. + a oa:TextPositionSelector; + oa:start ?start; + oa:end ?end + ] + ]. ?annotationId oa:hasBody ?hasBody ; oa:annotatedBy ?annotatedBy ; oa:annotatedAt ?annotatedAt . OPTIONAL { - ?annotationId qa:score ?score . + ?annotationId qa:score ?score . } - } +} From 47fd1a542a3826ae4599b7e991fcf5e1e43b0522 Mon Sep 17 00:00:00 2001 From: Andreas Both Date: Mon, 2 Oct 2023 04:28:22 +0200 Subject: [PATCH 44/47] Update select_all_AnnotationOfSpotInstance.rq --- .../queries/select_all_AnnotationOfSpotInstance.rq | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfSpotInstance.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfSpotInstance.rq index bc55a94d..b0da197f 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfSpotInstance.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfSpotInstance.rq @@ -7,14 +7,14 @@ FROM ?graph WHERE { ?annotationId rdf:type qa:AnnotationOfSpotInstance. ?annotationId oa:hasTarget [ - a oa:SpecificResource; + a oa:SpecificResource; oa:hasSource ?hasSource; oa:hasSelector [ - a oa:TextPositionSelector; - oa:start ?start; - oa:end ?end; - ] - ]. + a oa:TextPositionSelector; + oa:start ?start; + oa:end ?end . + ] + ]. ?annotationId oa:annotatedAt ?annotatedAt ; oa:annotatedBy ?annotatedBy . } From dc64cf38d9dcfcb94fe718fcec41ccc9ae6ba070 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Mon, 2 Oct 2023 07:28:04 +0000 Subject: [PATCH 45/47] fix: upgrade org.glassfish.jaxb:jaxb-runtime from 4.0.1 to 4.0.3 Snyk has created this PR to upgrade org.glassfish.jaxb:jaxb-runtime from 4.0.1 to 4.0.3. See this package in Maven Repository: https://mvnrepository.com/artifact/org.glassfish.jaxb/jaxb-runtime/ See this project in Snyk: https://app.snyk.io/org/anbo-de/project/ee44bfa2-9c74-4e6d-bbb8-fa23594b6bd0?utm_source=github&utm_medium=referral&page=upgrade-pr --- qanary_pipeline-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qanary_pipeline-template/pom.xml b/qanary_pipeline-template/pom.xml index 7c0a1e94..a6815a9b 100644 --- a/qanary_pipeline-template/pom.xml +++ b/qanary_pipeline-template/pom.xml @@ -224,7 +224,7 @@ org.glassfish.jaxb jaxb-runtime - 4.0.1 + 4.0.3 jakarta.xml.bind From f384d413294dc4e1c112107a4a7df66e24e3efa4 Mon Sep 17 00:00:00 2001 From: Andreas Both Date: Tue, 3 Oct 2023 03:21:31 +0200 Subject: [PATCH 46/47] Update pom.xml --- qanary_pipeline-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qanary_pipeline-template/pom.xml b/qanary_pipeline-template/pom.xml index a6815a9b..17d66b21 100644 --- a/qanary_pipeline-template/pom.xml +++ b/qanary_pipeline-template/pom.xml @@ -5,7 +5,7 @@ 4.0.0 qa.pipeline eu.wdaqua.qanary - 3.7.6 + 3.7.7 org.springframework.boot spring-boot-starter-parent From 4d6e16952ca30743b9eb45ffa7c8aaacb9818d20 Mon Sep 17 00:00:00 2001 From: Dennis Schiese <135758800+dschiese@users.noreply.github.com> Date: Wed, 4 Oct 2023 11:43:15 +0200 Subject: [PATCH 47/47] Update select_all_AnnotationOfRelation.rq --- .../select_all_AnnotationOfRelation.rq | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfRelation.rq b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfRelation.rq index c8915f27..43a95872 100644 --- a/qanary_commons/src/main/resources/queries/select_all_AnnotationOfRelation.rq +++ b/qanary_commons/src/main/resources/queries/select_all_AnnotationOfRelation.rq @@ -1,16 +1,29 @@ + + PREFIX qa: PREFIX oa: - a qa:AnnotationOfRelation . - oa:hasTarget [ +SELECT * +FROM ?graph +WHERE { +?annotationId a qa:AnnotationOfRelation . +?annotationId oa:hasTarget [ a oa:SpecificResource; - oa:hasSource ?hasSource ; + oa:hasSource ?hasSource + ] . + OPTIONAL { + ?annotationId oa:hasTarget [ oa:hasSelector [ a oa:TextPositionSelector ; oa:start ?start ; oa:end ?end - ] + ] ] . - oa:hasBody ?hasBody ; +} +OPTIONAL { +?annotationId qa:score ?score . +} +?annotationId oa:hasBody ?hasBody ; oa:annotatedBy ?annotatedBy ; oa:annotatedAt ?annotatedAt . +}