Merge commit 'a90e09b7d768f5632c55beba70842ea5957fd835' into HEAD

zanata · Sep 5, 2016 · a17d2e9 · a17d2e9
2 parents da89f5f + a90e09b
commit a17d2e9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM jboss/wildfly:10.0.0.Final
+FROM jboss/wildfly:10.1.0.Final
 
 USER root
 RUN yum -y install mysql-connector-java wget && yum clean all

diff --git a/docs/user-guide/system-admin/configuration/installation.md b/docs/user-guide/system-admin/configuration/installation.md
@@ -2,8 +2,8 @@ Zanata can be installed by downloading a web archive (war) file, and configuring
 
 ## What you need
 
-- JBoss Enterprise Application Platform 6 (EAP 6), version 6.4.6 or later. This is the recommended container for Zanata, and it can be [downloaded here](https://www.jboss.org/products/eap/download/).
-- ... OR WildFly (version 10.0.0.Final) which can be [downloaded here](http://wildfly.org/downloads/)
+- JBoss Enterprise Application Platform 6 (EAP 6), version 6.4.9 or later. This is the recommended container for Zanata, and it can be [downloaded here](https://www.jboss.org/products/eap/download/).
+- ... OR WildFly (version 10.1.0.Final) which can be [downloaded here](http://wildfly.org/downloads/)
 - A suitable MySQL database. This is NOT included in the Zanata archive. You can [download MySQL here](http://dev.mysql.com/downloads/mysql/).
 - An email (SMTP) server for email verification and notifications.
 - JDK version 1.8 or later. [OpenJDK](http://openjdk.java.net/install/) is recommended, but you can also download [Oracle's JDK](http://www.oracle.com/technetwork/java/javase/downloads/index.html)

diff --git a/pom.xml b/pom.xml
@@ -1947,7 +1947,7 @@
         <wildfly.client.version>8.1.0.Final</wildfly.client.version>
         <!-- used in the wildfly8 profile in zanata-war -->
         <!-- This is the server version -->
-        <wildfly.version>10.0.0.Final</wildfly.version>
+        <wildfly.version>10.1.0.Final</wildfly.version>
         <!-- In case this profile was activated by default: -->
         <appserver>wildfly8</appserver>
         <cargo.installation>https://repository.jboss.org/nexus/content/groups/developer/org/wildfly/wildfly-dist/${wildfly.version}/wildfly-dist-${wildfly.version}.zip</cargo.installation>

diff --git a/zanata-war/src/main/java/org/zanata/ZanataInit.java b/zanata-war/src/main/java/org/zanata/ZanataInit.java
@@ -82,9 +82,9 @@
 @Slf4j
 public class ZanataInit {
     private static final DefaultArtifactVersion MIN_EAP_VERSION =
-            new DefaultArtifactVersion("6.4.6.GA");
+            new DefaultArtifactVersion("6.4.9.GA");
     private static final DefaultArtifactVersion MIN_WILDFLY_VERSION =
-            new DefaultArtifactVersion("10.0.0.Final");
+            new DefaultArtifactVersion("10.1.0.Final");
 
 
     static {