]> git.laktatnebel.de Git - laktatnebelmaster.git/commitdiff
version 3.0 vorbereiten
authorOle B. Rosentreter <ole@laktatnebel.de>
Fri, 13 Mar 2026 16:34:17 +0000 (17:34 +0100)
committerOle B. Rosentreter <ole@laktatnebel.de>
Fri, 13 Mar 2026 16:34:17 +0000 (17:34 +0100)
14 files changed:
laktatnebellib/pom.xml
laktatnebelproductmaster/laktatnebeljeemigration/pom.xml [new file with mode: 0644]
laktatnebelproductmaster/laktatnebelproductjeemaster/laktatnebelproductjeeapp/pom.xml
laktatnebelproductmaster/laktatnebelproductjeemaster/laktatnebelproductjeeweb/pom.xml
laktatnebelproductmaster/laktatnebelproductjeemaster/pom.xml
laktatnebelproductmaster/laktatnebelproductstandalone/plain/pom.xml [new file with mode: 0644]
laktatnebelproductmaster/laktatnebelproductstandalone/pom.xml
laktatnebelproductmaster/laktatnebelproductstandalone/withjpa/pom.xml [new file with mode: 0644]
laktatnebelproductmaster/laktatnebelspringboot/pom.xml [new file with mode: 0644]
laktatnebelproductmaster/laktatnebelspringboottomcat/pom.xml [new file with mode: 0644]
laktatnebelproductmaster/pom.xml
laktatnebelscript/pom.xml
pom.xml
release.properties [new file with mode: 0644]

index a38916f87d4711f4f914b655931476b978337172..2c1202b3e268532fbd6d752db6501a4c46caaa93 100644 (file)
@@ -1,21 +1,30 @@
-<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>
+<?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>de.laktatnebel.maven</groupId>
-       <artifactId>laktatnebellib</artifactId>
-       <version>2.1.10-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <parent>
+        <groupId>de.laktatnebel.maven</groupId>
+        <artifactId>laktatnebelmaster</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-       <name>laktatnebelLib</name>
+    <artifactId>laktatnebellib</artifactId>
+    <packaging>pom</packaging>
 
-       <properties>
-               <project.scm.dir>${project.artifactId}</project.scm.dir>
-       </properties>
+    <name>laktatnebelLib</name>
 
-       <parent>
-               <groupId>de.laktatnebel.maven</groupId>
-               <artifactId>laktatnebelmaster</artifactId>
-               <version>2.1.10-SNAPSHOT</version>
-       </parent>
-       
-</project>
\ No newline at end of file
+    <properties>
+        <project.scm.dir>${project.artifactId}</project.scm.dir>
+    </properties>
+
+    <!--
+        Parent für Java-Bibliotheken.
+        Erbt: Java 17, Logback, JUnit 5, Javadoc, Sources.
+        Konkrete lib-Module setzen packaging=jar und fügen
+        ihre spezifischen Dependencies hinzu.
+    -->
+
+</project>
diff --git a/laktatnebelproductmaster/laktatnebeljeemigration/pom.xml b/laktatnebelproductmaster/laktatnebeljeemigration/pom.xml
new file mode 100644 (file)
index 0000000..ac4b83c
--- /dev/null
@@ -0,0 +1,88 @@
+<?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>
+
+    <parent>
+        <groupId>de.laktatnebel.maven</groupId>
+        <artifactId>laktatnebelproductmaster</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>laktatnebeljeemigration</artifactId>
+    <packaging>pom</packaging>
+
+    <name>laktatnebelJeeMigration</name>
+
+    <properties>
+        <!-- javax – alte Versionen bewusst eingefroren -->
+        <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
+        <javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>
+        <project.scm.dir>${project.artifactId}</project.scm.dir>
+    </properties>
+
+    <!--
+        Übergangs-Parent für Projekte die noch javax.* nutzen
+        und schrittweise auf jakarta.* migriert werden.
+
+        Zielzustand: Projekt wird auf laktatnebelproductjeeweb
+        oder laktatnebelspringboottomcat umgestellt.
+
+        Tomcat-Kompatibilität: maximal Tomcat 9.x.
+        Für Tomcat 10+ muss auf jakarta.* migriert werden.
+    -->
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>${javax.servlet-api.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet.jsp</groupId>
+                <artifactId>javax.servlet.jsp-api</artifactId>
+                <version>${javax.servlet.jsp-api.version}</version>
+                <scope>provided</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>${maven-war-plugin.version}</version>
+                    <configuration>
+                        <failOnMissingWebXml>false</failOnMissingWebXml>
+                    </configuration>
+                </plugin>
+                <!-- tomcat7-maven-plugin bleibt für Tomcat 9 Deployments -->
+                <plugin>
+                    <groupId>org.apache.tomcat.maven</groupId>
+                    <artifactId>tomcat7-maven-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+</project>
index d1ac240a2f5318544765f8a6be4d7e7c0f9c07a1..740a969c93014446d2b989ea7dc8634193e59588 100644 (file)
@@ -1,57 +1,50 @@
-<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>de.laktatnebel.maven</groupId>
-       <artifactId>laktatnebelproductjeeapp</artifactId>
-       <version>2.1.10-SNAPSHOT</version>
-       <packaging>pom</packaging>
-
-       <name>laktatnebelProductJeeApp</name>
-
-       <parent>
-               <groupId>de.laktatnebel.maven</groupId>
-               <artifactId>laktatnebelproductjeemaster</artifactId>
-               <version>2.1.10-SNAPSHOT</version>
-       </parent>
-
-       <properties>
-               <project.scm.dir>${project.artifactId}</project.scm.dir>
-       </properties>
-
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.apache.openejb</groupId>
-                               <artifactId>javaee-api</artifactId>
-                               <version>${org.apache.openejb.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-
-       <dependencies>
-               <dependency>
-                       <groupId>org.apache.openejb</groupId>
-                       <artifactId>javaee-api</artifactId>
-                       <scope>provided</scope>
-               </dependency>
-       </dependencies>
-
-       <!-- build>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <groupId>org.apache.tomcat.maven</groupId>
-                                       <artifactId>tomcat-maven-plugin</artifactId>
-                                       <version>${tomcat7-maven-plugin.version}</version>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
-
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.tomcat.maven</groupId>
-                               <artifactId>tomcat-maven-plugin</artifactId>
-                       </plugin>
-               </plugins>
-       </build-->
-</project>
\ No newline at end of file
+<?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>
+
+    <parent>
+        <groupId>de.laktatnebel.maven</groupId>
+        <artifactId>laktatnebelproductjeemaster</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>laktatnebelproductjeeapp</artifactId>
+    <packaging>pom</packaging>
+
+    <name>laktatnebelProductJeeApp</name>
+
+    <properties>
+        <!-- Jakarta EE 10 Full Profile -->
+        <jakarta.jakartaee-api.version>10.0.0</jakarta.jakartaee-api.version>
+        <project.scm.dir>${project.artifactId}</project.scm.dir>
+    </properties>
+
+    <!--
+        Parent für EAR/EJB-Projekte (Jakarta EE Full Profile).
+        Ersetzt die frühere openejb javaee-api Dependency durch
+        die offizielle jakarta.jakartaee-api.
+    -->
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>jakarta.platform</groupId>
+                <artifactId>jakarta.jakartaee-api</artifactId>
+                <version>${jakarta.jakartaee-api.version}</version>
+                <scope>provided</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+</project>
index 8168b8ce04812d5e5b05959a687995018aa7ad67..93d723c6239aaa37d337c94adb5a7b00a9c99975 100644 (file)
-<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>
+<?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>de.laktatnebel.maven</groupId>
-       <artifactId>laktatnebelproductjeeweb</artifactId>
-       <version>2.1.10-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <parent>
+        <groupId>de.laktatnebel.maven</groupId>
+        <artifactId>laktatnebelproductjeemaster</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-       <name>laktatnebelProductJeeWeb</name>
+    <artifactId>laktatnebelproductjeeweb</artifactId>
+    <packaging>pom</packaging>
 
-       <parent>
-               <groupId>de.laktatnebel.maven</groupId>
-               <artifactId>laktatnebelproductjeemaster</artifactId>
-               <version>2.1.10-SNAPSHOT</version>
-       </parent>
+    <name>laktatnebelProductJeeWeb</name>
 
-       <properties>
-               <project.scm.dir>${project.artifactId}</project.scm.dir>
-       </properties>
+    <properties>
+        <deploy.path>/${project.artifactId}</deploy.path>
+        <project.scm.dir>${project.artifactId}</project.scm.dir>
+    </properties>
 
-       <profiles>
-               <profile>
-                       <id>local</id>
-                       <properties>
-                               <deploy.host>localhost</deploy.host>
-                               <deploy.server>tomcat.localhost</deploy.server><!-- aus settings.xml -->
-                       </properties>
-               </profile>
-               <profile>
-                       <id>tb</id>
-                       <properties>
-                               <deploy.host>localhost</deploy.host>
-                               <deploy.server>tomcat</deploy.server><!-- aus settings.xml -->
-                       </properties>
-               </profile>
-               <profile>
-                       <id>athene</id>
-                       <properties>
-                               <deploy.host>athene</deploy.host>
-                               <deploy.server>tomcat.athene</deploy.server><!-- aus settings.xml -->
-                       </properties>
-               </profile>
-       </profiles>
+    <!--
+        Parent für WAR-Projekte auf Tomcat 10.1 / 11.
+        Konkrete Projekte setzen packaging=war.
 
-       <build>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <groupId>org.apache.tomcat.maven</groupId>
-                                       <artifactId>tomcat7-maven-plugin</artifactId>
-                                       <version>${tomcat7-maven-plugin.version}</version>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
+        Deploy via cargo-maven3-plugin (tomcat7-maven-plugin
+        unterstützt Tomcat 10+ nicht mehr).
+        Konfigurationsbeispiel siehe Kommentar unten.
+    -->
 
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.tomcat.maven</groupId>
-                               <artifactId>tomcat7-maven-plugin</artifactId>
-                               <configuration>
-                                       <url>http://${deploy.host}:8080/manager/html</url>
-                                       <server>${deploy.server}</server>
-                                       <path>${deploy.path}</path>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-war-plugin</artifactId>
-                               <version>${maven-war-plugin.version}</version>
-                               <configuration>
-                                       <failOnMissingWebXml>false</failOnMissingWebXml>
-                                       <primaryArtifact>false</primaryArtifact>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-</project>
\ No newline at end of file
+    <profiles>
+        <profile>
+            <id>local</id>
+            <properties>
+                <deploy.host>localhost</deploy.host>
+                <deploy.server>tomcat.localhost</deploy.server>
+            </properties>
+        </profile>
+        <profile>
+            <id>tb</id>
+            <properties>
+                <deploy.host>localhost</deploy.host>
+                <deploy.server>tomcat</deploy.server>
+            </properties>
+        </profile>
+        <profile>
+            <id>athene</id>
+            <properties>
+                <deploy.host>athene</deploy.host>
+                <deploy.server>tomcat.athene</deploy.server>
+            </properties>
+        </profile>
+    </profiles>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>${maven-war-plugin.version}</version>
+                    <configuration>
+                        <failOnMissingWebXml>false</failOnMissingWebXml>
+                        <primaryArtifact>false</primaryArtifact>
+                    </configuration>
+                </plugin>
+                <!--
+                    Deploy auf Tomcat 10/11 via cargo:
+                    <plugin>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven3-plugin</artifactId>
+                        <version>1.10.13</version>
+                        <configuration>
+                            <container>
+                                <containerId>tomcat11x</containerId>
+                                <type>remote</type>
+                            </container>
+                            <configuration>
+                                <type>runtime</type>
+                                <properties>
+                                    <cargo.hostname>${deploy.host}</cargo.hostname>
+                                    <cargo.servlet.port>8080</cargo.servlet.port>
+                                    <cargo.remote.username>...</cargo.remote.username>
+                                    <cargo.remote.password>...</cargo.remote.password>
+                                </properties>
+                            </configuration>
+                            <deployables>
+                                <deployable>
+                                    <properties>
+                                        <context>${deploy.path}</context>
+                                    </properties>
+                                </deployable>
+                            </deployables>
+                        </configuration>
+                    </plugin>
+                -->
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
index 984a3fb2e9f013df1835c4faf2bdab52770c41f4..a824a2c2fd279b13513c6359b1a787a97729b844 100644 (file)
@@ -1,51 +1,61 @@
-<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>de.laktatnebel.maven</groupId>
-       <artifactId>laktatnebelproductjeemaster</artifactId>
-       <version>2.1.10-SNAPSHOT</version>
-       <packaging>pom</packaging>
-
-       <name>laktatnebelProductJeeMaster</name>
-
-       <parent>
-               <groupId>de.laktatnebel.maven</groupId>
-               <artifactId>laktatnebelproductmaster</artifactId>
-               <version>2.1.10-SNAPSHOT</version>
-       </parent>
-
-       <properties>
-               <project.scm.dir>${project.artifactId}</project.scm.dir>
-       </properties>
-       
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>javax.servlet</groupId>
-                               <artifactId>javax.servlet-api</artifactId>
-                               <version>${javax.servlet-api.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>javax.servlet.jsp</groupId>
-                               <artifactId>javax.servlet.jsp-api</artifactId>
-                               <version>${javax.servlet.jsp-api.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-
-       <dependencies>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>javax.servlet-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet.jsp</groupId>
-                       <artifactId>javax.servlet.jsp-api</artifactId>
-               </dependency>
-       </dependencies>
-       
-       <modules>
-               <module>laktatnebelproductjeeweb</module>
-               <module>laktatnebelproductjeeapp</module>
-       </modules>
-</project>
\ No newline at end of file
+<?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>
+
+    <parent>
+        <groupId>de.laktatnebel.maven</groupId>
+        <artifactId>laktatnebelproductmaster</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>laktatnebelproductjeemaster</artifactId>
+    <packaging>pom</packaging>
+
+    <name>laktatnebelProductJeeMaster</name>
+
+    <properties>
+        <!-- Jakarta EE 10 – kompatibel mit Tomcat 10.1 / 11 -->
+        <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
+        <jakarta.servlet.jsp-api.version>3.1.1</jakarta.servlet.jsp-api.version>
+        <project.scm.dir>${project.artifactId}</project.scm.dir>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>${jakarta.servlet-api.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.servlet.jsp</groupId>
+                <artifactId>jakarta.servlet.jsp-api</artifactId>
+                <version>${jakarta.servlet.jsp-api.version}</version>
+                <scope>provided</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet.jsp</groupId>
+            <artifactId>jakarta.servlet.jsp-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <modules>
+        <module>laktatnebelproductjeeweb</module>
+        <module>laktatnebelproductjeeapp</module>
+    </modules>
+
+</project>
diff --git a/laktatnebelproductmaster/laktatnebelproductstandalone/plain/pom.xml b/laktatnebelproductmaster/laktatnebelproductstandalone/plain/pom.xml
new file mode 100644 (file)
index 0000000..9f5d352
--- /dev/null
@@ -0,0 +1,28 @@
+<?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>
+
+    <parent>
+        <groupId>de.laktatnebel.maven</groupId>
+        <artifactId>laktatnebelproductstandalone</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>laktatnebelproductstandalone-plain</artifactId>
+    <packaging>pom</packaging>
+
+    <name>laktatnebelProductStandalone Plain</name>
+
+    <properties>
+        <project.scm.dir>${project.artifactId}</project.scm.dir>
+    </properties>
+
+    <!--
+        Parent für Java-Standalone ohne Datenbankzugriff.
+        Erbt: Java 17, Logback, JUnit 5, fat-jar Build.
+    -->
+
+</project>
index 02b695840c69825cf2e8fee496aab9ad3d252fca..c9a99fd44a397dfa17300cc38f57453991867486 100644 (file)
-<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>
+<?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>de.laktatnebel.maven</groupId>
-       <artifactId>laktatnebelproductstandalone</artifactId>
-       <version>2.1.10-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <parent>
+        <groupId>de.laktatnebel.maven</groupId>
+        <artifactId>laktatnebelproductmaster</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-       <name>laktatnebelProductStandalone</name>
+    <artifactId>laktatnebelproductstandalone</artifactId>
+    <packaging>pom</packaging>
 
-       <parent>
-               <groupId>de.laktatnebel.maven</groupId>
-               <artifactId>laktatnebelproductmaster</artifactId>
-               <version>2.1.10-SNAPSHOT</version>
-       </parent>
+    <name>laktatnebelProductStandalone</name>
 
-       <properties>
-               <project.scm.dir>${project.artifactId}</project.scm.dir>
-       </properties>
+    <properties>
+        <!-- Muss in konkreten Projekten überschrieben werden -->
+        <main.class>de.laktatnebel.MainClass</main.class>
+        <project.scm.dir>${project.artifactId}</project.scm.dir>
+    </properties>
 
-       <build>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <artifactId>maven-assembly-plugin</artifactId>
-                                       <version>${maven-assembly-plugin.version}</version>
-                                       <!-- executions> <execution> <id>bundle-project</id> <phase>package</phase> 
-                                               <goals> <goal>single</goal> </goals> <configuration> <finalName> ${project.artifactId}-assembly</finalName> 
-                                               <descriptorRefs> <descriptorRef> jar-with-dependencies </descriptorRef> </descriptorRefs> 
-                                               <archive> <index>true</index> <manifest> <addClasspath>true</addClasspath> 
-                                               <addDefaultImplementationEntries>true</addDefaultImplementationEntries> <addExtensions>true</addExtensions> 
-                                               <classpathLayoutType>simple</classpathLayoutType> <classpathMavenRepositoryLayout>true</classpathMavenRepositoryLayout> 
-                                               <mainClass>${main.class}</mainClass> </manifest> </archive> </configuration> 
-                                               </execution> </executions -->
-                               </plugin>
-                               <plugin>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <version>${maven-jar-plugin.version}</version>
-                               </plugin>
-                               <plugin>
-                                       <artifactId>maven-dependency-plugin</artifactId>
-                                       <version>${maven-dependency-plugin.version}</version>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
+    <!--
+        Parent für Java-Standalone-Anwendungen (kein Spring, kein Container).
+        Baut ein executable fat JAR mit allen Abhängigkeiten.
 
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <executions>
-                                       <execution>
-                                               <id>make-executable-jar-with-dependencies</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <archive>
-                                                               <manifest>
-                                                                       <addClasspath>true</addClasspath>
-                                                                       <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                                                                       <addExtensions>true</addExtensions>
-                                                                       <classpathLayoutType>simple</classpathLayoutType>
-                                                                       <!--classpathMavenRepositoryLayout>true</classpathMavenRepositoryLayout-->
-                                                                       <mainClass>${main.class}</mainClass>
-                                                               </manifest>
-                                                       </archive>
-                                                       <descriptorRefs>
-                                                               <descriptorRef>jar-with-dependencies</descriptorRef>
-                                                       </descriptorRefs>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dependencies</id>
-                                               <phase>prepare-package</phase>
-                                               <goals>
-                                                       <goal>copy-dependencies</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <outputDirectory>${project.build.directory}</outputDirectory>
-                                                       <overWriteReleases>true</overWriteReleases>
-                                                       <overWriteSnapshots>false</overWriteSnapshots>
-                                                       <overWriteIfNewer>true</overWriteIfNewer>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <!-- Build an executable JAR -->
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifest>
-                                                       <addClasspath>true</addClasspath>
-                                                       <mainClass>${main.class}</mainClass>
-                                               </manifest>
-                                       </archive>
-                                       <descriptorRefs>
-                                               <descriptorRef>jar-with-dependencies</descriptorRef>
-                                       </descriptorRefs>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+        Konkrete Projekte müssen setzen:
+          <main.class>de.laktatnebel.meinprojekt.Main</main.class>
+    -->
 
-</project>
\ No newline at end of file
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${maven-jar-plugin.version}</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addClasspath>true</addClasspath>
+                                <mainClass>${main.class}</mainClass>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>${maven-assembly-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>${maven-dependency-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>make-fat-jar</id>
+                        <phase>package</phase>
+                        <goals><goal>single</goal></goals>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <addClasspath>true</addClasspath>
+                                    <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                                    <mainClass>${main.class}</mainClass>
+                                </manifest>
+                            </archive>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <modules>
+        <module>plain</module>
+        <module>withjpa</module>
+    </modules>
+
+</project>
diff --git a/laktatnebelproductmaster/laktatnebelproductstandalone/withjpa/pom.xml b/laktatnebelproductmaster/laktatnebelproductstandalone/withjpa/pom.xml
new file mode 100644 (file)
index 0000000..0cb4a77
--- /dev/null
@@ -0,0 +1,53 @@
+<?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>
+
+    <parent>
+        <groupId>de.laktatnebel.maven</groupId>
+        <artifactId>laktatnebelproductstandalone</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>laktatnebelproductstandalone-withjpa</artifactId>
+    <packaging>pom</packaging>
+
+    <name>laktatnebelProductStandalone WithJpa</name>
+
+    <properties>
+        <hibernate.version>6.5.2.Final</hibernate.version>
+        <project.scm.dir>${project.artifactId}</project.scm.dir>
+    </properties>
+
+    <!--
+        Parent für Java-Standalone mit JPA / Hibernate.
+        Erbt: Java 17, Logback, JUnit 5, fat-jar Build.
+
+        JDBC-Treiber muss im konkreten Projekt ergänzt werden, z.B.:
+          <dependency>
+              <groupId>org.postgresql</groupId>
+              <artifactId>postgresql</artifactId>
+              <version>42.7.3</version>
+          </dependency>
+    -->
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.hibernate.orm</groupId>
+                <artifactId>hibernate-core</artifactId>
+                <version>${hibernate.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/laktatnebelproductmaster/laktatnebelspringboot/pom.xml b/laktatnebelproductmaster/laktatnebelspringboot/pom.xml
new file mode 100644 (file)
index 0000000..03f9c53
--- /dev/null
@@ -0,0 +1,78 @@
+<?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>
+
+    <parent>
+        <groupId>de.laktatnebel.maven</groupId>
+        <artifactId>laktatnebelproductmaster</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>laktatnebelspringboot</artifactId>
+    <packaging>pom</packaging>
+
+    <name>laktatnebelSpringBoot</name>
+
+    <properties>
+        <spring-boot.version>3.3.1</spring-boot.version>
+        <project.scm.dir>${project.artifactId}</project.scm.dir>
+    </properties>
+
+    <!--
+        Spring Boot standalone (embedded Tomcat/Jetty).
+        Nutzt BOM-Import statt spring-boot-starter-parent als Maven-Parent,
+        damit laktatnebelmaster der Parent bleibt.
+    -->
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <version>${spring-boot.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals><goal>repackage</goal></goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/laktatnebelproductmaster/laktatnebelspringboottomcat/pom.xml b/laktatnebelproductmaster/laktatnebelspringboottomcat/pom.xml
new file mode 100644 (file)
index 0000000..db3bb6b
--- /dev/null
@@ -0,0 +1,99 @@
+<?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>
+
+    <parent>
+        <groupId>de.laktatnebel.maven</groupId>
+        <artifactId>laktatnebelproductmaster</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>laktatnebelspringboottomcat</artifactId>
+    <packaging>pom</packaging>
+
+    <name>laktatnebelSpringBootTomcat</name>
+
+    <properties>
+        <spring-boot.version>3.3.1</spring-boot.version>
+        <project.scm.dir>${project.artifactId}</project.scm.dir>
+    </properties>
+
+    <!--
+        Spring Boot als WAR für externen Tomcat 10.1 / 11.
+        Spring Boot 3.x nutzt jakarta.* – passt zu Tomcat 10+.
+
+        Konkrete Projekte müssen:
+          1. packaging=war setzen
+          2. Eine Klasse extends SpringBootServletInitializer bereitstellen
+    -->
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <!-- Embedded Tomcat wird beim WAR-Deploy nicht gebraucht -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <version>${spring-boot.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>${maven-war-plugin.version}</version>
+                    <configuration>
+                        <failOnMissingWebXml>false</failOnMissingWebXml>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals><goal>repackage</goal></goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
index 19cc45ac33e7e78f6dd894f21a8c8dbd0153dccd..379b43241d3a56c8b187e9a4cb082eea0aa7c77c 100644 (file)
@@ -1,52 +1,47 @@
-<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>de.laktatnebel.maven</groupId>
-       <artifactId>laktatnebelproductmaster</artifactId>
-       <version>2.1.10-SNAPSHOT</version>
-       <packaging>pom</packaging>
-
-       <name>laktatnebelProductMaster</name>
-
-       <parent>
-               <groupId>de.laktatnebel.maven</groupId>
-               <artifactId>laktatnebelmaster</artifactId>
-               <version>2.1.10-SNAPSHOT</version>
-       </parent>
-
-       <properties>
-               <slf4j.version>2.0.7</slf4j.version>
-               <project.scm.dir>${project.artifactId}</project.scm.dir>
-       </properties>
-
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.slf4j</groupId>
-                               <artifactId>slf4j-api</artifactId>
-                               <version>${slf4j.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.slf4j</groupId>
-                               <artifactId>slf4j-log4j12</artifactId>
-                               <version>${slf4j.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-
-       <dependencies>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-log4j12</artifactId>
-               </dependency>
-       </dependencies>
-       
-       <modules>
-               <module>laktatnebelproductjeemaster</module>
-               <module>laktatnebelproductstandalone</module>
-       </modules>
-</project>
\ No newline at end of file
+<?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>
+
+    <parent>
+        <groupId>de.laktatnebel.maven</groupId>
+        <artifactId>laktatnebelmaster</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>laktatnebelproductmaster</artifactId>
+    <packaging>pom</packaging>
+
+    <name>laktatnebelProductMaster</name>
+
+    <properties>
+        <project.scm.dir>${project.artifactId}</project.scm.dir>
+    </properties>
+
+    <!--
+        Basis für alle auslieferbaren Produkte (keine reinen Libs).
+        Fügt SLF4J + Logback als feste Abhängigkeit hinzu.
+    -->
+
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+    </dependencies>
+
+    <modules>
+        <module>laktatnebelproductstandalone</module>
+        <module>laktatnebelspringboot</module>
+        <module>laktatnebelspringboottomcat</module>
+        <module>laktatnebelproductjeemaster</module>
+        <module>laktatnebeljeemigration</module>
+    </modules>
+
+</project>
index 894c5c82352a81055c6717b731871dc795d40272..378a6e5c44f7b19978b80d8999aa6da85891707f 100644 (file)
@@ -1,76 +1,67 @@
-<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>
+<?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>de.laktatnebel.maven</groupId>
-       <artifactId>laktatnebelscript</artifactId>
-       <version>2.1.10-SNAPSHOT</version>
-       <packaging>pom</packaging>
+    <parent>
+        <groupId>de.laktatnebel.maven</groupId>
+        <artifactId>laktatnebelmaster</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-       <name>laktatnebelScript</name>
+    <artifactId>laktatnebelscript</artifactId>
+    <packaging>pom</packaging>
 
-       <parent>
-               <groupId>de.laktatnebel.maven</groupId>
-               <artifactId>laktatnebelmaster</artifactId>
-               <version>2.1.10-SNAPSHOT</version>
-       </parent>
+    <name>laktatnebelScript</name>
 
-       <properties>
-               <project.scm.dir>${project.artifactId}</project.scm.dir>
-       </properties>
+    <properties>
+        <project.scm.dir>${project.artifactId}</project.scm.dir>
+    </properties>
 
-       <build>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <artifactId>maven-assembly-plugin</artifactId>
-                                       <version>${maven-assembly-plugin.version}</version>
-                                       <executions>
-                                               <execution>
-                                                       <id>tar</id>
-                                                       <phase>package</phase>
-                                                       <goals>
-                                                               <goal>single</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <finalName>${project.artifactId}</finalName>
-                                                               <descriptors>
-                                                       <descriptor>assembly.xml</descriptor>
-                                                       </descriptors>
-                                                       </configuration>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-                               <plugin>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <version>${maven-jar-plugin.version}</version>
-                                       <configuration>
-                                               <skipIfEmpty>true</skipIfEmpty>
-                                       </configuration>
-                               </plugin>
-                               <plugin>
-                                       <artifactId>maven-surefire-plugin</artifactId>
-                                       <version>${maven-surefire-plugin.version}</version>
-                                       <configuration>
-                                               <skipTests>true</skipTests>
-                                       </configuration>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
-       </build>
+    <!--
+        Parent für Bash-Skript-Projekte die über Maven verwaltet werden.
+        Das assembly-Plugin packt die Skripte als tar/zip.
+        Konkrete Projekte brauchen eine assembly.xml im Projektwurzel.
+    -->
 
-       <developers>
-               <developer>
-                       <id>oleb</id>
-                       <name>Ole Benjamin Rosentreter</name>
-                       <email>ole@laktatnebel.de</email>
-                       <organization>Laktatnebel.de</organization>
-                       <organizationUrl>http://www.laktatnebel.de</organizationUrl>
-                       <roles>
-                               <role>architect</role>
-                               <role>developer</role>
-                       </roles>
-                       <timezone>+1</timezone>
-               </developer>
-       </developers>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>${maven-assembly-plugin.version}</version>
+                    <executions>
+                        <execution>
+                            <id>tar</id>
+                            <phase>package</phase>
+                            <goals><goal>single</goal></goals>
+                            <configuration>
+                                <finalName>${project.artifactId}</finalName>
+                                <descriptors>
+                                    <descriptor>assembly.xml</descriptor>
+                                </descriptors>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${maven-jar-plugin.version}</version>
+                    <configuration>
+                        <skipIfEmpty>true</skipIfEmpty>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                    <configuration>
+                        <skipTests>true</skipTests>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 5a2137c76a4e58cb30d328d0c68e36918330c78e..ffb5e4736e9fa1a0667a92dafe3076fb800e80ac 100644 (file)
--- a/pom.xml
+++ b/pom.xml
-<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>
+<?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>de.laktatnebel.maven</groupId>
+    <artifactId>laktatnebelmaster</artifactId>
+    <version>3.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>laktatnebelMaster</name>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+        <java.version>17</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>
+
+        <!-- Logging -->
+        <slf4j.version>2.0.12</slf4j.version>
+        <logback.version>1.5.6</logback.version>
+
+        <!-- Test -->
+        <junit.version>5.10.2</junit.version>
+
+        <!-- Maven Plugins -->
+        <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
+        <maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
+        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
+        <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
+        <maven-ear-plugin.version>3.3.0</maven-ear-plugin.version>
+        <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
+        <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>
+        <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
+        <maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
+        <maven-site-plugin.version>4.0.0-M13</maven-site-plugin.version>
+
+        <project.scm.dir>${project.artifactId}</project.scm.dir>
+        <javadoc.opts>-Xdoclint:none</javadoc.opts>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>${slf4j.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.junit.jupiter</groupId>
+                <artifactId>junit-jupiter</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven-compiler-plugin.version}</version>
+                    <configuration>
+                        <release>${java.version}</release>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>${maven-source-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>${maven-javadoc-plugin.version}</version>
+                    <configuration>
+                        <doclint>none</doclint>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>${maven-enforcer-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>${maven-deploy-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>${maven-release-plugin.version}</version>
+                    <configuration>
+                        <branchName>develop</branchName>
+                        <pushChanges>false</pushChanges>
+                        <localCheckout>true</localCheckout>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>${maven-site-plugin.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>enforce-versions</id>
+                        <goals><goal>enforce</goal></goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>[3.6,)</version>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>[${java.version},)</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals><goal>jar</goal></goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals><goal>jar-no-fork</goal></goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>no.tests</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <skipTests>true</skipTests>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <developers>
+        <developer>
+            <id>oleb</id>
+            <name>Ole Benjamin Rosentreter</name>
+            <email>ole@laktatnebel.de</email>
+            <organization>Laktatnebel.de</organization>
+            <organizationUrl>http://www.laktatnebel.de</organizationUrl>
+            <roles>
+                <role>architect</role>
+                <role>developer</role>
+            </roles>
+            <timezone>+1</timezone>
+        </developer>
+    </developers>
+
+    <scm>
+        <connection>scm:git:ssh://laktatnebel.de/srv/git/${project.scm.dir}</connection>
+        <developerConnection>scm:git:ssh://laktatnebel.de/srv/git/${project.scm.dir}</developerConnection>
+        <tag>HEAD</tag>
+    </scm>
+
+    <distributionManagement>
+        <repository>
+            <id>laktatnebel.release</id>
+            <name>Release Repository</name>
+            <url>file:///home/oleb/.m2/distribution</url>
+        </repository>
+        <snapshotRepository>
+            <id>laktatnebel.snapshots</id>
+            <uniqueVersion>false</uniqueVersion>
+            <name>Snapshot Repository</name>
+            <url>file:///home/oleb/.m2/distribution</url>
+        </snapshotRepository>
+        <site>
+            <id>laktatnebel.site</id>
+            <name>Sites</name>
+            <url>file:///home/oleb/.m2/site</url>
+        </site>
+    </distributionManagement>
+
+    <modules>
+        <module>laktatnebellib</module>
+        <module>laktatnebelscript</module>
+        <module>laktatnebelproductmaster</module>
+    </modules>
 
-       <groupId>de.laktatnebel.maven</groupId>
-       <artifactId>laktatnebelmaster</artifactId>
-       <version>2.1.10-SNAPSHOT</version>
-       <packaging>pom</packaging>
-
-       <name>laktatnebelMaster</name>
-
-       <properties>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
-               <java.version>15</java.version>
-               <maven.compiler.source>${java.version}</maven.compiler.source>
-               <maven.compiler.target>${java.version}</maven.compiler.target>
-
-               <maven-enforcer-plugin.version>3.3.0</maven-enforcer-plugin.version>
-
-               <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-               <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-               <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
-
-               <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
-               <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-               <maven-ear-plugin.version>3.3.0</maven-ear-plugin.version>
-               <maven-assembly-plugin.version>3.5.0</maven-assembly-plugin.version>
-               <maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version>
-
-               <maven-release-plugin.version>3.0.0</maven-release-plugin.version>
-               <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
-               <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
-               <maven-site-plugin.version>4.0.0-M6</maven-site-plugin.version>
-
-               <junit.version>4.13.2</junit.version>
-
-               <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
-               <javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>
-               <org.apache.openejb.version>6.0-6</org.apache.openejb.version>
-
-               <!-- maven-glassfish-plugin.version>2.1</maven-glassfish-plugin.version-->
-               <tomcat7-maven-plugin.version>2.2</tomcat7-maven-plugin.version>
-
-               <project.scm.dir>${project.artifactId}</project.scm.dir>
-
-               <javadoc.opts>-Xdoclint:none</javadoc.opts>
-       </properties>
-
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>junit</groupId>
-                               <artifactId>junit</artifactId>
-                               <version>${junit.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-
-       <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
-
-       <build>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-javadoc-plugin</artifactId>
-                                       <version>${maven-javadoc-plugin.version}</version>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-compiler-plugin</artifactId>
-                                       <version>${maven-compiler-plugin.version}</version>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-enforcer-plugin</artifactId>
-                                       <version>${maven-enforcer-plugin.version}</version>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-source-plugin</artifactId>
-                                       <version>${maven-source-plugin.version}</version>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-deploy-plugin</artifactId>
-                                       <version>${maven-deploy-plugin.version}</version>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-release-plugin</artifactId>
-                                       <version>${maven-release-plugin.version}</version>
-                                       <configuration>
-                                               <branchName>develop</branchName>
-                                               <pushChanges>false</pushChanges>
-                                               <localCheckout>true</localCheckout>
-                                               <!--tagBase>http://svn.obg-it.de/obgit/obgit_repo/tags/${project.scm.dir}</tagBase -->
-                                               <!--branchBase>http://svn.obg-it.de/obgit/obgit_repo/branches/${project.scm.dir}</branchBase -->
-                                       </configuration>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-site-plugin</artifactId>
-                                       <version>${maven-site-plugin.version}</version>
-                                       <executions>
-                                               <execution>
-                                                       <goals>
-                                                               <goal>site</goal>
-                                                       </goals>
-                                                       <configuration>
-                                                               <reportPlugins>
-                                                                       <plugin>
-                                                                               <artifactId>maven-javadoc-plugin</artifactId>
-                                                                       </plugin>
-                                                               </reportPlugins>
-                                                       </configuration>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>${maven-javadoc-plugin.version}</version>
-                               <configuration>
-                                       <additionalparam>${javadoc.opts}</additionalparam>
-                                       <doclint>none</doclint>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>attach-javadocs</id>
-                                               <goals>
-                                                       <goal>jar</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <additionalparam>${javadoc.opts}</additionalparam>
-                                                       <doclint>none</doclint>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-site-plugin</artifactId>
-                               <version>${maven-site-plugin.version}</version>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <configuration>
-                                       <release>${java.version}</release>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <artifactId>maven-enforcer-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>enforce-versions</id>
-                                               <goals>
-                                                       <goal>enforce</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                               <configuration>
-                                       <!-- http://maven.apache.org/enforcer/enforcer-rules/versionRanges.html -->
-                                       <rules>
-                                               <requireMavenVersion>
-                                                       <version>[3.0,)</version>
-                                               </requireMavenVersion>
-                                               <requireJavaVersion>
-                                                       <version>${java.version}</version>
-                                               </requireJavaVersion>
-                                       </rules>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-
-       <reporting>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>${maven-javadoc-plugin.version}</version>
-                               <configuration>
-                                       <additionalparam>${javadoc.opts}</additionalparam>
-                                       <aggregate>true</aggregate>
-                                       <doclint>none</doclint>
-                               </configuration>
-                               <!-- configuration> <reportPlugins> <plugin> <groupId>org.apache.maven.plugins</groupId> 
-                                       <artifactId>maven-javadoc-plugin</artifactId> <configuration> <additionalparam>${javadoc.opts}</additionalparam> 
-                                       <doclint>none</doclint> </configuration> <executions> <execution> <id>attach-javadocs</id> 
-                                       <configuration> <additionalparam>${javadoc.opts}</additionalparam> <doclint>none</doclint> 
-                                       </configuration> </execution> </executions> </plugin> </reportPlugins> </configuration -->
-                       </plugin>
-               </plugins>
-       </reporting>
-
-       <profiles>
-               <profile>
-                       <id>no.tests</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.apache.maven.plugins</groupId>
-                                               <artifactId>maven-surefire-plugin</artifactId>
-                                               <version>${maven-surefire-plugin.version}</version>
-                                               <configuration>
-                                                       <skipTests>true</skipTests>
-                                               </configuration>
-                                       </plugin>
-                               </plugins>
-                       </build>
-               </profile>
-       </profiles>
-
-       <developers>
-               <developer>
-                       <id>oleb</id>
-                       <name>Ole Benjamin Rosentreter</name>
-                       <email>ole@laktatnebel.de</email>
-                       <organization>Laktatnebel.de</organization>
-                       <organizationUrl>http://www.laktatnebel.de</organizationUrl>
-                       <roles>
-                               <role>architect</role>
-                               <role>developer</role>
-                       </roles>
-                       <timezone>+1</timezone>
-               </developer>
-       </developers>
-
-       <scm>
-               <connection>scm:git:ssh://laktatnebel.de/srv/git/{artifactId}</connection>
-               <developerConnection>scm:git:ssh://laktatnebel.de/srv/git/{artifactId}</developerConnection>
-               <tag>HEAD</tag>
-       </scm>
-
-       <distributionManagement>
-               <repository>
-                       <id>laktatnebel.release</id>
-                       <name>Release Repository</name>
-                       <url>file:///home/oleb/.m2/distribution</url>
-               </repository>
-               <snapshotRepository>
-                       <id>laktatnebel.snapshots</id>
-                       <uniqueVersion>false</uniqueVersion>
-                       <name>Snapshot Repository</name>
-                       <url>file:///home/oleb/.m2/distribution</url>
-               </snapshotRepository>
-               <site>
-                       <id>laktatnebel.site</id>
-                       <name>Sites</name>
-                       <url>file:///home/oleb/.m2/site</url>
-               </site>
-       </distributionManagement>
-
-       <modules>
-               <module>laktatnebellib</module>
-               <module>laktatnebelscript</module>
-               <module>laktatnebelproductmaster</module>
-       </modules>
 </project>
diff --git a/release.properties b/release.properties
new file mode 100644 (file)
index 0000000..6f3ebcc
--- /dev/null
@@ -0,0 +1,34 @@
+#release configuration
+#Fri Mar 13 17:33:26 CET 2026
+completedPhase=check-poms
+exec.pomFileName=pom.xml
+exec.snapshotReleasePluginAllowed=false
+pinExternals=false
+preparationGoals=clean verify
+project.scm.de.laktatnebel.maven\:laktatnebeljeemigration.empty=true
+project.scm.de.laktatnebel.maven\:laktatnebellib.empty=true
+project.scm.de.laktatnebel.maven\:laktatnebelmaster.connection=scm\:git\:ssh\://laktatnebel.de/srv/git/${project.scm.dir}
+project.scm.de.laktatnebel.maven\:laktatnebelmaster.developerConnection=scm\:git\:ssh\://laktatnebel.de/srv/git/${project.scm.dir}
+project.scm.de.laktatnebel.maven\:laktatnebelmaster.tag=HEAD
+project.scm.de.laktatnebel.maven\:laktatnebelproductjeeapp.empty=true
+project.scm.de.laktatnebel.maven\:laktatnebelproductjeemaster.empty=true
+project.scm.de.laktatnebel.maven\:laktatnebelproductjeeweb.empty=true
+project.scm.de.laktatnebel.maven\:laktatnebelproductmaster.empty=true
+project.scm.de.laktatnebel.maven\:laktatnebelproductstandalone-plain.empty=true
+project.scm.de.laktatnebel.maven\:laktatnebelproductstandalone-withjpa.empty=true
+project.scm.de.laktatnebel.maven\:laktatnebelproductstandalone.empty=true
+project.scm.de.laktatnebel.maven\:laktatnebelscript.empty=true
+project.scm.de.laktatnebel.maven\:laktatnebelspringboot.empty=true
+project.scm.de.laktatnebel.maven\:laktatnebelspringboottomcat.empty=true
+projectVersionPolicyConfig=<projectVersionPolicyConfig>${projectVersionPolicyConfig}</projectVersionPolicyConfig>\n
+projectVersionPolicyId=default
+pushChanges=false
+releaseStrategyId=default
+remoteTagging=true
+scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel}
+scm.commentPrefix=[maven-release-plugin] 
+scm.developmentCommitComment=@{prefix} prepare for next development iteration
+scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel}
+scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel}
+scm.tagNameFormat=@{project.artifactId}-@{project.version}
+scm.url=scm\:git\:ssh\://laktatnebel.de/srv/git/laktatnebelmaster