You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/01/01 22:08:09 UTC
[1/4] guacamole-manual git commit: GUACAMOLE-423: Bump all versions
to 0.9.14.
Repository: guacamole-manual
Updated Branches:
refs/heads/master e3b1362e6 -> bd58591f1
GUACAMOLE-423: Bump all versions to 0.9.14.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-manual/commit/c814bd64
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-manual/tree/c814bd64
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-manual/diff/c814bd64
Branch: refs/heads/master
Commit: c814bd646c32683217d3eb9db031c20357b37f1f
Parents: 0be491d
Author: Michael Jumper <mj...@apache.org>
Authored: Fri Dec 29 13:11:13 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Jan 1 13:49:39 2018 -0800
----------------------------------------------------------------------
src/chapters/cas-auth.xml | 4 ++--
src/chapters/custom-auth.xml | 12 ++++++------
src/chapters/duo-auth.xml | 4 ++--
src/chapters/guacamole-ext.xml | 4 ++--
src/chapters/header-auth.xml | 4 ++--
src/chapters/installing.xml | 14 +++++++-------
src/chapters/jdbc-auth.xml | 16 ++++++++--------
src/chapters/ldap-auth.xml | 4 ++--
src/chapters/yourown.xml | 12 ++++++------
src/gug.xml | 4 ++--
tutorials/guacamole-auth-tutorial/pom.xml | 4 ++--
.../src/main/resources/guac-manifest.json | 2 +-
tutorials/guacamole-tutorial/pom.xml | 6 +++---
13 files changed, 45 insertions(+), 45 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c814bd64/src/chapters/cas-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/cas-auth.xml b/src/chapters/cas-auth.xml
index 16fa975..799425d 100644
--- a/src/chapters/cas-auth.xml
+++ b/src/chapters/cas-auth.xml
@@ -23,7 +23,7 @@
>http://guacamole.apache.org/releases/</link>.</para>
<para>The CAS authentication extension is packaged as a <filename>.tar.gz</filename>
file containing only the extension itself,
- <filename>guacamole-auth-cas-0.9.13-incubating.jar</filename>, which must
+ <filename>guacamole-auth-cas-0.9.14.jar</filename>, which must
ultimately be placed in <filename>GUACAMOLE_HOME/extensions</filename>.</para>
</section>
<section xml:id="installing-cas-auth">
@@ -40,7 +40,7 @@
does not already exist.</para>
</step>
<step>
- <para>Copy <filename>guacamole-auth-cas-0.9.13-incubating.jar</filename> within
+ <para>Copy <filename>guacamole-auth-cas-0.9.14.jar</filename> within
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
</step>
<step>
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c814bd64/src/chapters/custom-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/custom-auth.xml b/src/chapters/custom-auth.xml
index 0dd19f0..ec283ed 100644
--- a/src/chapters/custom-auth.xml
+++ b/src/chapters/custom-auth.xml
@@ -58,7 +58,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-tutorial</artifactId>
<packaging>jar</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-auth-tutorial</name>
<properties>
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>provided</scope>
</dependency>
@@ -172,7 +172,7 @@ public class TutorialAuthenticationProvider extends SimpleAuthenticationProvider
<title>The required <filename>guac-manifest.json</filename></title>
<programlisting>{
- "guacamoleVersion" : "0.9.13-incubating",
+ "guacamoleVersion" : "0.9.14",
"name" : "Tutorial Authentication Extension",
"namespace" : "guac-auth-tutorial",
@@ -196,7 +196,7 @@ public class TutorialAuthenticationProvider extends SimpleAuthenticationProvider
<screen><prompt>$</prompt> mvn package
<computeroutput>[INFO] Scanning for projects...
[INFO] ------------------------------------------------------------------------
-[INFO] Building guacamole-auth-tutorial 0.9.13-incubating
+[INFO] Building guacamole-auth-tutorial 0.9.14
[INFO] ------------------------------------------------------------------------
...
[INFO] ------------------------------------------------------------------------
@@ -210,7 +210,7 @@ public class TutorialAuthenticationProvider extends SimpleAuthenticationProvider
</informalexample>
<para>Assuming you see the "<computeroutput>BUILD SUCCESS</computeroutput>" message when you
build the extension, there will be a new file,
- <filename>target/guacamole-auth-tutorial-0.9.13-incubating.jar</filename>, which can be
+ <filename>target/guacamole-auth-tutorial-0.9.14.jar</filename>, which can be
installed within Guacamole and tested. If you changed the name or version of the project
in the <filename>pom.xml</filename> file, the name of this new <filename>.jar</filename>
file will be different, but it can still be found within
@@ -472,7 +472,7 @@ public Map<String, GuacamoleConfiguration>
user running Tomcat.</para>
<para>To install your extension, ensure that the required properties have been added to your
<filename>guacamole.properties</filename>, copy the
- <filename>target/guacamole-auth-tutorial-0.9.13-incubating.jar</filename> file into
+ <filename>target/guacamole-auth-tutorial-0.9.14.jar</filename> file into
<filename>GUACAMOLE_HOME/extensions</filename> and restart Tomcat. Guacamole will
automatically load your extension, logging an informative message that it has done
so:</para>
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c814bd64/src/chapters/duo-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/duo-auth.xml b/src/chapters/duo-auth.xml
index 79fe127..79b6a99 100644
--- a/src/chapters/duo-auth.xml
+++ b/src/chapters/duo-auth.xml
@@ -55,7 +55,7 @@
>http://guacamole.apache.org/releases/</link>.</para>
<para>The Duo authentication extension is packaged as a <filename>.tar.gz</filename> file
containing only the extension itself,
- <filename>guacamole-auth-duo-0.9.13-incubating.jar</filename>, which must ultimately
+ <filename>guacamole-auth-duo-0.9.14.jar</filename>, which must ultimately
be placed in <filename>GUACAMOLE_HOME/extensions</filename>.</para>
</section>
<section xml:id="installing-duo-auth">
@@ -69,7 +69,7 @@
does not already exist.</para>
</step>
<step>
- <para>Copy <filename>guacamole-auth-duo-0.9.13-incubating.jar</filename> within
+ <para>Copy <filename>guacamole-auth-duo-0.9.14.jar</filename> within
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
</step>
<step>
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c814bd64/src/chapters/guacamole-ext.xml
----------------------------------------------------------------------
diff --git a/src/chapters/guacamole-ext.xml b/src/chapters/guacamole-ext.xml
index 4be8770..7bcfc20 100644
--- a/src/chapters/guacamole-ext.xml
+++ b/src/chapters/guacamole-ext.xml
@@ -186,7 +186,7 @@
<filename>guac-manifest.json</filename> will look something like this:</para>
<informalexample>
<programlisting>{
- "guacamoleVersion" : "0.9.13-incubating",
+ "guacamoleVersion" : "0.9.14",
"name" : "My Extension",
"namespace" : "my-extension"
}</programlisting>
@@ -198,7 +198,7 @@
<informalexample>
<programlisting>{
- "guacamoleVersion" : "0.9.13-incubating",
+ "guacamoleVersion" : "0.9.14",
"name" : "My Extension",
"namespace" : "my-extension",
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c814bd64/src/chapters/header-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/header-auth.xml b/src/chapters/header-auth.xml
index fab1287..e0b741f 100644
--- a/src/chapters/header-auth.xml
+++ b/src/chapters/header-auth.xml
@@ -29,7 +29,7 @@
>http://guacamole.apache.org/releases/</link>.</para>
<para>The HTTP header authentication extension is packaged as a <filename>.tar.gz</filename>
file containing only the extension itself,
- <filename>guacamole-auth-header-0.9.13-incubating.jar</filename>, which must
+ <filename>guacamole-auth-header-0.9.14.jar</filename>, which must
ultimately be placed in <filename>GUACAMOLE_HOME/extensions</filename>.</para>
</section>
<section xml:id="installing-header-auth">
@@ -46,7 +46,7 @@
does not already exist.</para>
</step>
<step>
- <para>Copy <filename>guacamole-auth-header-0.9.13-incubating.jar</filename> within
+ <para>Copy <filename>guacamole-auth-header-0.9.14.jar</filename> within
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
</step>
<step>
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c814bd64/src/chapters/installing.xml
----------------------------------------------------------------------
diff --git a/src/chapters/installing.xml b/src/chapters/installing.xml
index 0584c25..0e65eb5 100644
--- a/src/chapters/installing.xml
+++ b/src/chapters/installing.xml
@@ -555,8 +555,8 @@
of a <filename>.tar.gz</filename> archive which you can extract from the command
line:</para>
<informalexample>
- <screen><prompt>$</prompt> <userinput>tar -xzf guacamole-server-0.9.13-incubating.tar.gz</userinput>
-<prompt>$</prompt> <userinput>cd guacamole-server-0.9.13-incubating/</userinput>
+ <screen><prompt>$</prompt> <userinput>tar -xzf guacamole-server-0.9.14.tar.gz</userinput>
+<prompt>$</prompt> <userinput>cd guacamole-server-0.9.14/</userinput>
<prompt>$</prompt></screen>
</informalexample>
<para>If you want the absolute latest code, and don't care that the code hasn't been as
@@ -608,7 +608,7 @@ checking whether build environment is sane... yes
...
------------------------------------------------
-guacamole-server version 0.9.13-incubating
+guacamole-server version 0.9.14
------------------------------------------------
Library status:
@@ -784,8 +784,8 @@ make[1]: Leaving directory `/home/zhz/guacamole/guacamole-server'</computeroutpu
<filename>.tar.gz</filename> archive which you can extract from the command
line:</para>
<informalexample>
- <screen><prompt>$</prompt> <userinput>tar -xzf guacamole-client-0.9.13-incubating.tar.gz</userinput>
-<prompt>$</prompt> <userinput>cd guacamole-client-0.9.13-incubating/</userinput>
+ <screen><prompt>$</prompt> <userinput>tar -xzf guacamole-client-0.9.14.tar.gz</userinput>
+<prompt>$</prompt> <userinput>cd guacamole-client-0.9.14/</userinput>
<prompt>$</prompt></screen>
</informalexample>
<para>As with <package>guacamole-server</package>, if you want the absolute latest code, and
@@ -879,7 +879,7 @@ Resolving deltas: 100% (3942/3942), done.</computeroutput>
application from the name of the <filename>.war</filename> file, you will likely want to
rename this to simply <filename>guacamole.war</filename> while copying:</para>
<informalexample>
- <screen><prompt>#</prompt> <userinput>cp guacamole/target/guacamole-0.9.13-incubating.war <replaceable>/var/lib/tomcat/webapps</replaceable>/guacamole.war</userinput>
+ <screen><prompt>#</prompt> <userinput>cp guacamole/target/guacamole-0.9.14.war <replaceable>/var/lib/tomcat/webapps</replaceable>/guacamole.war</userinput>
<prompt>#</prompt></screen>
</informalexample>
<para>Again, if you are using a different servlet container or if Tomcat is installed to a
@@ -897,7 +897,7 @@ Resolving deltas: 100% (3942/3942), done.</computeroutput>
Starting Tomcat... OK</computeroutput>
<prompt>#</prompt> <userinput>/etc/init.d/guacd start</userinput>
<computeroutput>Starting guacd: SUCCESS
-guacd[6229]: INFO: Guacamole proxy daemon (guacd) version 0.9.13-incubating started</computeroutput>
+guacd[6229]: INFO: Guacamole proxy daemon (guacd) version 0.9.14 started</computeroutput>
<prompt>#</prompt></screen>
</informalexample>
<important>
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c814bd64/src/chapters/jdbc-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/jdbc-auth.xml b/src/chapters/jdbc-auth.xml
index ac6eeaf..dc9ebc2 100644
--- a/src/chapters/jdbc-auth.xml
+++ b/src/chapters/jdbc-auth.xml
@@ -61,10 +61,10 @@
<term><filename>mysql/</filename></term>
<listitem>
<para>Contains the MySQL/MariaDB authentication extension,
- <filename>guacamole-auth-jdbc-mysql-0.9.13-incubating.jar</filename>,
+ <filename>guacamole-auth-jdbc-mysql-0.9.14.jar</filename>,
along with a <filename>schema/</filename> directory containing
MySQL-specific SQL scripts required to set up the database. The
- <filename>guacamole-auth-jdbc-mysql-0.9.13-incubating.jar</filename>
+ <filename>guacamole-auth-jdbc-mysql-0.9.14.jar</filename>
file will ultimately need to be placed within
<filename>GUACAMOLE_HOME/extensions</filename>, while the MySQL JDBC
driver must be placed within <filename>GUACAMOLE_HOME/lib</filename>.</para>
@@ -81,10 +81,10 @@
<term><filename>postgresql/</filename></term>
<listitem>
<para>Contains the PostgreSQL authentication extension,
- <filename>guacamole-auth-jdbc-postgresql-0.9.13-incubating.jar</filename>,
+ <filename>guacamole-auth-jdbc-postgresql-0.9.14.jar</filename>,
along with a <filename>schema/</filename> directory containing
PostgreSQL-specific SQL scripts required to set up the database. The
- <filename>guacamole-auth-jdbc-postgresql-0.9.13-incubating.jar</filename>
+ <filename>guacamole-auth-jdbc-postgresql-0.9.14.jar</filename>
file will ultimately need to be placed within
<filename>GUACAMOLE_HOME/extensions</filename>, while the PostgreSQL
JDBC driver must be placed within
@@ -101,7 +101,7 @@
<term><filename>sqlserver/</filename></term>
<listitem>
<para>Contains the SQL Server authentication extension,
- <filename>guacamole-auth-jdbc-sqlserver-0.9.13-incubating.jar</filename>,
+ <filename>guacamole-auth-jdbc-sqlserver-0.9.14.jar</filename>,
along with a <filename>schema/</filename> directory contains SQL Server-specific
scripts requires to set up the database. The JAR extension file will need to be
placed within the <filename>GUACAMOLE_HOME/extensions</filename> folder, while the
@@ -409,11 +409,11 @@ The new rule has been bound to column(s) of the specified user data type.</compu
does not already exist.</para>
</step>
<step>
- <para>Copy <filename>guacamole-auth-jdbc-mysql-0.9.13-incubating.jar</filename>
+ <para>Copy <filename>guacamole-auth-jdbc-mysql-0.9.14.jar</filename>
<emphasis>or</emphasis>
- <filename>guacamole-auth-jdbc-postgresql-0.9.13-incubating.jar</filename>
+ <filename>guacamole-auth-jdbc-postgresql-0.9.14.jar</filename>
<emphasis>or</emphasis>
- <filename>guacamole-auth-jdbc-sqlserver-0.9.13-incubating.jar</filename> within
+ <filename>guacamole-auth-jdbc-sqlserver-0.9.14.jar</filename> within
<filename>GUACAMOLE_HOME/extensions</filename>, depending on whether you are
using MySQL/MariaDB, PostgreSQL, or SQL Server.</para>
</step>
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c814bd64/src/chapters/ldap-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/ldap-auth.xml b/src/chapters/ldap-auth.xml
index 0474b1e..1c4b8bc 100644
--- a/src/chapters/ldap-auth.xml
+++ b/src/chapters/ldap-auth.xml
@@ -83,7 +83,7 @@
containing:</para>
<variablelist>
<varlistentry>
- <term><filename>guacamole-auth-ldap-0.9.13-incubating.jar</filename></term>
+ <term><filename>guacamole-auth-ldap-0.9.14.jar</filename></term>
<listitem>
<para>The Guacamole LDAP support extension itself, which must be placed in
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
@@ -211,7 +211,7 @@ dn: cn={4}guacConfigGroup,cn=schema,cn=config
does not already exist.</para>
</step>
<step>
- <para>Copy <filename>guacamole-auth-ldap-0.9.13-incubating.jar</filename> within
+ <para>Copy <filename>guacamole-auth-ldap-0.9.14.jar</filename> within
<filename>GUACAMOLE_HOME/extensions</filename>.</para>
</step>
<step>
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c814bd64/src/chapters/yourown.xml
----------------------------------------------------------------------
diff --git a/src/chapters/yourown.xml b/src/chapters/yourown.xml
index 7687fc1..7a2a479 100644
--- a/src/chapters/yourown.xml
+++ b/src/chapters/yourown.xml
@@ -112,7 +112,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-tutorial</artifactId>
<packaging>war</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-tutorial</name>
<properties>
@@ -201,7 +201,7 @@
</informalexample>
<para>Assuming you see the "<computeroutput>BUILD SUCCESSFUL</computeroutput>" message
when you build the web application, there will be a new file,
- <filename>target/guacamole-tutorial-0.9.13-incubating.war</filename>, which
+ <filename>target/guacamole-tutorial-0.9.14.war</filename>, which
can be deployed to your servlet container and tested. If you changed the name or
version of the project in the <filename>pom.xml</filename> file, the name of this new
<filename>.war</filename> file will be different, but it can still be found
@@ -304,7 +304,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>compile</scope>
</dependency>
@@ -312,7 +312,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>
@@ -331,7 +331,7 @@
web application should build successfully, and the Guacamole JavaScript API should
be accessible in the <filename>guacamole-common-js/</filename> subdirectory of your
web application after it is deployed. A quick check that you can access
- <uri>/guacamole-tutorial-0.9.13-incubating/guacamole-common-js/all.min.js</uri>
+ <uri>/guacamole-tutorial-0.9.14/guacamole-common-js/all.min.js</uri>
is probably worth the effort.</para>
</section>
<section xml:id="simple-tunnel">
@@ -430,7 +430,7 @@ public class TutorialGuacamoleTunnelServlet
to the URL we wish to use when making HTTP requests to the servlet:
<uri>/tunnel</uri>. This URL is relative to the context root of the web
application. In the case of this web application, the final absolute URL will be
- <uri>/guacamole-tutorial-0.9.13-incubating/tunnel</uri>.</para>
+ <uri>/guacamole-tutorial-0.9.14/tunnel</uri>.</para>
</section>
<section xml:id="simple-client">
<title>Adding the client</title>
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c814bd64/src/gug.xml
----------------------------------------------------------------------
diff --git a/src/gug.xml b/src/gug.xml
index 70c4e33..56e9123 100644
--- a/src/gug.xml
+++ b/src/gug.xml
@@ -3,7 +3,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude">
<info>
<title>Guacamole Manual</title>
- <edition>0.9.13-incubating</edition>
+ <edition>0.9.14</edition>
<legalnotice>
<para>Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the <link xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -42,7 +42,7 @@
application, etc.) to give a good starting point beyond simply looking at the Guacamole
codebase.</para>
<para>This particular edition of the <citetitle>Guacamole Manual</citetitle> covers
- Guacamole version 0.9.13-incubating. New releases which create new features or break
+ Guacamole version 0.9.14. New releases which create new features or break
compatibility will result in new editions of the user's guide, as will any necessary
corrections. As the official documentation for the project, this book will always be
freely available in its entirety online.</para>
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c814bd64/tutorials/guacamole-auth-tutorial/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-auth-tutorial/pom.xml b/tutorials/guacamole-auth-tutorial/pom.xml
index 16fd698..6e31acd 100644
--- a/tutorials/guacamole-auth-tutorial/pom.xml
+++ b/tutorials/guacamole-auth-tutorial/pom.xml
@@ -7,7 +7,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-tutorial</artifactId>
<packaging>jar</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-auth-tutorial</name>
<properties>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c814bd64/tutorials/guacamole-auth-tutorial/src/main/resources/guac-manifest.json
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-auth-tutorial/src/main/resources/guac-manifest.json b/tutorials/guacamole-auth-tutorial/src/main/resources/guac-manifest.json
index de41ea4..b6c1b26 100644
--- a/tutorials/guacamole-auth-tutorial/src/main/resources/guac-manifest.json
+++ b/tutorials/guacamole-auth-tutorial/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "0.9.12-incubating",
+ "guacamoleVersion" : "0.9.14",
"name" : "Tutorial Authentication Extension",
"namespace" : "guac-auth-tutorial",
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/c814bd64/tutorials/guacamole-tutorial/pom.xml
----------------------------------------------------------------------
diff --git a/tutorials/guacamole-tutorial/pom.xml b/tutorials/guacamole-tutorial/pom.xml
index 0dc68d4..2105f34 100644
--- a/tutorials/guacamole-tutorial/pom.xml
+++ b/tutorials/guacamole-tutorial/pom.xml
@@ -7,7 +7,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-tutorial</artifactId>
<packaging>war</packaging>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<name>guacamole-tutorial</name>
<properties>
@@ -62,7 +62,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<scope>compile</scope>
</dependency>
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
- <version>0.9.13-incubating</version>
+ <version>0.9.14</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>
[3/4] guacamole-manual git commit: GUACAMOLE-423: Merge bunmp version
numbers in manual to 0.9.14.
Posted by vn...@apache.org.
GUACAMOLE-423: Merge bunmp version numbers in manual to 0.9.14.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-manual/commit/b391a76e
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-manual/tree/b391a76e
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-manual/diff/b391a76e
Branch: refs/heads/master
Commit: b391a76ebcf78c8120e40fd5e895342f774296cf
Parents: 0be491d 81b4f57
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Jan 1 17:05:37 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Jan 1 17:05:37 2018 -0500
----------------------------------------------------------------------
src/chapters/cas-auth.xml | 4 +-
src/chapters/custom-auth.xml | 12 ++---
src/chapters/duo-auth.xml | 4 +-
src/chapters/guacamole-ext.xml | 4 +-
src/chapters/header-auth.xml | 4 +-
src/chapters/installing.xml | 14 +++---
src/chapters/jdbc-auth.xml | 49 +++++++-------------
src/chapters/ldap-auth.xml | 4 +-
src/chapters/yourown.xml | 12 ++---
src/gug.xml | 4 +-
tutorials/guacamole-auth-tutorial/pom.xml | 4 +-
.../src/main/resources/guac-manifest.json | 2 +-
tutorials/guacamole-tutorial/pom.xml | 6 +--
13 files changed, 55 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
[2/4] guacamole-manual git commit: GUACAMOLE-423: Reword database
upgrade documentation,
removing the list of all current upgrade scripts which tends to change each
release.
Posted by vn...@apache.org.
GUACAMOLE-423: Reword database upgrade documentation, removing the list of all current upgrade scripts which tends to change each release.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-manual/commit/81b4f571
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-manual/tree/81b4f571
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-manual/diff/81b4f571
Branch: refs/heads/master
Commit: 81b4f57124c0dc0778ee06bfe9428dda61f55942
Parents: c814bd6
Author: Michael Jumper <mj...@apache.org>
Authored: Mon Jan 1 13:52:56 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Jan 1 13:52:56 2018 -0800
----------------------------------------------------------------------
src/chapters/jdbc-auth.xml | 33 ++++++++++-----------------------
1 file changed, 10 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/81b4f571/src/chapters/jdbc-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/jdbc-auth.xml b/src/chapters/jdbc-auth.xml
index dc9ebc2..66c8c09 100644
--- a/src/chapters/jdbc-auth.xml
+++ b/src/chapters/jdbc-auth.xml
@@ -227,20 +227,13 @@ Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
is named <filename>upgrade-pre-<replaceable>VERSION</replaceable>.sql</filename>
where <replaceable>VERSION</replaceable> is the version of Guacamole where those
changes were introduced. They need to be run when you are upgrading from a
- version of Guacamole older than <replaceable>VERSION</replaceable>:</para>
- <informalexample>
- <screen><prompt>$</prompt> <userinput>ls schema/upgrade/</userinput>
-<computeroutput>upgrade-pre-0.8.2.sql upgrade-pre-0.9.13.sql upgrade-pre-0.9.8.sql
-upgrade-pre-0.9.10.sql upgrade-pre-0.9.6.sql upgrade-pre-0.9.9.sql
-upgrade-pre-0.9.11.sql upgrade-pre-0.9.7.sql</computeroutput>
-<prompt>$</prompt></screen>
- </informalexample>
+ version of Guacamole older than <replaceable>VERSION</replaceable>.</para>
<para>These scripts are incremental and, when relevant, <emphasis>must be run in
order</emphasis>. For example, if you are upgrading an existing database
- from version 0.9.10-incubating, you would need to run the
- <filename>upgrade-pre-0.9.11.sql</filename> script (because 0.9.10 is older
- than 0.9.11), followed by the <filename>upgrade-pre-0.9.13.sql</filename> script
- (because 0.9.10 is also older than 0.9.13):</para>
+ from version 0.9.10-incubating to version 0.9.13-incubating, you would need to
+ run the <filename>upgrade-pre-0.9.11.sql</filename> script (because 0.9.10 is
+ older than 0.9.11), followed by the <filename>upgrade-pre-0.9.13.sql</filename>
+ script (because 0.9.10 is also older than 0.9.13):</para>
<informalexample>
<screen><prompt>$</prompt> <userinput>mysql -u root -p <replaceable>guacamole_db</replaceable> < schema/upgrade/upgrade-pre-0.9.11.sql</userinput>
<prompt>Enter password:</prompt> <userinput><replaceable>password</replaceable></userinput>
@@ -301,19 +294,13 @@ Type "help" for help.
<filename>upgrade-pre-<replaceable>VERSION</replaceable>.sql</filename>
where <replaceable>VERSION</replaceable> is the version of Guacamole where those
changes were introduced. They need to be run when you are upgrading from a
- version of Guacamole older than <replaceable>VERSION</replaceable>:</para>
- <informalexample>
- <screen><prompt>$</prompt> <userinput>ls schema/upgrade/</userinput>
-<computeroutput>upgrade-pre-0.9.10.sql upgrade-pre-0.9.13.sql upgrade-pre-0.9.8.sql
-upgrade-pre-0.9.11.sql upgrade-pre-0.9.7.sql upgrade-pre-0.9.9.sql</computeroutput>
-<prompt>$</prompt></screen>
- </informalexample>
+ version of Guacamole older than <replaceable>VERSION</replaceable>.</para>
<para>These scripts are incremental and, when relevant, <emphasis>must be run in
order</emphasis>. For example, if you are upgrading an existing database
- from version 0.9.10-incubating, you would need to run the
- <filename>upgrade-pre-0.9.11.sql</filename> script (because 0.9.10 is older
- than 0.9.11), followed by the <filename>upgrade-pre-0.9.13.sql</filename> script
- (because 0.9.10 is also older than 0.9.13):</para>
+ from version 0.9.10-incubating to version 0.9.13-incubating, you would need to
+ run the <filename>upgrade-pre-0.9.11.sql</filename> script (because 0.9.10 is
+ older than 0.9.11), followed by the <filename>upgrade-pre-0.9.13.sql</filename>
+ script (because 0.9.10 is also older than 0.9.13):</para>
<informalexample>
<screen><prompt>$</prompt> <userinput>psql -d <replaceable>guacamole_db</replaceable> -f schema/upgrade/upgrade-pre-0.9.11.sql</userinput>
<computeroutput>ALTER TABLE
[4/4] guacamole-manual git commit: Merge 0.9.14 changes back to
master.
Posted by vn...@apache.org.
Merge 0.9.14 changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-manual/commit/bd58591f
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-manual/tree/bd58591f
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-manual/diff/bd58591f
Branch: refs/heads/master
Commit: bd58591f179bca9a8c303386b6e95cd3ad39f293
Parents: e3b1362 b391a76
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Jan 1 17:07:41 2018 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Jan 1 17:07:41 2018 -0500
----------------------------------------------------------------------
src/chapters/cas-auth.xml | 4 +-
src/chapters/custom-auth.xml | 12 ++---
src/chapters/duo-auth.xml | 4 +-
src/chapters/guacamole-ext.xml | 4 +-
src/chapters/header-auth.xml | 4 +-
src/chapters/installing.xml | 14 +++---
src/chapters/jdbc-auth.xml | 49 +++++++-------------
src/chapters/ldap-auth.xml | 4 +-
src/chapters/yourown.xml | 12 ++---
src/gug.xml | 4 +-
tutorials/guacamole-auth-tutorial/pom.xml | 4 +-
.../src/main/resources/guac-manifest.json | 2 +-
tutorials/guacamole-tutorial/pom.xml | 6 +--
13 files changed, 55 insertions(+), 68 deletions(-)
----------------------------------------------------------------------