#35 BUILD

sttc · Jul 20, 2023 · 1809d61 · 1809d61
1 parent 7c1c521
commit 1809d61
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.rultor.yml b/.rultor.yml
@@ -14,6 +14,10 @@ release:
   script: |
     mvn versions:set "-DnewVersion=${tag}"
     git commit -am "${tag}"
+    build=$(git rev-parse --short HEAD)
+    sed -i "s/BUILD/${build}/g" src/main/resources/webapp/META-INF/MANIFEST.MF
+    git add src/main/resources/webapp/META-INF/MANIFEST.MF
+    git commit -m 'build number set'
     cp ../settings.xml settings.xml
     mvn clean package -Pqulice -Psttc-web --errors --batch-mode
     git remote add dokku dokku@www.stateful.co:stateful

diff --git a/src/main/resources/co/stateful/rest/exception.html.vm b/src/main/resources/co/stateful/rest/exception.html.vm
@@ -3,17 +3,17 @@
     <head>
         <title>Internal application error</title>
         <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"/>
-        <link href="/css/layout.css?${buildNumber}" rel="stylesheet" type="text/css"/>
-        <link rel="icon" type="image/gif" href="//img.stateful.co/favicon.ico?${buildNumber}"/>
+        <link href="/css/layout.css" rel="stylesheet" type="text/css"/>
+        <link rel="icon" type="image/gif" href="//img.stateful.co/favicon.ico"/>
     </head>
     <body>
         <p>
             <a href="/">
-                <img src="//img.stateful.co/pomegranate.svg?${buildNumber}" class="logo"/>
+                <img src="//img.stateful.co/pomegranate.svg" class="logo"/>
             </a>
         </p>
         <p class="alert alert-danger">
-            Internal application error (<code>${buildNumber}</code>).
+            Internal application error.
         </p>
         <pre>${text}</pre>
     </body>

diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
@@ -36,6 +36,6 @@ log4j.appender.SYSLOG.facilityPrinting=true
 log4j.appender.SYSLOG.header=true
 log4j.appender.SYSLOG.syslogHost=${syslogHost}
 log4j.appender.SYSLOG.layout=org.apache.log4j.PatternLayout
-log4j.appender.SYSLOG.layout.ConversionPattern=[%p] %t ${buildNumber} %c: %m%n
+log4j.appender.SYSLOG.layout.ConversionPattern=[%p] %t BUILD %c: %m%n
 
 log4j.logger.co.stateful=INFO
diff --git a/src/main/resources/webapp/META-INF/MANIFEST.MF b/src/main/resources/webapp/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Stateful-Version: ${project.version}
-Stateful-Revision: ${buildNumber}
+Stateful-Revision: BUILD
 Stateful-Date: ${maven.build.timestamp}
 Stateful-FbId: ${fb.id}
 Stateful-FbSecret: ${fb.secret}