Commit e267ae4b by Antti Tönkyrä

Merge branch 'devel' into 'master'

PrimeFaces

MoyaWeb uses PrimeFaces 5.0, MoyaEventMgmtWeb and MoyaTerminalWeb still use 5.0-RC2. Update to 5.0.
2 parents fa23e714 324edfa4
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<dependency> <dependency>
<groupId>org.primefaces</groupId> <groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId> <artifactId>primefaces</artifactId>
<version>5.0.RC2</version> <version>5.0</version>
</dependency> </dependency>
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<dependency> <dependency>
<groupId>org.primefaces</groupId> <groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId> <artifactId>primefaces</artifactId>
<version>5.0.RC2</version> <version>5.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.bull.javamelody</groupId> <groupId>net.bull.javamelody</groupId>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!