Merge branch 'master' of https://gitlab.utwente.nl/soa-course/workshop-http

# Conflicts:
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
#	src/main/java/nl/utwente/soa/sampleWebapplication/services/EchoProxyService.java
#	src/main/java/nl/utwente/soa/sampleWebapplication/web/IndexController.java

gradle/wrapper/gradle-wrapper.properties

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+<<<<<<< HEAD
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+=======
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+>>>>>>> d8c5d2041743498991a5e1d2c6fbd928a38be9f9
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/nl/utwente/soa/sampleWebapplication/services/EchoProxyService.java

 package nl.utwente.soa.sampleWebapplication.services;
 
 import jakarta.websocket.EncodeException;
+<<<<<<< HEAD
+=======
+
+>>>>>>> d8c5d2041743498991a5e1d2c6fbd928a38be9f9
 import java.io.IOException;
 
 public interface EchoProxyService {

src/main/java/nl/utwente/soa/sampleWebapplication/web/IndexController.java

 package nl.utwente.soa.sampleWebapplication.web;
 
+import jakarta.websocket.EncodeException;
 import nl.utwente.soa.sampleWebapplication.services.EchoProxyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -10,7 +11,10 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
+<<<<<<< HEAD
 import jakarta.websocket.EncodeException;
+=======
+>>>>>>> d8c5d2041743498991a5e1d2c6fbd928a38be9f9
 import java.io.IOException;
 
 @Controller

src/main/resources/application.properties

-server.tomcat.max-threads = 3
\ No newline at end of file
+server.tomcat.threads.max=3
\ No newline at end of file