update history and version

ILLGrenoble · Mar 21, 2023 · 26a47cf · 26a47cf
1 parent 44a2ab3
commit 26a47cf
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 22 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,10 @@
+2.6.0 21/03/2023
+================
+ * Ensure instance expirations are removed when an instance termination date is set to null (immortal)
+ * Add role-based flavour limits (flavour only available to users with specified roles)
+ * Add WebX as a remote desktop implementation (some features unavailable such as instance sharing and screen capture)
+ * Refactor remote desktop to add abstraction layer to implementation
+
 2.5.1 23/01/2023
 ================
  * Fix tests

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>eu.ill.visa</groupId>
     <artifactId>api</artifactId>
-    <version>2.5.1</version>
+    <version>2.6.0</version>
     <modules>
         <module>visa-app</module>
         <module>visa-business</module>

diff --git a/visa-app/pom.xml b/visa-app/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>2.5.1</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,7 +14,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-web</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/visa-business/pom.xml b/visa-business/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>2.5.1</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,17 +25,17 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-core</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-persistence</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-cloud</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.simplejavamail</groupId>

diff --git a/visa-cloud/pom.xml b/visa-cloud/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>2.5.1</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/visa-core/pom.xml b/visa-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>2.5.1</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/visa-persistence/pom.xml b/visa-persistence/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>2.5.1</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-core</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
         </dependency>
         <dependency>
             <groupId>javax.persistence</groupId>

diff --git a/visa-remote-desktop/pom.xml b/visa-remote-desktop/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>2.5.1</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.guacamole</groupId>

diff --git a/visa-scheduler/pom.xml b/visa-scheduler/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>2.5.1</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
         </dependency>
         <!-- Module specific dependencies -->
         <dependency>

diff --git a/visa-security/pom.xml b/visa-security/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>2.5.1</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>visa-security</artifactId>
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
         </dependency>
         <!-- Module specific dependencies -->
         <dependency>

diff --git a/visa-web/pom.xml b/visa-web/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api</artifactId>
         <groupId>eu.ill.visa</groupId>
-        <version>2.5.1</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,22 +26,22 @@
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-business</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-security</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-scheduler</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
         </dependency>
         <dependency>
             <groupId>eu.ill.visa</groupId>
             <artifactId>visa-remote-desktop</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.0</version>
         </dependency>
         <!-- Dropwizard dependencies -->
         <dependency>