From 40775ef9b9c8f825d46277b06ca3cd49ddbbbf58 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Mon, 20 May 2013 16:00:02 +0200
Subject: [PATCH] Added a filtering to put the version string into the about
dialog.
---
Kieker.WebGUI/pom.xml | 14 ++++++++++++++
.../src/main/webapp/dialogs/AboutDialog.xhtml | 2 +-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index bb283df5..44d9814e 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -29,6 +29,7 @@
<klay.jar>klay_0.2.0.jar</klay.jar>
<spring.version>3.1.2.RELEASE</spring.version>
<slf4j.version>1.7.2</slf4j.version>
+ <display_version>${project.version}</display_version>
</properties>
<repositories>
@@ -357,6 +358,19 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<configuration>
+ <nonFilteredFileExtensions>
+ <nonFilteredFileExtension>gif</nonFilteredFileExtension>
+ <nonFilteredFileExtension>ico</nonFilteredFileExtension>
+ <nonFilteredFileExtension>jpg</nonFilteredFileExtension>
+ <nonFilteredFileExtension>png</nonFilteredFileExtension>
+ <nonFilteredFileExtension>pdf</nonFilteredFileExtension>
+ </nonFilteredFileExtensions>
+ <webResources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
diff --git a/Kieker.WebGUI/src/main/webapp/dialogs/AboutDialog.xhtml b/Kieker.WebGUI/src/main/webapp/dialogs/AboutDialog.xhtml
index 13d745f2..bb1d733b 100644
--- a/Kieker.WebGUI/src/main/webapp/dialogs/AboutDialog.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/dialogs/AboutDialog.xhtml
@@ -13,7 +13,7 @@
<h:outputText value="Kieker.WebGUI" />
<br />
<br />
- <h:outputText value="Version: 1.8-SNAPSHOT" />
+ <h:outputText value="Version: ${display_version}" />
<br />
<h:outputText value="Copyright (c) 2013 Kieker Project" />
<br />
--
GitLab