Skip to content
Merged
Changes from all commits
Commits
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
34 changes: 13 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
<groupId>net.bramp.ffmpeg</groupId>
<artifactId>ffmpeg</artifactId>
<version>0.6-SNAPSHOT</version>
<packaging>jar</packaging>

<prerequisites>
<maven>3.0.5</maven>
</prerequisites>

<name>FFmpeg Wrapper</name>
<description>Simple Java Wrapper around the FFmpeg command line</description>
<description>Simple Java wrapper around FFmpeg command-line interface</description>
<url>https://github.com/bramp/ffmpeg-cli-wrapper</url>

<scm>
Expand All @@ -22,7 +21,7 @@
<licenses>
<license>
<name>The BSD 2-Clause License</name>
<url>http://opensource.org/licenses/BSD-2-Clause</url>
<url>https://opensource.org/licenses/BSD-2-Clause</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand All @@ -40,13 +39,12 @@

<properties>
<powermock.version>1.5.2</powermock.version>
<logback.version>1.1.7</logback.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neat

</properties>

<dependencies>
Expand Down Expand Up @@ -88,16 +86,10 @@
</dependency>

<!-- Test Scope -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
<version>1.1.7</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -144,7 +136,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.6.1</version>
<version>3.0.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -154,12 +146,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.4</version>
<version>3.5.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand All @@ -172,7 +164,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>3.5.1</version>
</plugin>

<plugin>
Expand All @@ -195,7 +187,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<version>3.0.0</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -209,7 +201,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<version>3.0.1</version>
<configuration>
<archive>
<manifest>
Expand All @@ -223,7 +215,7 @@
<!-- mvn clean javadoc:aggregate scm-publish:publish-scm -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<version>2.10.4</version>
<configuration>
<reportOutputDirectory>${project.reporting.outputDirectory}/apidocs
</reportOutputDirectory>
Expand Down Expand Up @@ -294,7 +286,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<version>2.5.3</version>
<configuration>
<autoVersionSubmodules>true</autoVersionSubmodules>
<useReleaseProfile>false</useReleaseProfile>
Expand All @@ -306,7 +298,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.6</version>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
Expand Down