diff --git a/.github/workflows/server-web-api-test.yml b/.github/workflows/server-web-api-test.yml
index 428266623..2443f0dc4 100644
--- a/.github/workflows/server-web-api-test.yml
+++ b/.github/workflows/server-web-api-test.yml
@@ -25,6 +25,24 @@ 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: |
+ 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
+
+ - 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/.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}"
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
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