8000 Dev/7.0.1 2.1 by nextbreakpoint · Pull Request #7 · nextbreakpoint/ffmpeg4java · GitHub
[go: up one dir, main page]
Skip to content

Dev/7.0.1 2.1 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nextbreakpoint merged 2 commits into from
Jun 30, 2024
Merged

Dev/7.0.1 2.1 #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fd4cc9
update version
Jun 29, 2024
3c72cf5
fix release configuration
Jun 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@ 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
set-version:
test $(version)
mvn versions:set -DnewVersion=$(version)
mvn versions:commit
2 changes: 1 addition & 1 deletion ffmpeg4java-linux-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.ffmpeg4java</artifactId>
<version>7.0.1-1.0</version>
<version>7.0.1-1.1</version>
</parent>
<artifactId>com.nextbreakpoint.ffmpeg4java.linux.examples</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg4java-linux-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.ffmpeg4java</artifactId>
<version>7.0.1-1.0</version>
<version>7.0.1-1.1</version>
</parent>
<artifactId>com.nextbreakpoint.ffmpeg4java.linux.test</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg4java-linux/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.ffmpeg4java</artifactId>
<version>7.0.1-1.0</version>
<version>7.0.1-1.1</version>
</parent>
<artifactId>com.nextbreakpoint.ffmpeg4java.linux</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg4java-macos-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.ffmpeg4java</artifactId>
<version>7.0.1-1.0</version>
<version>7.0.1-1.1</version>
</parent>
<artifactId>com.nextbreakpoint.ffmpeg4java.macos.examples</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg4java-macos-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.ffmpeg4java</artifactId>
<version>7.0.1-1.0</version>
<version>7.0.1-1.1</version>
</parent>
<artifactId>com.nextbreakpoint.ffmpeg4java.macos.test</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg4java-macos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.ffmpeg4java</artifactId>
<version>7.0.1-1.0</version>
<version>7.0.1-1.1</version>
</parent>
<artifactId>com.nextbreakpoint.ffmpeg4java.macos</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg4java-windows-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.ffmpeg4java</artifactId>
<version>7.0.1-1.0</version>
<version>7.0.1-1.1</version>
</parent>
<artifactId>com.nextbreakpoint.ffmpeg4java.windows.examples</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg4java-windows-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.ffmpeg4java</artifactId>
<version>7.0.1-1.0</version>
<version>7.0.1-1.1</version>
</parent>
<artifactId>com.nextbreakpoint.ffmpeg4java.windows.test</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ffmpeg4java-windows/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.ffmpeg4java</artifactId>
<version>7.0.1-1.0</version>
<version>7.0.1-1.1</version>
</parent>
<artifactId>com.nextbreakpoint.ffmpeg4java.windows</artifactId>
<packaging>jar</packaging>
Expand Down
49 changes: 47 additions & 2 deletions pom.xml
View file
Open in desktop
A8C6
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.nextbreakpoint</groupId>
<artifactId>com.nextbreakpoint.ffmpeg4java</artifactId>
<version>7.0.1-1.0</version>
<version>7.0.1-1.1</version>
<packaging>pom</packaging>
<name>FFmpeg4Java</name>
<description>FFmpeg4Java provides a Java wrapper of FFmpeg library</description>
Expand Down Expand Up @@ -40,13 +40,15 @@
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
<maven-toolchains-plugin.version>3.2.0</maven-toolchains-plugin.version>
<maven-dependency-plugin.version>3.7.0</maven-dependency-plugin.version>
<maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
<maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>
<versions-maven-plugin.version>2.16.2</versions-maven-plugin.version>
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
<github-release-plugin.version>1.6.0</github-release-plugin.version>
<maven.version>3.6</maven.version>
<github.draft>true</github.draft>
</properties>
<modules>
<module>ffmpeg4java-macos</module>
Expand Down Expand Up @@ -106,6 +108,15 @@
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>${nexus-staging-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>de.jutzig</groupId>
<artifactId>github-release-plugin</artifactId>
<version>${github-release-plugin.version}</version>
<configuration>
<releaseName>${project.name} ${project.version}</releaseName>
<tag>v${project.version}</tag>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down Expand Up @@ -331,5 +342,39 @@
</repository>
</distributionManagement>
</profile>
<profile>
<id>github</id>
<activation>
<property>
<name>channel</name>
<value>github</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>de.jutzig</groupId>
<artifactId>github-release-plugin</artifactId>
<configuration>
<releaseName>FFmpeg4Java ${project.version}</releaseName>
<tag>v${project.version}</tag>
<failOnExistingRelease>false</failOnExistingRelease>
<overwriteArtifact>false</overwriteArtifact>
<draft>${github.draft}</draft>
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
<includes>
<include>**/target/${project.artifactId}-${project.version}-x86_64.jar</include>
<include>**/target/${project.artifactId}-${project.version}-x86_64.jar</include>
<include>**/target/${project.artifactId}-${project.version}-x86_64.jar</include>
</includes>
</fileSet>
</fileSets>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
0