Bump gradle from 8.6.0-jdk21 to 8.7.0-jdk21 (#296)

* upgrade gradle wrapper to 8.7-rc-1

* upgrade to gradle 8.7-rc-2

* upgrade to gradle 8.7-rc-3

* codespace: upgrade to nodejs 21.7.1

* ci: dont cache gradle environment

* add some constructors to avoid autowiring

* codespace: fix nodejs path in sonarlint settings

* upgrade to gradle 8.7-rc-4

* upgrade to gradle 8.7

*  Bump gradle from 8.6.0-jdk21 to 8.7.0-jdk21

Bumps gradle from 8.6.0-jdk21 to 8.7.0-jdk21.

---
updated-dependencies:
- dependency-name: gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: JKatzwinkel <JKatzwinkel@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.devcontainer/devcontainer.json

@@ -7,7 +7,7 @@
 		"ghcr.io/devcontainers/features/docker-in-docker:2": {}
 	},
 	"postStartCommand": "sudo apt-get update && sudo apt-get install -y fontconfig && sudo apt-get clean",
-	"postAttachCommand": "nvm use 21.6.2 || nvm install 21.6.2",
+	"postAttachCommand": "nvm use 21.7.1 || nvm install 21.7.1",
 	"customizations": {
 		"vscode": {
 			"extensions": [
@@ -20,7 +20,7 @@
 					"jacocoTestReport.xml"
 				],
 				"coverage-gutters.showLineCoverage": true,
-				"sonarlint.pathToNodeExecutable": "/usr/local/share/nvm/versions/node/v21.6.1/bin/node",
+				"sonarlint.pathToNodeExecutable": "/usr/local/share/nvm/current/bin/node",
 				"sonarlint.output.showVerboseLogs": true,
 				"sonarlint.analyzerProperties": {
 					"sonar.java.source": "21"

.github/workflows/submit_dependencies.yml

@@ -17,7 +17,6 @@ jobs:
         with:
           distribution: temurin
           java-version: 21
-          cache: gradle
 
       - name: setup gradle dependency graph submission
         uses: gradle/actions/setup-gradle@v3.1.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:8.6.0-jdk21 AS build
+FROM gradle:8.7.0-jdk21 AS build
 
 COPY --chown=gradle:gradle . /home/gradle/tla-frontend
 WORKDIR /home/gradle/tla-frontend

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/tla/web/mvc/CorpusObjectController.java

@@ -1,6 +1,5 @@
 package tla.web.mvc;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -15,9 +14,12 @@
 @TemplateModelName("object")
 public class CorpusObjectController extends ObjectController<CorpusObject, LemmaSearch> {
 
-    @Autowired
     private CorpusObjectService service;
 
+    public CorpusObjectController(CorpusObjectService service) {
+        this.service = service;
+    }
+
     @Override
     public ObjectService<CorpusObject> getService() {
         return service;

src/main/java/tla/web/mvc/ObjectController.java

@@ -152,7 +152,7 @@ public String modifySearchUrl() {
     /**
      * Translate object passport to UI representation.
      */
-    public LinkedHashMap<String, List<CorpusPathSegment>> getPassportPropertyValues(ObjectDetails<T> container) {
+    public Map<String, List<CorpusPathSegment>> getPassportPropertyValues(ObjectDetails<T> container) {
         final var res = new LinkedHashMap<String, List<CorpusPathSegment>>();
         getService().getDetailsPassportPropertyValues(
             container.getObject()
@@ -234,7 +234,7 @@ public String getSingleObjectDetailsPage(@PathVariable String id, Model model) {
         model.addAttribute("caption", getService().getLabel(container.getObject()));
         model.addAttribute("related", container.getRelated());
         model.addAttribute("relations", container.extractRelatedObjects());
-        model = extendSingleObjectDetailsModel(model, container);
+        model = extendSingleObjectDetailsModel(model, container);  // NOSONAR
         return String.format("%s/details", getTemplatePath());
     }
 
@@ -286,7 +286,7 @@ public String getSearchResultsPage(
      * Subclasses may override in order to extend view model based on search input and results.
      */
     protected Model extendSearchResultsPageModel(
-        Model model, SearchResults results, SearchCommand<?> searchForm
+        Model model, SearchResults results, SearchCommand<?> searchForm  // NOSONAR
     ) {
         return model;
     }

src/main/java/tla/web/mvc/SentenceController.java

@@ -4,7 +4,6 @@
 import java.util.Objects;
 import java.util.stream.Stream;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.util.MultiValueMap;
@@ -27,9 +26,12 @@
 @TemplateModelName("sentence")
 public class SentenceController extends HierarchicObjectController<Sentence, SentenceSearch> {
 
-    @Autowired
     private SentenceService service;
 
+    public SentenceController(SentenceService service) {
+        this.service = service;
+    }
+
     @Override
     public ObjectService<Sentence> getService() {
         return service;
@@ -68,7 +70,7 @@ public List<List<BreadCrumb>> createObjectPathLinks(Hierarchic object) {
                 parentObjectPathLinks,
                 sentenceContextLinks
             ).flatMap(
-                links -> links.stream()
+                links -> links.stream()  // NOSONAR
             ).toList()
         ).toList();
     }

src/main/java/tla/web/mvc/TextObjectController.java

@@ -1,6 +1,5 @@
 package tla.web.mvc;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -15,9 +14,12 @@
 @TemplateModelName("text")
 public class TextObjectController extends ObjectController<Text, TextSearch> {
 
-    @Autowired
     private TextService service;
 
+    public TextObjectController(TextService service) {
+        this.service = service;
+    }
+
     @Override
     public ObjectService<Text> getService() {
         return service;