Skip to content

Commit

Permalink
fix: prep next release
Browse files Browse the repository at this point in the history
  • Loading branch information
rvullriede committed Dec 2, 2024
1 parent 7a21117 commit 4a9bede
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-release-on-main-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
cache: 'maven'

- name: maven-build-verify
run: mvn --batch-mode -Posslabz-release,native-jpackage clean verify
run: mvn --batch-mode -Posslabz-release,native-jpackage clean release:clean release:prepare release:perform

- name: configure-git-user
uses: qoomon/actions--setup-git@v1
Expand Down
17 changes: 10 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?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.1.0</version>
<version>1.1.1-SNAPSHOT</version>

<properties>
<osslabz.encoding>UTF-8</osslabz.encoding>
Expand All @@ -16,7 +17,7 @@
<project.build.outputTimestamp>2024-12-02T19:47:18Z</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>
Expand Down Expand Up @@ -259,17 +260,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>
Expand Down Expand Up @@ -319,6 +320,7 @@
<mainClass>${mainClass}</mainClass>
</transformer>
</transformers>
<!-- <shadedClassifierName>${os.detected.classifier}</shadedClassifierName>-->
</configuration>
</execution>
</executions>
Expand All @@ -328,6 +330,7 @@
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.2</version>
<configuration>
<!-- <classifier>${os.detected.classifier}</classifier>-->
<archive>
<manifest>
<mainClass>${mainClass}</mainClass>
Expand Down

0 comments on commit 4a9bede

Please sign in to comment.