From 308200eb22723fe7c04ea840377838598b98cec9 Mon Sep 17 00:00:00 2001
From: Scott Kurz <skurz@us.ibm.com>
Date: Wed, 6 Sep 2023 09:35:58 -0400
Subject: [PATCH] Update liberty-maven-plugin config in test projects for
 latest version

Signed-off-by: Scott Kurz <skurz@us.ibm.com>
---
 .../projects/demo-servlet-no-diagnostics/pom.xml       | 10 +---------
 .../projects/jakarta-sample/pom.xml                    | 10 +---------
 .../jakarta-sample/src/main/liberty/config/server.xml  |  4 ++--
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/pom.xml b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/pom.xml
index 4fe6d0fd..4c0f1861 100644
--- a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/pom.xml
+++ b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/demo-servlet-no-diagnostics/pom.xml
@@ -85,15 +85,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.3.4</version>
-                <configuration>
-                    <runtimeArtifact>
-                        <groupId>io.openliberty.beta</groupId>
-                        <artifactId>openliberty-jakartaee9</artifactId>
-                        <version>21.0.0.2-beta</version>
-                        <type>zip</type>
-                    </runtimeArtifact>
-                </configuration>
+                <version>3.8.2</version>
             </plugin>
             <!-- end::libertyMavenPlugin[] -->
             <plugin>
diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-sample/pom.xml b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-sample/pom.xml
index 2ebb97b9..6ac27b8c 100755
--- a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-sample/pom.xml
+++ b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-sample/pom.xml
@@ -82,15 +82,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.3.4</version>
-                <configuration>
-                    <runtimeArtifact>
-                        <groupId>io.openliberty</groupId>
-                        <artifactId>openliberty-jakartaee9</artifactId>
-                        <version>21.0.0.2</version>
-                        <type>zip</type>
-                    </runtimeArtifact>
-                </configuration>
+                <version>3.8.2</version>
             </plugin>
             <!-- end::libertyMavenPlugin[] -->
             <plugin>
diff --git a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-sample/src/main/liberty/config/server.xml b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-sample/src/main/liberty/config/server.xml
index f64180a7..a90353bd 100755
--- a/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-sample/src/main/liberty/config/server.xml
+++ b/jakarta.jdt/org.eclipse.lsp4jakarta.jdt.test/projects/jakarta-sample/src/main/liberty/config/server.xml
@@ -1,10 +1,10 @@
 <server description="Sample Liberty server">
     <featureManager>
-        <feature>jakartaee-9.0</feature>
+        <feature>jakartaee-9.1</feature>
     </featureManager>
 
     <webApplication location="${artifactId}.war" contextRoot="/" />
 
     <httpEndpoint host="*" httpPort="${default.http.port}" httpsPort="${default.https.port}" id="defaultHttpEndpoint" />
 
-</server>
\ No newline at end of file
+</server>