diff --git a/.github/workflows/cd-config.yml b/.github/workflows/cd-config.yml index e37c46030..a9792bf54 100644 --- a/.github/workflows/cd-config.yml +++ b/.github/workflows/cd-config.yml @@ -42,7 +42,7 @@ jobs: server-username: MAVEN_REPO_USERNAME server-password: MAVEN_REPO_TOKEN - name: Publish to Sonatype - run: if [[ $(./mvnw -q help:evaluate -Dexpression=project.version -DforceStdout) == *SNAPSHOT* ]]; then ./mvnw -B -ntp deploy ; fi + run: if [[ $(./mvnw -q help:evaluate -Dexpression=project.version -DforceStdout) == *SNAPSHOT* ]]; then ./mvnw -B -ntp deploy -Ppublish ; fi env: MAVEN_REPO_USERNAME: ${{ secrets.SONATYPE_USERNAME }} MAVEN_REPO_TOKEN: ${{ secrets.SONATYPE_PASSWORD }} diff --git a/buildtools/src/main/resources/docker/publishToDockerHub.sh b/buildtools/src/main/resources/docker/publishToDockerHub.sh index 5f53978f2..b7c8e4c42 100755 --- a/buildtools/src/main/resources/docker/publishToDockerHub.sh +++ b/buildtools/src/main/resources/docker/publishToDockerHub.sh @@ -8,7 +8,7 @@ BRANCH=$(git branch 2>/dev/null | sed -n -e 's/^\* \(.*\)/\1/p') ################################## IMAGE=trellisldp/trellis-triplestore -./mvnw package -pl apps/quarkus -am +./mvnw package -pl apps/quarkus -am -Ppublish TAG=latest # Use the develop tag for snapshots diff --git a/buildtools/src/main/resources/docker/publishToGitHub.sh b/buildtools/src/main/resources/docker/publishToGitHub.sh index 69c4114fb..fb7498a56 100755 --- a/buildtools/src/main/resources/docker/publishToGitHub.sh +++ b/buildtools/src/main/resources/docker/publishToGitHub.sh @@ -5,7 +5,7 @@ VERSION=$(./mvnw -q help:evaluate -Dexpression=project.version -DforceStdout) # Publish releases only if [[ $VERSION != *SNAPSHOT* ]]; then - ./mvnw package -pl apps/quarkus -am + ./mvnw package -pl apps/quarkus -am -Ppublish cd apps/quarkus ################################## diff --git a/pom.xml b/pom.xml index ff93ce1eb..977a0f896 100644 --- a/pom.xml +++ b/pom.xml @@ -644,6 +644,19 @@ + + + publish + + true + true + true + true + true + + + + acoburn diff --git a/trellis-app/pom.xml b/trellis-app/pom.xml index 193646092..24a1bdf82 100644 --- a/trellis-app/pom.xml +++ b/trellis-app/pom.xml @@ -137,6 +137,13 @@ + + + src/main/resources + true + + + org.apache.maven.plugins diff --git a/trellis-app/src/main/resources/org/trellisldp/app/banner.txt b/trellis-app/src/main/resources/org/trellisldp/app/banner.txt index bc01ebe6d..8ad49e91b 100644 --- a/trellis-app/src/main/resources/org/trellisldp/app/banner.txt +++ b/trellis-app/src/main/resources/org/trellisldp/app/banner.txt @@ -18,5 +18,5 @@ tttttt:::::::tttttt rr::::::rrrrr::::::re::::::e e:::::el::::l l::::l i: tt:::::::::::ttr:::::r ee:::::::::::::e l::::::ll::::::li::::::i s:::::::::::ss ttttttttttt rrrrrrr eeeeeeeeeeeeee lllllllllllllllliiiiiiii sssssssssss -version: $version +version: ${project.version}