From ed6950ed617abad7c1fc3fb58a46f3940595f272 Mon Sep 17 00:00:00 2001
From: "Matteo Franci a.k.a. Fugerit" <m@fugerit.org>
Date: Mon, 5 Dec 2022 21:27:36 +0100
Subject: [PATCH] * Now the quickstart run on spring boot only * Removed
 websphere liberty support * Removed daogen maven plugin sample * Java 17 is
 required

---
 changelog.md |  6 ++++++
 pom.xml      | 14 ++++---------
 readme.md    | 59 ++++------------------------------------------------
 3 files changed, 14 insertions(+), 65 deletions(-)

diff --git a/changelog.md b/changelog.md
index 0c48f6f..200dd36 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog for project fj-daogen-quickstart
 
+## version 0.4.4 - 2022-12-05
+* Now the quickstart run on spring boot only
+* Removed websphere liberty support
+* Removed daogen maven plugin sample
+* Java 17 is required
+
 ## version 0.3.4.5 - 2019-12-31
 * Added support for websphere liberty
 * Update to fj-lib 0.6.5.9
diff --git a/pom.xml b/pom.xml
index 311e4b8..355196a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>org.fugerit.java</groupId>
 	<artifactId>fj-daogen-quickstart</artifactId>
 	<packaging>war</packaging>
-	<version>0.4.2.3</version>
+	<version>0.4.4</version>
 
 	<name>fj-daogen-quickstart</name>
 	<description>fj-daogen-quickstart</description>
@@ -21,13 +21,13 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java-version-compliance>11</java-version-compliance>
+		<java-version-compliance>17</java-version-compliance>
 		<j2ee-version-compliance>7.0</j2ee-version-compliance>
 		<maven.compiler.source>${java-version-compliance}</maven.compiler.source>
 		<maven.compiler.target>${java-version-compliance}</maven.compiler.target>
-		<fj-version>0.7.5.8</fj-version>
+		<fj-version>0.8.3</fj-version>
 		<fj-daogen-version>${project.version}</fj-daogen-version>
-		<sb-version>2.4.3</sb-version>
+		<sb-version>3.0.0</sb-version>
 	</properties>
 
 	<build>
@@ -40,12 +40,6 @@
 				<version>3.2.3</version>
 			</plugin>
 
-			<plugin>
-				<groupId>org.fugerit.java</groupId>
-				<artifactId>fj-daogen-maven-plugin</artifactId>
-				<version>${fj-daogen-version}</version>			
-			</plugin>			
-
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/readme.md b/readme.md
index facab53..aa6b665 100644
--- a/readme.md
+++ b/readme.md
@@ -2,20 +2,18 @@
 
 Refer to [changelog](changelog.md) for feature update.
 
-Sample applications to lear usage of DaoGen framework.  
+Sample applications to learn usage of DaoGen framework.  
 
 Index : 
 1. Run the project
 2. Configuration notes
 3. DaoGen tutorial
-4. Maven Plugin
-5. Support for websphere liberty
-
 
 ## 1. Run the project ##
 
-1. Add to a server (tested with tomcat9 / jdk9).  
-2. Open one of the rest URL http://localhost:8080/fj-daogen-quickstart/jax-rs/person/load/deep/id/3  
+1. Minimum java 17 is required
+2. mvn spring-boot:run
+3. Open one of the rest URL http://localhost:8080/fj-daogen-quickstart/jax-rs/person/load/deep/id/3  
 
 NOTE: index page fj-daogen-quickstart contains a few api links  
 
@@ -138,52 +136,3 @@ public class DaogenQuickstart extends javax.ws.rs.core.Application {
 Start the application and test the service :   
 
 http://localhost:8080/fj-daogen-quickstart/jax-rs/equipment/load/id/21    
-
-
-## 4. Maven Plugin ##
-
-Since version 0.1.7 is possibile to use the maven plugin to generate code.  
-
-The activation happen with the 'fj-daogen:generate' goal :   
-
-mvn clean install fj-daogen:generate  
-
-Here is an example code :   
-
-```
-					<plugin>
-						<groupId>org.fugerit.java</groupId>
-						<artifactId>fj-daogen-maven-plugin</artifactId>
-						<configuration>
-							<daogen.config>${project.basedir}/src/main/resources/daogen/daogen-config.xml</daogen.config>
-						</configuration>						
-						<executions>
-							<execution>
-								<phase>compile</phase>
-								<goals>
-									<goal>generate</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-```
-			
-			
-## 5. Support for websphere liberty ##
-
-Is now possibile to run the quickstart on a standalone websphere liberty application server, activating the profile 'wlp'
-
-To start the server : 
-`mvn clean install liberty:run -P wlp`
-
-To stop the server
-`mvn liberty:stop -P wlp`
-
-After starting the server, you can access the webapp at link [http://localhost:8080/fj-daogen-quickstart/](http://localhost:8080/fj-daogen-quickstart/)
-
-The template for this profile is based on the sample websphere liberty project : 
-[websphere liberty profile sample project](https://gitlab.com/fugerit-org/fj-sample-wlp)
-
-The server configuration template is here : [src/main/freemarker/template/server_ftl.xml](src/main/freemarker/template/server_ftl.xml)  
-
-NOTE: the template has been configured to use port 8080.