Add publish profile, better resource filtering

trellis-ldp · Oct 12, 2023 · 9789f42 · 9789f42
1 parent 185ffa1
commit 9789f42
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -644,6 +644,19 @@
     </plugins>
   </reporting>
 
+  <profiles>
+    <profile>
+      <id>publish</id>
+      <properties>
+        <skipTests>true</skipTests>
+        <pmd.skip>true</pmd.skip>
+        <cpd.skip>true</cpd.skip>
+        <jacoco.skip>true</jacoco.skip>
+        <checkstyle.skip>true</checkstyle.skip>
+      </properties>
+    </profile>
+  </profiles>
+
   <developers>
     <developer>
       <id>acoburn</id>

diff --git a/trellis-app/pom.xml b/trellis-app/pom.xml
@@ -137,6 +137,13 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git 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}