From 34f871ad0c73a2858694a7ceb053e3465085b2db Mon Sep 17 00:00:00 2001
From: Luis Ferreira Pires <l.ferreirapires@utwente.nl>
Date: Mon, 10 Mar 2025 11:04:26 +0100
Subject: [PATCH] Merged fixes to get it working with Java 21 and the most
recent versions of the plugins.
---
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 4 ----
.../soa/sampleWebapplication/services/EchoProxyService.java | 4 ----
.../utwente/soa/sampleWebapplication/web/IndexController.java | 4 ----
4 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/build.gradle b/build.gradle
index 812fafc..934a22c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
}
group = 'nl.utwente.soa'
-version = '0.0.1-SNAPSHOT'
+version = '0.0.1'
repositories {
mavenCentral()
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f3c5537..cea7a79 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,10 +1,6 @@
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
diff --git a/src/main/java/nl/utwente/soa/sampleWebapplication/services/EchoProxyService.java b/src/main/java/nl/utwente/soa/sampleWebapplication/services/EchoProxyService.java
index 116f0d2..eafcda5 100644
--- a/src/main/java/nl/utwente/soa/sampleWebapplication/services/EchoProxyService.java
+++ b/src/main/java/nl/utwente/soa/sampleWebapplication/services/EchoProxyService.java
@@ -1,10 +1,6 @@
package nl.utwente.soa.sampleWebapplication.services;
import jakarta.websocket.EncodeException;
-<<<<<<< HEAD
-=======
-
->>>>>>> d8c5d2041743498991a5e1d2c6fbd928a38be9f9
import java.io.IOException;
public interface EchoProxyService {
diff --git a/src/main/java/nl/utwente/soa/sampleWebapplication/web/IndexController.java b/src/main/java/nl/utwente/soa/sampleWebapplication/web/IndexController.java
index dc7f350..7c6ce24 100644
--- a/src/main/java/nl/utwente/soa/sampleWebapplication/web/IndexController.java
+++ b/src/main/java/nl/utwente/soa/sampleWebapplication/web/IndexController.java
@@ -1,6 +1,5 @@
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;
@@ -11,10 +10,7 @@ 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
--
GitLab