[release] auto-merge released main back to dev

osslabz · Dec 3, 2024 · 74cea15 · 74cea15
2 parents 5a0e0f9 + ec98278
commit 74cea15
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 49 deletions.
diff --git a/.github/workflows/build-release-on-main-push.yml b/.github/workflows/build-release-on-main-push.yml
@@ -14,6 +14,7 @@ jobs:
       packages: write
 
     strategy:
+      max-parallel: 1 # otherwise the release upload will fail
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-13, macos-14 ]
 
@@ -33,22 +34,33 @@ jobs:
           cache: 'maven'
 
       - name: maven-build-verify
-        run: mvn --batch-mode -Posslabz-release,native-jpackage clean verify
+        run: mvn --batch-mode -Posslabz-release -Pnative-jpackage clean verify
 
       - name: configure-git-user
         uses: qoomon/actions--setup-git@v1
         with:
           user: bot
 
-      - name: get-latest-tag
-        id: get-latest-tag
-        uses: WyriHaximus/github-action-get-previous-tag@v1
+      - name: Extract version from pom.xml file
+        id: version-extractor
+        uses: dostonhamrakulov/[email protected]
+        with:
+          file_path: ${{ github.workspace }}/pom.xml
+
+      - name: Get the output version
+        run: echo "The found version ${{ steps.version-extractor.outputs.version }}"
+
+      - name: Tag snapshot
+        uses: tvdias/[email protected]
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ steps.version-extractor.outputs.version }}
 
       - name: create-release-notes
         uses: softprops/action-gh-release@v2
         with:
           generate_release_notes: true
-          tag_name: ${{ steps.get-latest-tag.outputs.tag }}
+          tag_name: ${{ steps.version-extractor.outputs.version }}
           files: target/dist/*
 
       - name: merge-main-to-dev

diff --git a/pom.xml b/pom.xml
@@ -1,12 +1,10 @@
 <?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">
+<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>net.osslabz</groupId>
     <artifactId>log-gazer</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.4</version>
 
     <properties>
         <osslabz.encoding>UTF-8</osslabz.encoding>
@@ -15,11 +13,11 @@
         <project.build.sourceEncoding>${osslabz.encoding}</project.build.sourceEncoding>
         <project.reporting.outputEncoding>${osslabz.encoding}</project.reporting.outputEncoding>
 
-        <project.build.outputTimestamp>2024-11-25T13:11:23Z</project.build.outputTimestamp>
+        <project.build.outputTimestamp>2024-12-02T20:20:06Z</project.build.outputTimestamp>
         <maven.compiler.release>${osslabz.java.version}</maven.compiler.release>
 
-        <mainClass>net.osslabz.loggazer.LogGazerApp</mainClass>
-        
+        <mainClass>net.osslabz.loggazer.AppStarter</mainClass>
+
         <jpackage.maven.plugin.version>1.6.5</jpackage.maven.plugin.version>
     </properties>
 
@@ -43,7 +41,7 @@
         <connection>scm:git:https://github.com/osslabz/log-gazer.git</connection>
         <developerConnection>scm:git:https://github.com/osslabz/log-gazer.git</developerConnection>
         <url>https://github.com/osslabz/log-gazer</url>
-        <tag>main</tag>
+        <tag>1.1.0</tag>
     </scm>
 
     <dependencies>
@@ -116,36 +114,6 @@
                             <goals>deploy</goals>
                         </configuration>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>3.3.1</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.11.1</version>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                                <configuration>
-                                    <doclint>none</doclint>
-                                    <failOnError>false</failOnError>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -291,17 +259,17 @@
                                 <configuration>
                                     <target>
                                         <!-- Define Properties for OS and Architecture -->
-                                        <property name="os.classifier" value="${os.detected.classifier}"/>
+                                        <property name="os.classifier" value="${os.detected.classifier}" />
 
                                         <!-- Rename all files in /target/dist -->
                                         <fileset dir="${project.build.directory}/dist">
                                             <!-- Include all files in the directory -->
-                                            <include name="*.*"/>
+                                            <include name="*.*" />
                                         </fileset>
 
                                         <move todir="${project.build.directory}/dist">
-                                            <fileset dir="${project.build.directory}/dist"/>
-                                            <mapper type="regexp" from="^(.*)\.(.*)$" to="\1-${os.classifier}.\2"/>
+                                            <fileset dir="${project.build.directory}/dist" />
+                                            <mapper type="regexp" from="^(.*)\.(.*)$" to="\1-${os.classifier}.\2" />
                                         </move>
                                     </target>
                                 </configuration>
@@ -347,11 +315,11 @@
                         </goals>
                         <configuration>
                             <transformers>
-                                <transformer
-                                    implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <mainClass>${mainClass}</mainClass>
                                 </transformer>
                             </transformers>
+                            <!-- <shadedClassifierName>${os.detected.classifier}</shadedClassifierName>-->
                         </configuration>
                     </execution>
                 </executions>
@@ -361,6 +329,7 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.4.2</version>
                 <configuration>
+                    <!--     <classifier>${os.detected.classifier}</classifier>-->
                     <archive>
                         <manifest>
                             <mainClass>${mainClass}</mainClass>

diff --git a/src/main/java/net/osslabz/loggazer/package-info.java b/src/main/java/net/osslabz/loggazer/package-info.java
@@ -0,0 +1 @@
+package net.osslabz.loggazer;