set next snapshot

fugerit79 · fugerit79 · commit 41a8dc27bf68 · 2024-09-11T17:20:21.000+02:00
diff --git a/fj-doc-base-json/pom.xml b/fj-doc-base-json/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-base-json</name>
diff --git a/fj-doc-base-yaml/pom.xml b/fj-doc-base-yaml/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-base-yaml</name>
diff --git a/fj-doc-base/pom.xml b/fj-doc-base/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-base</name>
diff --git a/fj-doc-freemarker/pom.xml b/fj-doc-freemarker/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-freemarker</name>
diff --git a/fj-doc-lib-autodoc/pom.xml b/fj-doc-lib-autodoc/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-lib-autodoc</name>
diff --git a/fj-doc-lib-simpletable-import/pom.xml b/fj-doc-lib-simpletable-import/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-lib-simpletable-import</name>
diff --git a/fj-doc-lib-simpletable/pom.xml b/fj-doc-lib-simpletable/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-lib-simpletable</name>
diff --git a/fj-doc-maven-plugin/pom.xml b/fj-doc-maven-plugin/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<packaging>maven-plugin</packaging>
diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/.dockerignore b/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/.dockerignore
@@ -0,0 +1,3 @@
+target/
+!target/*.war
+!target/liberty/wlp/usr/shared/resources/*
diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/.gitignore b/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/.gitignore
@@ -0,0 +1,11 @@
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+# https://github.com/takari/maven-wrapper#usage-without-binary-jar
+.mvn/wrapper/maven-wrapper.jar
diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/Dockerfile b/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/Dockerfile
@@ -0,0 +1,10 @@
+
+FROM icr.io/appcafe/open-liberty:kernel-slim-java21-openj9-ubi-minimal
+
+COPY --chown=1001:0 /src/main/liberty/config /config
+
+RUN features.sh
+
+COPY --chown=1001:0 target/*.war /config/apps
+
+RUN configure.sh
diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/README.txt b/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/README.txt
@@ -0,0 +1,35 @@
+After you generate a starter project, these instructions will help you with what to do next.
+
+The Open Liberty starter gives you a simple, quick way to get the necessary files to start building
+an application on Open Liberty. There is no need to search how to find out what to add to your 
+Maven build files. A simple RestApplication.java file is generated for you to start 
+creating a REST based application. A server.xml configuration file is provided with the necessary 
+features for the MicroProfile and Jakarta EE versions that you previously selected.
+
+If you plan on developing and/or deploying your app in a containerized environment, the included 
+Dockerfile will make it easier to create your application image on top of the Open Liberty Docker 
+image.
+
+1) Once you download the starter project, unpackage the .zip file on your machine.
+2) Open a command line session, navigate to the installation directory, and run `./mvnw liberty:dev` (Linux/Mac) or `mvnw liberty:dev` (Windows). 
+   This will install all required dependencies and start the default server. When complete, you will
+   see the necessary features installed and the message "server is ready to run a smarter planet."
+
+For information on developing your application in dev mode using Maven, see the 
+dev mode documentation (https://openliberty.io/docs/latest/development-mode.html).
+
+For further help on getting started actually developing your application, see some of our 
+MicroProfile guides (https://openliberty.io/guides/?search=microprofile&key=tag) and Jakarta EE 
+guides (https://openliberty.io/guides/?search=jakarta%20ee&key=tag).
+
+If you have problems building the starter project, make sure the Java SE version on your 
+machine matches the Java SE version you picked from the Open Liberty starter on the downloads 
+page (https://openliberty.io/downloads/). You can test this with the command `java -version`.
+
+Open Liberty performs at its best when running using Open J9 which can be obtained via IBM Semeru 
+(https://developer.ibm.com/languages/java/semeru-runtimes/downloads/). For a full list of supported 
+Java SE versions and where to obtain them, reference the Java SE support page 
+(https://openliberty.io/docs/latest/java-se.html).
+
+If you find any issues with the starter project or have recommendations to improve it, open an 
+issue in the starter GitHub repo (https://github.com/OpenLiberty/start.openliberty.io).
diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/pom.xml b/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/pom.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.fugerit.java.template</groupId>
+    <artifactId>fugerit-openliberty-template</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <packaging>war</packaging>
+
+    <properties>
+        <java.version>21</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <maven.compiler.release>${java.version}</maven.compiler.release>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <openliberty-runtime-version>24.0.0.9</openliberty-runtime-version>
+        <liberty-maven-plugin-version>3.10.3</liberty-maven-plugin-version>
+        <microprofile-version>6.1</microprofile-version>
+        <liberty.var.default.http.port>8080</liberty.var.default.http.port>
+        <liberty.var.default.https.port>8443</liberty.var.default.https.port>
+        <junit-bom-version>5.11.0</junit-bom-version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit-bom-version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.openliberty</groupId>
+            <artifactId>openliberty-runtime</artifactId>
+            <version>${openliberty-runtime-version}</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.microprofile</groupId>
+            <artifactId>microprofile</artifactId>
+            <version>${microprofile-version}</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>fugerit-openliberty-template</finalName>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>io.openliberty.tools</groupId>
+                    <artifactId>liberty-maven-plugin</artifactId>
+                    <version>${liberty-maven-plugin-version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>io.openliberty.tools</groupId>
+                <artifactId>liberty-maven-plugin</artifactId>
+                <configuration>
+                    <serverName>libertyServer</serverName>
+                    <runtimeArtifact>
+                        <groupId>io.openliberty</groupId>
+                        <artifactId>openliberty-runtime</artifactId>
+                        <version>${openliberty-runtime-version}</version>
+                        <type>zip</type>
+                    </runtimeArtifact>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/src/main/java/org/fugerit/java/template/rest/GreetingResource.java b/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/src/main/java/org/fugerit/java/template/rest/GreetingResource.java
@@ -0,0 +1,16 @@
+package org.fugerit.java.template.rest;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+
+@Path("/hello")
+public class GreetingResource {
+
+    @GET
+    @Produces(MediaType.TEXT_PLAIN)
+    public String hello() {
+        return "Hello from Open Liberty REST";
+    }
+}
diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/src/main/java/org/fugerit/java/template/rest/RestApplication.java b/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/src/main/java/org/fugerit/java/template/rest/RestApplication.java
@@ -0,0 +1,9 @@
+package org.fugerit.java.template.rest;
+
+import jakarta.ws.rs.ApplicationPath;
+import jakarta.ws.rs.core.Application;
+
+@ApplicationPath("/")
+public class RestApplication extends Application {
+
+}
diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/src/main/liberty/config/server.xml b/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/src/main/liberty/config/server.xml
@@ -0,0 +1,9 @@
+<server description="Fugerit Open Liberty server">
+    <featureManager>
+        <feature>mpHealth-4.0</feature>
+        <feature>restfulWS-3.1</feature>
+        <feature>mpOpenAPI-3.1</feature>
+    </featureManager>
+    <httpEndpoint host="*" httpPort="${default.http.port}" httpsPort="${default.https.port}" id="defaultHttpEndpoint" />
+    <webApplication location="fugerit-openliberty-template.war" contextRoot="/" />
+</server>
diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/src/main/resources/META-INF/microprofile-config.properties b/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/src/main/resources/META-INF/microprofile-config.properties
diff --git a/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/src/main/webapp/WEB-INF/web.xml b/fj-doc-maven-plugin/src/main/resources/config/flavour/openliberty/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,9 @@
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+    version="3.1">
+    <display-name>Liberty Project</display-name>
+
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+</web-app>
diff --git a/fj-doc-mod-fop/pom.xml b/fj-doc-mod-fop/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-mod-fop</name>
diff --git a/fj-doc-mod-opencsv/pom.xml b/fj-doc-mod-opencsv/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-mod-opencsv</name>
diff --git a/fj-doc-mod-openpdf-ext/pom.xml b/fj-doc-mod-openpdf-ext/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-mod-openpdf-ext</name>
diff --git a/fj-doc-mod-openrtf-ext/pom.xml b/fj-doc-mod-openrtf-ext/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-mod-openrtf-ext</name>
diff --git a/fj-doc-mod-poi/pom.xml b/fj-doc-mod-poi/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-mod-poi</name>
diff --git a/fj-doc-playground-quarkus/pom.xml b/fj-doc-playground-quarkus/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 	<artifactId>fj-doc-playground-quarkus</artifactId>
 	<properties>
diff --git a/fj-doc-sample/pom.xml b/fj-doc-sample/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-sample</name>
diff --git a/fj-doc-tool/pom.xml b/fj-doc-tool/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-tool</name>
diff --git a/fj-doc-val-core/pom.xml b/fj-doc-val-core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-val-core</name>
diff --git a/fj-doc-val-p7m/pom.xml b/fj-doc-val-p7m/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-val-p7m</name>
diff --git a/fj-doc-val-pdfbox/pom.xml b/fj-doc-val-pdfbox/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-val-pdfbox</name>
diff --git a/fj-doc-val-poi/pom.xml b/fj-doc-val-poi/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-val-poi</name>
diff --git a/fj-doc-val/pom.xml b/fj-doc-val/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.fugerit.java</groupId>
 		<artifactId>fj-doc</artifactId>
-		<version>8.8.3</version>
+		<version>8.8.4-SNAPSHOT</version>
 	</parent>
 
 	<name>fj-doc-val</name>
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+target/`
	`2`	`+!target/*.war`
	`3`	`+!target/liberty/wlp/usr/shared/resources/*`