Maven build ermöglichen und automatisieren

.classpath

@@ -1,37 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry excluding="fonts/*|holidays/*|img/*|lang/*|liquibase/*|main/*" including="**/*.java" kind="src" output="target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path="junit/src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry exported="true" kind="src" path="/jameica"/>
-	<classpathentry kind="lib" path="lib/nc.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/javax.mail-1.6.2.jar"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/hibiscus"/>
-	<classpathentry exported="true" kind="lib" path="lib/activation.jar"/>
-	<classpathentry exported="true" kind="lib" path="/hibiscus/lib/obantoo-bin-2.1.12.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/bsh-core-2.0b4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/csvjdbc-1.0.40.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/itext-hyph-xml.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jollyday-0.5.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/joda-time-2.12.7.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/snakeyaml-2.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="/jameica/lib/swt/win64/swt.jar" sourcepath="/jameica/lib.src/swt/linux/swt.src.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/junit-4.13.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/javase-3.5.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/core-3.1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="/jameica/lib/de_willuhn_ds/de_willuhn_ds.jar"/>
-	<classpathentry exported="true" kind="lib" path="/hibiscus/lib/super-csv-2.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="/hibiscus/lib/itext-pdfa-5.5.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="/hibiscus/lib/itextpdf-5.5.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/freemarker-2.3.33.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.17.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jsoup-1.18.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/vinnie-2.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ez-vcard-0.12.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="/hibiscus/lib/pdfbox/pdfbox-3.0.2.jar"/>
-	<classpathentry kind="lib" path="lib/xmpbox-3.0.3.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta.activation-api-2.1.3.jar"/>
-	<classpathentry kind="lib" path="lib/dom4j-2.1.4.jar"/>
-	<classpathentry kind="lib" path="lib/mustang-2.16.0.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.github/workflows/buildcheck.yml

@@ -5,13 +5,8 @@ name: OpenJVerein build check
 
 on:
   pull_request:
-    types: [opened, reopened, synchronize, edited]
-    paths:
-      - 'plugin.xml'
-      - 'build/**'
-      - 'lib/**'
-      - 'lib.src/**'
-      - 'src/**'
+    types: [ opened, reopened, synchronize, edited ]
+  push:
 jobs:
   call-reusable-workflow:
     uses: ./.github/workflows/reusable-build.yml
@@ -20,21 +15,24 @@ jobs:
     needs: call-reusable-workflow
     runs-on: ubuntu-latest
     steps:
-    - name: Restore cached tags and jars
-      id: cache-tags-jars
-      uses: actions/cache@v4
-      with:
-        path: |
-          ./cached-tags
-          jameica
-          hibiscus
-        key: ${{ runner.os }}-${{ github.repository_id }}
+      - name: Checkout openjverein
+        uses: actions/checkout@v4
 
-    - name: Checkout openjverein
-      uses: actions/checkout@v4
-      with:
-        path: jverein
+      - name: Restore cache
+        id: restore-cache
+        uses: actions/cache/restore@v4
+        with:
+          path: ~/.m2/repository
+          key: cache-${{ hashFiles('setup-build.xml') }}-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            cache-${{ hashFiles('setup-build.xml') }}
 
-    - name: Build openjverein plugin
-      working-directory: ./
-      run: ant -noinput -buildfile jverein/build/build.xml compile
+      - name: Build openjverein plugin
+        run: ./mvnw --batch-mode --file pom.xml clean package
+
+      - name: Save cache
+        uses: actions/cache/save@v4
+        if: steps.restore-cache.outputs.cache-hit != 'true'
+        with:
+          path: ~/.m2/repository
+          key: cache-${{ hashFiles('setup-build.xml') }}-${{ hashFiles('**/pom.xml') }}

.github/workflows/nightly-build.yml

@@ -18,51 +18,35 @@ jobs:
     needs: call-reusable-workflow
     runs-on: ubuntu-latest
     steps:
-    - name: Restore cached tags and jars
-      id: cache-tags-jars
-      uses: actions/cache@v4
-      with:
-        path: |
-          ./cached-tags
-          jameica
-          hibiscus
-        key: ${{ runner.os }}-${{ github.repository_id }}
-
     - name: Checkout openjverein
       uses: actions/checkout@v4
+
+    - name: Restore cache
+      id: restore-cache
+      uses: actions/cache/restore@v4
       with:
-        path: jverein
+        path: ~/.m2/repository
+        key: cache-${{ hashFiles('setup-build.xml') }}-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          cache-${{ hashFiles('setup-build.xml') }}
 
     - name: Build openjverein plugin
       id: openjverein
-      working-directory: ./
       run: |
-        ant_output=$(ant -e -q -noinput -buildfile jverein/build/build.xml nightly)
-        echo ${ant_output}
-
-        ssa="SELECTED_VERSION="
-        ssb=".zip"
-        text="${ant_output#*${ssa}}"
-        text="${text%${ssb}*}.zip"
-        tmp_version=$(echo $text | sed -rn 's/^([^[:blank:]]*).*$/\1/p')
-
-        ssa="SELECTED_FILENAME="
-        text="${ant_output#*${ssa}}"
-        text="${text%${ssb}*}.zip"
-        tmp_filename=$(echo $text | sed -rn 's/^([^[:blank:]]*).*$/\1/p')
-
-        ssa="SELECTED_PATH="
-        text="${ant_output#*${ssa}}"
-        text="${text%${ssb}*}.zip"
-        tmp_path=$(echo $text | sed -rn 's/^([^[:blank:]]*).*$/\1/p')
-
+        ./mvnw --batch-mode --file pom.xml clean package
+        tmp_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
         echo "selected_version=${tmp_version}" >> $GITHUB_OUTPUT
-        echo "selected_filename=${tmp_filename}" >> $GITHUB_OUTPUT
-        echo "selected_path=${tmp_path}" >> $GITHUB_OUTPUT
-
+        tmp_filename=$(basename "./target/jverein-*.zip")
         builddatetime=$(date +'%Y-%m-%d %H:%M')
         echo "### Version: ${tmp_version} | filename: ${tmp_filename} | build datetime: ${builddatetime}" >> $GITHUB_STEP_SUMMARY
 
+    - name: Save cache
+      uses: actions/cache/save@v4
+      if: steps.restore-cache.outputs.cache-hit != 'true'
+      with:
+        path: ~/.m2/repository
+        key: cache-${{ hashFiles('setup-build.xml') }}-${{ hashFiles('**/pom.xml') }}
+
     # Update tag
     - name: Tag repo
       uses: richardsimko/update-tag@v1
@@ -77,5 +61,5 @@ jobs:
         tag_name: ${{ steps.openjverein.outputs.selected_version }}
         prerelease: true
         name: Release ${{ steps.openjverein.outputs.selected_version }}
-        files: ./jverein/${{ steps.openjverein.outputs.selected_path }}
+        files: ./target/jverein-*.zip
         generate_release_notes: false

.github/workflows/release.yml

@@ -13,57 +13,48 @@ jobs:
     needs: call-reusable-workflow
     runs-on: ubuntu-latest
     steps:
-    - name: Restore cached tags and jars
-      id: cache-tags-jars
-      uses: actions/cache@v4
-      with:
-        path: |
-          ./cached-tags
-          jameica
-          hibiscus
-        key: ${{ runner.os }}-${{ github.repository_id }}
-
     - name: Checkout openjverein
       uses: actions/checkout@v4
+
+    - name: Restore cache
+      id: restore-cache
+      uses: actions/cache/restore@v4
       with:
-        path: jverein
+        path: ~/.m2/repository
+        key: cache-${{ hashFiles('setup-build.xml') }}-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          cache-${{ hashFiles('setup-build.xml') }}
 
     - name: Build openjverein plugin
       id: openjverein
-      working-directory: ./
       run: |
-        ant_output=$(ant -e -q -noinput -buildfile jverein/build/build.xml)
-        echo ${ant_output}
-
-        ssa="SELECTED_VERSION="
-        ssb=".zip"
-        text="${ant_output#*${ssa}}"
-        text="${text%${ssb}*}.zip"
-        tmp_version=$(echo $text | sed -rn 's/^([^[:blank:]]*).*$/\1/p')
-        tmp_version=$tmp_version
-
-        ssa="SELECTED_FILENAME="
-        text="${ant_output#*${ssa}}"
-        text="${text%${ssb}*}.zip"
-        tmp_filename=$(echo $text | sed -rn 's/^([^[:blank:]]*).*$/\1/p')
-
-        ssa="SELECTED_PATH="
-        text="${ant_output#*${ssa}}"
-        text="${text%${ssb}*}.zip"
-        tmp_path=$(echo $text | sed -rn 's/^([^[:blank:]]*).*$/\1/p')
-
+        ./mvnw --batch-mode --file pom.xml clean package
+        tmp_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
         echo "selected_version=${tmp_version}" >> $GITHUB_OUTPUT
-        echo "selected_filename=${tmp_filename}" >> $GITHUB_OUTPUT
-        echo "selected_path=${tmp_path}" >> $GITHUB_OUTPUT
-
+        tmp_filename=$(basename "./target/jverein-*.zip")
         builddatetime=$(date +'%Y-%m-%d %H:%M')
         echo "### Version: ${tmp_version} | filename: ${tmp_filename} | build datetime: ${builddatetime}" >> $GITHUB_STEP_SUMMARY
 
+    - name: Save cache
+      uses: actions/cache/save@v4
+      if: steps.restore-cache.outputs.cache-hit != 'true'
+      with:
+        path: ~/.m2/repository
+        key: cache-${{ hashFiles('setup-build.xml') }}-${{ hashFiles('**/pom.xml') }}
+
+    # Update tag
+    - name: Tag repo
+      uses: richardsimko/update-tag@v1
+      with:
+        tag_name: ${{ steps.openjverein.outputs.selected_version }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Release
       uses: softprops/action-gh-release@v2
       with:
         tag_name: ${{ steps.openjverein.outputs.selected_version }}
         prerelease: false
         name: Release ${{ steps.openjverein.outputs.selected_version }}
-        files: ./jverein/${{ steps.openjverein.outputs.selected_path }}
+        files: ./target/jverein-*.zip
         generate_release_notes: true

.github/workflows/reusable-build.yml

@@ -7,91 +7,30 @@ jobs:
   setup-java-and-cache:
     runs-on: ubuntu-latest
     steps:
-    - name: Set up JDK for x64
-      uses: actions/setup-java@v4
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-        architecture: x64
-
-    - name: Set env
-      id: setenvs
-      run: |
-        jameica_tag=$(git ls-remote --refs --tags --sort="-v:refname" https://github.com/willuhn/jameica.git V_\* | head -1 | cut -f 2 | cut -d / -f 3)
-        echo "jameica_tag=${jameica_tag}" >> $GITHUB_ENV
-        hibiscus_tag=$(git ls-remote --refs --tags --sort="-v:refname" https://github.com/willuhn/hibiscus.git V_\* | head -1 | cut -f 2 | cut -d / -f 3)
-        echo "hibiscus_tag=${hibiscus_tag}" >> $GITHUB_ENV
-        echo "### jameica_tag: ${jameica_tag} | hibiscus_tag: ${hibiscus_tag}"
-
-    - name: Restore cached tags and folders
-      id: cache-tags-jars
-      uses: actions/cache@v4
-      with:
-        path: |
-          ./cached-tags
-          jameica
-          hibiscus
-        key: ${{ runner.os }}-${{ github.repository_id }}
-
-    - name: Load cached tags
-      id: load-cache
-      run: |
-        if [ -f ./cached-tags/jameica_tag ]; then
-          cached_jameica_tag=$(cat ./cached-tags/jameica_tag)
-          echo "cached_jameica_tag=${cached_jameica_tag}" >> $GITHUB_ENV
-        else
-          echo "cached_jameica_tag=" >> $GITHUB_ENV
-        fi
-        if [ -f ./cached-tags/hibiscus_tag ]; then
-          cached_hibiscus_tag=$(cat ./cached-tags/hibiscus_tag)
-          echo "cached_hibiscus_tag=${cached_hibiscus_tag}" >> $GITHUB_ENV
-        else
-          echo "cached_hibiscus_tag=" >> $GITHUB_ENV
-        fi
-        echo "### cached_jameica_tag: ${cached_jameica_tag} | cached_hibiscus_tag: ${cached_hibiscus_tag}"
-
-    - name: Checkout jameica
-      if: ${{ env.cached_jameica_tag != env.jameica_tag }}
-      uses: actions/checkout@v4
-      with:
-        repository: willuhn/jameica
-        path: jameica
-        ref: ${{ env.jameica_tag }}
-
-    - name: Build jameica jar
-      if: ${{ env.cached_jameica_tag != env.jameica_tag }}
-      working-directory: ./ 
-      run: |
-        ant -noinput -buildfile jameica/build/build.xml jar
-        find jameica/releases/ -type f -name jameica.jar -exec cp {} jameica/releases/jameica-lib.jar \;
-
-    - name: Checkout hibiscus
-      if: ${{ env.cached_hibiscus_tag != env.hibiscus_tag }}
-      uses: actions/checkout@v4
-      with:
-        repository: willuhn/hibiscus
-        path: hibiscus
-        ref: ${{ env.hibiscus_tag }}
-
-    - name: Build hibiscus jar
-      if: ${{ env.cached_hibiscus_tag != env.hibiscus_tag }}
-      working-directory: ./ 
-      run: |
-        ant -noinput -buildfile hibiscus/build/build.xml jar
-        find hibiscus/releases/ -type f -name hibiscus.jar -exec cp {} hibiscus/releases/hibiscus-lib.jar \;
-
-    - name: Create cache files and needed folders
-      run: |
-        mkdir -p ./cached-tags
-        echo "${{ env.jameica_tag }}" > ./cached-tags/jameica_tag
-        echo "${{ env.hibiscus_tag }}" > ./cached-tags/hibiscus_tag
-
-    - name: Cache tags and folders
-      uses: actions/cache@v4
-      if: always()
-      with:
-        path: |
-            ./cached-tags
-            jameica
-            hibiscus
-        key: ${{ runner.os }}-${{ github.repository_id }}
+      - name: Set up JDK for x64
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          architecture: x64
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Restore cache
+        id: restore-cache
+        uses: actions/cache/restore@v4
+        with:
+          path: ~/.m2/repository
+          key: cache-${{ hashFiles('setup-build.xml') }}
+
+      - name: Run setup-build.xml
+        if: steps.restore-cache.outputs.cache-hit != 'true'
+        run: ./mvnw --batch-mode --file setup-build.xml clean install
+
+      - name: Save cache
+        if: steps.restore-cache.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          path: ~/.m2/repository
+          key: cache-${{ hashFiles('setup-build.xml') }}