Merge remote-tracking branch 'origin/main' into renovate/major-jetty-packages

.gitignore

@@ -1,6 +1,12 @@
-.gradle
+.*
-.idea
+
-.settings
+.vscode/*
+!.vscode
+!.vscode/extensions.json
+!.vscode/launch.json
+!.vscode/settings.json
+!.vscode/tasks.json
+
 build
 
 /apps
@@ -15,8 +21,8 @@ build
 /static
 
 /*.properties
+!/gradle.properties
+
 /launcher.jar
 /passwd
 /start.*
-
-!/gradle.properties

.vscode/launch.json

@@ -0,0 +1,21 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "java",
+      "name": "Current File",
+      "request": "launch",
+      "mainClass": "${file}"
+    },
+    {
+      "type": "java",
+      "name": "Debug",
+      "request": "launch",
+      "mainClass": "helma.main.Server",
+      "projectName": "helma_"
+    }
+  ]
+}

build.gradle

@@ -42,15 +42,6 @@ if (JavaVersion.current().isJava8Compatible()) {
   }
 }
 
-sourceSets {
-  main {
-    java {
-      // Sources in `src` will be available here after processing
-      srcDirs = ["$buildDir/src/main/java"]
-    }
-  }
-}
-
 configurations {
   // Wrapping implementation because it does not allow access to its files
   // (i.e. cannot be resolved)

settings.gradle

@@ -16,3 +16,6 @@ project(':modules').projectDir = file('modules/helma')
 project(':jala').projectDir = file('modules/jala')
 project(':hopKit').projectDir = file('modules/jala/util/HopKit')
 project(':test').projectDir = file('modules/jala/util/Test')
+
+// Rename this project to prevent redundancy and renaming of main project (VSC does not care, though)
+project(':modules').name = 'modules'