Bump dependencies, remove feature flag around branches.

Author: simonbrowndotje

structurizr-onpremises/Dockerfile

@@ -1,4 +1,4 @@
-FROM tomcat:10.1.35-jre21-temurin-noble
+FROM tomcat:10.1.39-jre21-temurin-noble
 ENV PORT=8080
 
 RUN set -eux; \

structurizr-onpremises/build.gradle

@@ -60,15 +60,15 @@ dependencies {
 
 	implementation 'javax.annotation:javax.annotation-api:1.3.2'
 
-	def springVersion = '6.2.3'
-	def springSecurityVersion = '6.3.5'
+	def springVersion = '6.2.5'
+	def springSecurityVersion = '6.4.4'
 	implementation "org.springframework:spring-webmvc:${springVersion}"
 	implementation "org.springframework.security:spring-security-web:${springSecurityVersion}"
 	implementation "org.springframework.security:spring-security-config:${springSecurityVersion}"
 	implementation "org.springframework.security:spring-security-ldap:${springSecurityVersion}"
 	implementation "org.springframework.security:spring-security-saml2-service-provider:${springSecurityVersion}"
 	implementation 'org.springframework.session:spring-session-data-redis:3.3.3'
-	implementation 'redis.clients:jedis:5.1.5'
+	implementation 'redis.clients:jedis:5.2.0'
 
 	def luceneVersion = '9.12.0'
 	implementation "org.apache.lucene:lucene-core:${luceneVersion}"
@@ -80,13 +80,13 @@ dependencies {
 	implementation "org.apache.logging.log4j:log4j-jcl:${log4jVersion}"
 	implementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"
 
-	implementation 'org.elasticsearch.client:elasticsearch-rest-client:7.17.25'
+	implementation 'org.elasticsearch.client:elasticsearch-rest-client:7.17.28'
 	implementation 'org.apache.httpcomponents:httpasyncclient:4.1.5'
 
 	implementation 'com.amazonaws:aws-java-sdk-s3:1.12.777'
 	implementation 'com.amazonaws:aws-java-sdk-sts:1.12.777'
 
-	implementation 'com.azure:azure-storage-blob:12.29.0'
+	implementation 'com.azure:azure-storage-blob:12.30.0'
 
 	implementation 'javax.cache:cache-api:1.1.1'
 	implementation 'org.ehcache:ehcache:3.10.8'
@@ -104,7 +104,7 @@ dependencies {
 		}
 	}
 
-	testImplementation 'org.testcontainers:elasticsearch:1.20.3'
+	testImplementation 'org.testcontainers:elasticsearch:1.20.6'
 }
 
 tasks.withType(JavaCompile).configureEach {

structurizr-onpremises/src/main/java/com/structurizr/onpremises/configuration/Configuration.java

@@ -107,7 +107,7 @@ private void configureFeatures() {
         features.configure(Features.UI_WORKSPACE_SETTINGS, Boolean.parseBoolean(getProperty(Features.UI_WORKSPACE_SETTINGS)));
         features.configure(Features.UI_DSL_EDITOR, Boolean.parseBoolean(getProperty(Features.UI_DSL_EDITOR)));
         features.configure(Features.WORKSPACE_ARCHIVING, Boolean.parseBoolean(getProperty(Features.WORKSPACE_ARCHIVING)));
-        features.configure(Features.WORKSPACE_BRANCHES, PREVIEW_FEATURES && Boolean.parseBoolean(getProperty(Features.WORKSPACE_BRANCHES)));
+        features.configure(Features.WORKSPACE_BRANCHES, Boolean.parseBoolean(getProperty(Features.WORKSPACE_BRANCHES)));
         features.configure(Features.WORKSPACE_SCOPE_VALIDATION, getProperty(Features.WORKSPACE_SCOPE_VALIDATION).equalsIgnoreCase(Features.WORKSPACE_SCOPE_VALIDATION_STRICT));
         features.configure(Features.DIAGRAM_REVIEWS, Boolean.parseBoolean(getProperty(Features.DIAGRAM_REVIEWS)));
         features.configure(Features.DIAGRAM_ANONYMOUS_THUMBNAILS, Boolean.parseBoolean(getProperty(Features.DIAGRAM_ANONYMOUS_THUMBNAILS)));

structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/ContextLoaderListener.java

@@ -167,6 +167,9 @@ public void uncaughtException(Thread t, Throwable ex) {
         } catch (Exception e) {
             e.printStackTrace();
         }
+
+        // todo: https://github.com/structurizr/onpremises/issues/136
+        System.setProperty("aws.java.v1.disableDeprecationAnnouncement", "true");
     }
 
     private void logAllProperties(Log log, Properties properties) {

structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/dsl/PublicDslController.java

@@ -125,7 +125,6 @@ public String show(ModelMap model, String source, String json, String view) thro
 
     private Workspace fromDsl(String dsl) throws StructurizrDslParserException, WorkspaceScopeValidationException {
         StructurizrDslParser parser = new StructurizrDslParser();
-        parser.getFeatures().configure(Features.ARCHETYPES, Configuration.PREVIEW_FEATURES);
         parser.setRestricted(true);
         parser.parse(dsl);
 

structurizr-onpremises/src/main/java/com/structurizr/onpremises/web/workspace/dsl/DslEditorController.java

@@ -119,7 +119,6 @@ public DslEditorResponse postToDslEditor(
 
     private Workspace fromDsl(String dsl) throws StructurizrDslParserException, WorkspaceScopeValidationException {
         StructurizrDslParser parser = new StructurizrDslParser();
-        parser.getFeatures().configure(com.structurizr.dsl.Features.ARCHETYPES, Configuration.PREVIEW_FEATURES);
         parser.setRestricted(true);
         parser.parse(dsl);