From 95db3fd4a6062988d66ac3f7b28c2bb90f9835f1 Mon Sep 17 00:00:00 2001 From: JJ-Author Date: Sat, 18 Oct 2025 10:34:10 +0200 Subject: [PATCH 1/5] Add debug steps to Maven workflow and set relativePath in POM files --- .github/workflows/server-web-api-test.yml | 13 +++++++++++++ core/pom.xml | 1 + dump/pom.xml | 1 + scripts/pom.xml | 1 + server/pom.xml | 1 + 5 files changed, 17 insertions(+) diff --git a/.github/workflows/server-web-api-test.yml b/.github/workflows/server-web-api-test.yml index 428266623..58968b3ae 100644 --- a/.github/workflows/server-web-api-test.yml +++ b/.github/workflows/server-web-api-test.yml @@ -25,6 +25,19 @@ jobs: java-version: 1.8 - name: Build DIEF with Maven run: mvn clean install -Dskip=true -DskipTests -Dmaven.source.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3 + + - name: Debug: List Maven repo and parent POM + run: | + echo "Listing parent POM and Maven repo contents:" + ls -l ../pom.xml || ls -l ../../pom.xml || true + ls -lR ~/.m2/repository/org/dbpedia/extraction || true + + - name: Debug: Print effective POM for server module + run: | + cd server + mvn help:effective-pom -Doutput=effective-pom.xml + cat effective-pom.xml + cd .. - name: Start DBpedia Server run: | cd server diff --git a/core/pom.xml b/core/pom.xml index 8e7461bfa..694b6d423 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -8,6 +8,7 @@ org.dbpedia extraction ${revision} + ../pom.xml org.dbpedia.extraction diff --git a/dump/pom.xml b/dump/pom.xml index 459b7488b..509058e87 100644 --- a/dump/pom.xml +++ b/dump/pom.xml @@ -8,6 +8,7 @@ org.dbpedia extraction ${revision} + ../pom.xml org.dbpedia.extraction diff --git a/scripts/pom.xml b/scripts/pom.xml index e6a28d407..e5addcb88 100644 --- a/scripts/pom.xml +++ b/scripts/pom.xml @@ -7,6 +7,7 @@ org.dbpedia extraction ${revision} + ../pom.xml org.dbpedia.extraction diff --git a/server/pom.xml b/server/pom.xml index 9f9b5a805..c819ea558 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -8,6 +8,7 @@ org.dbpedia extraction ${revision} + ../pom.xml org.dbpedia.extraction From 8a55cb52d5caa4b4953f2e35ac49a64db6f8fe81 Mon Sep 17 00:00:00 2001 From: JJ-Author Date: Sat, 18 Oct 2025 11:07:55 +0200 Subject: [PATCH 2/5] Refactor snapshot deploy workflow to compute Maven-safe revision / version --- .github/workflows/snapshot_deploy.yml | 45 ++++++++++++++++++++------- 1 file changed, 33 insertions(+), 12 deletions(-) diff --git a/.github/workflows/snapshot_deploy.yml b/.github/workflows/snapshot_deploy.yml index 9615575c6..827b09218 100644 --- a/.github/workflows/snapshot_deploy.yml +++ b/.github/workflows/snapshot_deploy.yml @@ -39,19 +39,40 @@ jobs: EOF + - name: Compute Maven-safe REVISION + shell: bash + run: | + set -euo pipefail + + sanitize() { + # lowercase; allow only [a-z0-9.-]; collapse dashes; trim edges + echo "$1" \ + | tr '[:upper:]' '[:lower:]' \ + | sed -E 's/[^a-z0-9.-]+/-/g; s/-+/-/g; s/^-+//; s/-+$//' + } + + if [[ "${GITHUB_REF}" == refs/pull/* ]]; then + # e.g. refs/pull/42/merge -> pr-42-SNAPSHOT + pr_num="$(echo "${GITHUB_REF}" | sed -E 's#refs/pull/([0-9]+).*#\1#')" + base="pr-${pr_num}" + else + # e.g. refs/heads/feature/foo -> feature-foo-SNAPSHOT + base="${GITHUB_REF##*/}" + fi + + safe_base="$(sanitize "${base}")" + [[ -z "${safe_base}" ]] && safe_base="build" + + REVISION="${safe_base}-SNAPSHOT" + echo "Using Maven revision: ${REVISION}" + echo "REVISION=${REVISION}" >> "$GITHUB_ENV" + - name: Deploy Snapshot env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - REPO: ${{ github.repository }} # expands to "owner/repo" + REPO: ${{ github.repository }} run: | - # Example version names: - # For branch 'master': master-SNAPSHOT - # For branch 'feature/foo': feature/foo-SNAPSHOT - # For PR #42: pr-42-SNAPSHOT - if [[ "${GITHUB_REF}" == refs/pull/* ]]; then - REVISION="pr-${GITHUB_REF#refs/pull/}-SNAPSHOT" - else - REVISION="${GITHUB_REF##*/}-SNAPSHOT" - fi - echo "Deploying to: https://maven.pkg.github.com/${REPO} with revision: $REVISION" - mvn deploy -DskipTests -Dgithub.repo.url="https://maven.pkg.github.com/${REPO}" -Drevision="$REVISION" + echo "Deploying to https://maven.pkg.github.com/${REPO} with revision ${REVISION}" + mvn deploy -DskipTests \ + -Dgithub.repo.url="https://maven.pkg.github.com/${REPO}" \ + -Drevision="${REVISION}" From c10f4da7dc592985805031cc7c042a7c696e5a04 Mon Sep 17 00:00:00 2001 From: JJ-Author Date: Sat, 18 Oct 2025 11:15:41 +0200 Subject: [PATCH 3/5] fix syntax errors in workflow --- .github/workflows/server-web-api-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/server-web-api-test.yml b/.github/workflows/server-web-api-test.yml index 58968b3ae..b9b3ff0b7 100644 --- a/.github/workflows/server-web-api-test.yml +++ b/.github/workflows/server-web-api-test.yml @@ -26,13 +26,13 @@ jobs: - name: Build DIEF with Maven run: mvn clean install -Dskip=true -DskipTests -Dmaven.source.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3 - - name: Debug: List Maven repo and parent POM + - name: Debug List Maven repo and parent POM run: | echo "Listing parent POM and Maven repo contents:" ls -l ../pom.xml || ls -l ../../pom.xml || true ls -lR ~/.m2/repository/org/dbpedia/extraction || true - - name: Debug: Print effective POM for server module + - name: Debug Print effective POM for server module run: | cd server mvn help:effective-pom -Doutput=effective-pom.xml From 774fab720980821beb59f7da5606ec5f487fc95e Mon Sep 17 00:00:00 2001 From: JJ-Author Date: Sat, 18 Oct 2025 12:02:02 +0200 Subject: [PATCH 4/5] try wiht maven.config --- .mvn/maven.config | 1 + 1 file changed, 1 insertion(+) create mode 100644 .mvn/maven.config diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 000000000..f84060456 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Drevision=4.2-SNAPSHOT From e047f402e9ae1528798de8c7fc64a5b520af5a56 Mon Sep 17 00:00:00 2001 From: JJ-Author Date: Sat, 18 Oct 2025 23:22:34 +0200 Subject: [PATCH 5/5] Add debug output for unresolved parent and version in Maven POM --- .github/workflows/server-web-api-test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/server-web-api-test.yml b/.github/workflows/server-web-api-test.yml index b9b3ff0b7..2443f0dc4 100644 --- a/.github/workflows/server-web-api-test.yml +++ b/.github/workflows/server-web-api-test.yml @@ -28,6 +28,11 @@ jobs: - name: Debug List Maven repo and parent POM run: | + sed -n '1,120p' ~/.m2/repository/org/dbpedia/extraction/core/4.2-SNAPSHOT/core-4.2-SNAPSHOT.pom | grep -n '\|' + echo "=== Check installed POMs for unresolved \${revision} in ===" + grep -n "" ~/.m2/repository/org/dbpedia/extraction/*/4.2-SNAPSHOT/*.pom || true + grep -n "\${revision}" ~/.m2/repository/org/dbpedia/extraction/*/4.2-SNAPSHOT/*.pom || true + echo "Listing parent POM and Maven repo contents:" ls -l ../pom.xml || ls -l ../../pom.xml || true ls -lR ~/.m2/repository/org/dbpedia/extraction || true