From a6420d2c5aeff5661a73a4fd2f4aaa6b75fefb1d Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Tue, 19 Dec 2023 13:30:03 +0100
Subject: [PATCH] updates, replace tomcat7-maven-plugin by jetty-maven-plugin

---
 web/hsadmin.properties |  8 ++++----
 web/pom.xml            | 25 +++++++++++++++----------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/web/hsadmin.properties b/web/hsadmin.properties
index 785c811..605ab9f 100644
--- a/web/hsadmin.properties
+++ b/web/hsadmin.properties
@@ -1,5 +1,5 @@
 backendURL=https://config.hostsharing.net:443/hsar/backend
-;xmlrpcURL=https://config.hostsharing.net:443/hsar/xmlrpc/hsadmin
-;loginURL=https://login.hostsharing.net:443/cas/v1/tickets
-xmlrpcURL=http://localhost:8080/cust-webapp/xmlrpc/hsadmin
-loginURL=TestUmgebung
+xmlrpcURL=https://config.hostsharing.net:443/hsar/xmlrpc/hsadmin
+loginURL=https://login.hostsharing.net:443/cas/v1/tickets
+;xmlrpcURL=http://localhost:8080/cust-webapp/xmlrpc/hsadmin
+;loginURL=TestUmgebung
diff --git a/web/pom.xml b/web/pom.xml
index a844b63..beaaf96 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.hsadmin</groupId>
 		<artifactId>hsadmin-parent</artifactId>
-		<version>1.0.3</version>
+		<version>1.0.4</version>
 	</parent>
 	
 	<artifactId>admin-web</artifactId>
@@ -42,19 +42,19 @@
 		<dependency>
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-compatibility-server</artifactId>
-			<version>8.18.0</version>
+			<version>${vaadin.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-themes</artifactId>
-			<version>8.18.0</version>
+			<version>${vaadin.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.vaadin</groupId>
 			<artifactId>vaadin-compatibility-client-compiled</artifactId>
-			<version>8.18.0</version>
+			<version>${vaadin.version}</version>
 		</dependency>
 
 		<dependency>
@@ -66,7 +66,7 @@
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
+			<version>${log4j.version}</version>
 		</dependency>
 
 		<dependency>
@@ -92,12 +92,17 @@
 					<version>3.8.1</version>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.tomcat.maven</groupId>
-					<artifactId>tomcat7-maven-plugin</artifactId>
-					<version>2.2</version>
+					<groupId>org.eclipse.jetty</groupId>
+					<artifactId>jetty-maven-plugin</artifactId>
+					<version>10.0.18</version>
 					<configuration>
-						<path>/</path>
-						<port>8081</port>
+						<scanIntervalSeconds>10</scanIntervalSeconds>
+						<httpConnector>
+							<port>8080</port>
+						</httpConnector>
+						<webApp>
+							<contextPath>/admin</contextPath>
+						</webApp>
 					</configuration>
 				</plugin>
 			</plugins>