1
0
mirror of https://github.com/octoleo/plantuml-server.git synced 2024-12-23 01:08:54 +00:00

[TASK] Merge branch 'slavisah-portconfig'

This commit is contained in:
maximesinclair 2015-02-14 22:52:14 +01:00
commit e08b3dc174

View File

@ -34,6 +34,12 @@
<webApp> <webApp>
<contextPath>/plantuml</contextPath> <contextPath>/plantuml</contextPath>
</webApp> </webApp>
<systemProperties>
<systemProperty>
<name>jetty.port</name>
<value>${jetty.port}</value>
</systemProperty>
</systemProperties>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -142,6 +148,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.version>8.0.4.v20111024</jetty.version> <jetty.version>8.0.4.v20111024</jetty.version>
<jetty.port>8080</jetty.port>
<maven.build.timestamp.format>yyyyMMdd-HHmm <maven.build.timestamp.format>yyyyMMdd-HHmm
</maven.build.timestamp.format> </maven.build.timestamp.format>
<timestamp>${maven.build.timestamp}</timestamp> <timestamp>${maven.build.timestamp}</timestamp>