From 0fd4cc9c1c463d463f661aa62e0a6b69a1e45b1a Mon Sep 17 00:00:00 2001 From: Andrea Medeghini Date: Sat, 29 Jun 2024 22:10:43 +0100 Subject: [PATCH 1/2] update version --- Makefile | 6 ++++++ ffmpeg4java-linux-examples/pom.xml | 2 +- ffmpeg4java-linux-test/pom.xml | 2 +- ffmpeg4java-linux/pom.xml | 2 +- ffmpeg4java-macos-examples/pom.xml | 2 +- ffmpeg4java-macos-test/pom.xml | 2 +- ffmpeg4java-macos/pom.xml | 2 +- ffmpeg4java-windows-examples/pom.xml | 2 +- ffmpeg4java-windows-test/pom.xml | 2 +- ffmpeg4java-windows/pom.xml | 2 +- pom.xml | 2 +- 11 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 3811d1e..68f895c 100755 --- a/Makefile +++ b/Makefile @@ -50,3 +50,9 @@ dist: .PHONY: release release: mvn -Dchannel=ossrh clean deploy + +.PHONY: set-version +set-version: + test $(version) + mvn versions:set -DnewVersion=$(version) + mvn versions:commit diff --git a/ffmpeg4java-linux-examples/pom.xml b/ffmpeg4java-linux-examples/pom.xml index ef9d611..c47da98 100644 --- a/ffmpeg4java-linux-examples/pom.xml +++ b/ffmpeg4java-linux-examples/pom.xml @@ -4,7 +4,7 @@ com.nextbreakpoint com.nextbreakpoint.ffmpeg4java - 7.0.1-1.0 + 7.0.1-1.1 com.nextbreakpoint.ffmpeg4java.linux.examples jar diff --git a/ffmpeg4java-linux-test/pom.xml b/ffmpeg4java-linux-test/pom.xml index 6c5e39c..8c59b55 100644 --- a/ffmpeg4java-linux-test/pom.xml +++ b/ffmpeg4java-linux-test/pom.xml @@ -4,7 +4,7 @@ com.nextbreakpoint com.nextbreakpoint.ffmpeg4java - 7.0.1-1.0 + 7.0.1-1.1 com.nextbreakpoint.ffmpeg4java.linux.test jar diff --git a/ffmpeg4java-linux/pom.xml b/ffmpeg4java-linux/pom.xml index 438bb1e..7651bf7 100644 --- a/ffmpeg4java-linux/pom.xml +++ b/ffmpeg4java-linux/pom.xml @@ -4,7 +4,7 @@ com.nextbreakpoint com.nextbreakpoint.ffmpeg4java - 7.0.1-1.0 + 7.0.1-1.1 com.nextbreakpoint.ffmpeg4java.linux jar diff --git a/ffmpeg4java-macos-examples/pom.xml b/ffmpeg4java-macos-examples/pom.xml index 5994db9..4100d7d 100644 --- a/ffmpeg4java-macos-examples/pom.xml +++ b/ffmpeg4java-macos-examples/pom.xml @@ -4,7 +4,7 @@ com.nextbreakpoint com.nextbreakpoint.ffmpeg4java - 7.0.1-1.0 + 7.0.1-1.1 com.nextbreakpoint.ffmpeg4java.macos.examples jar diff --git a/ffmpeg4java-macos-test/pom.xml b/ffmpeg4java-macos-test/pom.xml index 7ebbcc8..bcafc44 100644 --- a/ffmpeg4java-macos-test/pom.xml +++ b/ffmpeg4java-macos-test/pom.xml @@ -4,7 +4,7 @@ com.nextbreakpoint com.nextbreakpoint.ffmpeg4java - 7.0.1-1.0 + 7.0.1-1.1 com.nextbreakpoint.ffmpeg4java.macos.test jar diff --git a/ffmpeg4java-macos/pom.xml b/ffmpeg4java-macos/pom.xml index 2825cd2..58d7090 100644 --- a/ffmpeg4java-macos/pom.xml +++ b/ffmpeg4java-macos/pom.xml @@ -4,7 +4,7 @@ com.nextbreakpoint com.nextbreakpoint.ffmpeg4java - 7.0.1-1.0 + 7.0.1-1.1 com.nextbreakpoint.ffmpeg4java.macos jar diff --git a/ffmpeg4java-windows-examples/pom.xml b/ffmpeg4java-windows-examples/pom.xml index dcf16b5..63c0b7e 100644 --- a/ffmpeg4java-windows-examples/pom.xml +++ b/ffmpeg4java-windows-examples/pom.xml @@ -4,7 +4,7 @@ com.nextbreakpoint com.nextbreakpoint.ffmpeg4java - 7.0.1-1.0 + 7.0.1-1.1 com.nextbreakpoint.ffmpeg4java.windows.examples jar diff --git a/ffmpeg4java-windows-test/pom.xml b/ffmpeg4java-windows-test/pom.xml index 5f79572..3e96cba 100644 --- a/ffmpeg4java-windows-test/pom.xml +++ b/ffmpeg4java-windows-test/pom.xml @@ -4,7 +4,7 @@ com.nextbreakpoint com.nextbreakpoint.ffmpeg4java - 7.0.1-1.0 + 7.0.1-1.1 com.nextbreakpoint.ffmpeg4java.windows.test jar diff --git a/ffmpeg4java-windows/pom.xml b/ffmpeg4java-windows/pom.xml index d392664..0f48da6 100644 --- a/ffmpeg4java-windows/pom.xml +++ b/ffmpeg4java-windows/pom.xml @@ -4,7 +4,7 @@ com.nextbreakpoint com.nextbreakpoint.ffmpeg4java - 7.0.1-1.0 + 7.0.1-1.1 com.nextbreakpoint.ffmpeg4java.windows jar diff --git a/pom.xml b/pom.xml index c060421..d542c8b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.nextbreakpoint com.nextbreakpoint.ffmpeg4java - 7.0.1-1.0 + 7.0.1-1.1 pom FFmpeg4Java FFmpeg4Java provides a Java wrapper of FFmpeg library From 3c72cf5b2b5fbeeba7ae93d9db2fb5ef074aad29 Mon Sep 17 00:00:00 2001 From: Andrea Medeghini Date: Sun, 30 Jun 2024 19:50:02 +0100 Subject: [PATCH 2/2] fix release configuration --- Makefile | 9 +++++++-- pom.xml | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 68f895c..0b5389c 100755 --- a/Makefile +++ b/Makefile @@ -47,8 +47,13 @@ dist: cp ffmpeg4java-linux/target/com.nextbreakpoint.ffmpeg4java.linux-*.jar dist cp ffmpeg4java-windows/target/com.nextbreakpoint.ffmpeg4java.windows-*.jar dist -.PHONY: release -release: + +.PHONY: github-release +github-release: + mvn -Dchannel=github clean package de.jutzig:github-release-plugin:release -Dgithub.draft=true + +.PHONY: maven-release +maven-release: mvn -Dchannel=ossrh clean deploy .PHONY: set-version diff --git a/pom.xml b/pom.xml index d542c8b..239a8ca 100644 --- a/pom.xml +++ b/pom.xml @@ -40,13 +40,15 @@ 3.13.0 3.3.0 3.2.0 - 3.7.0 + 3.7.1 3.5.0 3.4.1 1.5 2.16.2 1.7.0 + 1.6.0 3.6 + true ffmpeg4java-macos @@ -106,6 +108,15 @@ nexus-staging-maven-plugin ${nexus-staging-maven-plugin.version} + + de.jutzig + github-release-plugin + ${github-release-plugin.version} + + ${project.name} ${project.version} + v${project.version} + + @@ -331,5 +342,39 @@ + + github + + + channel + github + + + + + + de.jutzig + github-release-plugin + + FFmpeg4Java ${project.version} + v${project.version} + false + false + ${github.draft} + + + ${project.basedir} + + **/target/${project.artifactId}-${project.version}-x86_64.jar + **/target/${project.artifactId}-${project.version}-x86_64.jar + **/target/${project.artifactId}-${project.version}-x86_64.jar + + + + + + + +