Author: olamy
Date: Sat Dec 24 00:00:54 2011
New Revision: 1222891
URL: http://svn.apache.org/viewvc?rev=1222891&view=rev
Log:
add filtering on ServerInfo.properties
Added:
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/apache/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/apache/catalina/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/apache/catalina/util/
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
- copied, changed from r1222868,
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/util/ServerInfo.properties
Removed:
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/util/ServerInfo.properties
Modified:
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml
Modified: tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml?rev=1222891&r1=1222890&r2=1222891&view=diff
==============================================================================
--- tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml (original)
+++ tomcat/sandbox/trunk-mvn-build/tomcat-catalina/pom.xml Sat Dec 24 00:00:54
2011
@@ -77,6 +77,7 @@
<resources>
<resource>
<directory>src/main/resources</directory>
+ <filtering>true</filtering>
</resource>
<resource>
<directory>src/main/java</directory>
@@ -86,6 +87,28 @@
</includes>
</resource>
</resources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <format>{0,date,MMM d yyyy hh:mm:ss}</format>
+ <items>
+ <item>timestamp</item>
+ </items>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<!--
Copied:
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
(from r1222868,
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/util/ServerInfo.properties)
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties?p2=tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties&p1=tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/util/ServerInfo.properties&r1=1222868&r2=1222891&rev=1222891&view=diff
==============================================================================
---
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/java/org/apache/catalina/util/ServerInfo.properties
(original)
+++
tomcat/sandbox/trunk-mvn-build/tomcat-catalina/src/main/resources/org/apache/catalina/util/ServerInfo.properties
Sat Dec 24 00:00:54 2011
@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-server.info=Apache Tomcat/@VERSION@
-server.number=@VERSION_NUMBER@
-server.built=@VERSION_BUILT@
\ No newline at end of file
+server.info=Apache Tomcat/${project.version}
+server.number=${project.version}
+server.built=${buildNumber}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
