Skip to content

Commit c2697fa

Browse files
jmuehlnerjmuehlner
committed
Merge 1.5.5 changes back to master.
2 parents a0b2d1f + 4c24bfd commit c2697fa

File tree

16 files changed

+17
-16
lines changed

16 files changed

+17
-16
lines changed

‎extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "Duo TFA Authentication Backend",
66
"namespace" : "duo",

‎extensions/guacamole-auth-header/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "HTTP Header Authentication Extension",
66
"namespace" : "header",

‎extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "MySQL Authentication",
66
"namespace" : "mysql",

‎extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "PostgreSQL Authentication",
66
"namespace" : "postgresql",

‎extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "SQLServer Authentication",
66
"namespace" : "sqlserver",

‎extensions/guacamole-auth-json/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "Encrypted JSON Authentication",
66
"namespace" : "json",

‎extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "LDAP Authentication",
66
"namespace" : "ldap",

‎extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"guacamoleVersion" : "1.5.4",
2+
"guacamoleVersion" : "1.5.5",
33

44
"name" : "Adhoc Guacamole Connections",
55
"namespace" : "quickconnect",

‎extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "RADIUS Authentication Backend",
66
"namespace" : "radius",

‎extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "CAS Authentication Extension",
66
"namespace" : "cas",

‎extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "OpenID Authentication Extension",
66
"namespace" : "openid",

‎extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "SAML Authentication Extension",
66
"namespace" : "saml",

‎extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "TOTP TFA Authentication Backend",
66
"namespace" : "totp",

‎extensions/guacamole-history-recording-storage/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "Session Recording Storage",
66
"namespace" : "recording-storage",

‎extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/resources/guac-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22

3-
"guacamoleVersion" : "1.5.4",
3+
"guacamoleVersion" : "1.5.5",
44

55
"name" : "Keeper Secrets Manager",
66
"namespace" : "keeper-secrets-manager",

‎guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ public class ExtensionModule extends ServletModule {
7373
"1.5.1",
7474
"1.5.2",
7575
"1.5.3",
76-
"1.5.4"
76+
"1.5.4",
77+
"1.5.5"
7778
));
7879

7980
/**

0 commit comments

Comments
 (0)