Merge 1.5.0 changes back to master.
This commit is contained in:
commit
9f176ed489
90 files changed
+638
-359
No files matched your search
@@ -32,7 +32,7 @@
|
||||
<parent>
|
||||
<groupId>org.apache.guacamole</groupId>
|
||||
<artifactId>guacamole-auth-jdbc</artifactId>
|
||||
<version>1.4.0</version>
|
||||
<version>1.5.0</version>
|
||||
<relativePath>../../</relativePath>
|
||||
</parent>
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
<dependency>
|
||||
<groupId>org.mybatis</groupId>
|
||||
<artifactId>mybatis-guice</artifactId>
|
||||
<version>3.17</version>
|
||||
<version>3.18</version>
|
||||
<exclusions>
|
||||
|
||||
<!-- This dependency appears to be necessary only to provide an
|
||||
|
||||
Reference in new issue
Block a user