Moves stuff around
Some checks failed
KnarCraft/FFmpegConvert/master There was a failure building this commit

Fixes packages for use with maven
Updates pom
Fixes broken link in licence
Updates Jenkinsfile
This commit is contained in:
Kristian Knarvik 2020-02-11 18:48:49 +01:00
parent 3a051abf2c
commit 0b3d46c704
13 changed files with 99 additions and 1 deletions

8
Jenkinsfile vendored
View File

@ -4,16 +4,24 @@ pipeline {
stage('Build') { stage('Build') {
steps { steps {
echo 'Building...' echo 'Building...'
mvn clean
mvn validate
mvn compile
} }
} }
stage('Test') { stage('Test') {
steps { steps {
echo 'Testing...' echo 'Testing...'
mvn test
} }
} }
stage('Deploy') { stage('Deploy') {
steps { steps {
echo 'Deploying...' echo 'Deploying...'
mvn package
mvn verify
mvn install
mvn deploy
} }
} }
} }

View File

@ -1,6 +1,6 @@
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007 Version 3, 29 June 2007
Copyright © 2007 Free Software Foundation, Inc. <http s ://fsf.org/> Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
Preamble Preamble
The GNU General Public License is a free, copyleft license for software and other kinds of works. The GNU General Public License is a free, copyleft license for software and other kinds of works.

71
pom.xml
View File

@ -7,12 +7,83 @@
<artifactId>ffmpegconvert</artifactId> <artifactId>ffmpegconvert</artifactId>
<version>0.1-alpha</version> <version>0.1-alpha</version>
<packaging>jar</packaging>
<name>FFMpeg Convert</name> <name>FFMpeg Convert</name>
<url>https://git.knarcraft.net/KnarCraft/FFmpegConvert</url> <url>https://git.knarcraft.net/KnarCraft/FFmpegConvert</url>
<inceptionYear>2018</inceptionYear>
<licenses>
<license>
<name>GNU GENERAL PUBLIC LICENSE</name>
<url>https://fsf.org/</url>
</license>
</licenses>
<developers>
<developer>
<id>EpicKnarvik97</id>
<name>Kristian Knarvik</name>
<url>https://kristianknarvik.knarcraft.net</url>
<roles>
<role>leader</role>
<role>developer</role>
</roles>
<timezone>Europe/Oslo</timezone>
</developer>
</developers>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
</properties> </properties>
<repositories>
<repository>
<id>knarcraft</id>
<name>KnarCraft Repository</name>
<url>https://git.knarcraft.net/KnarCraft/FFmpegConvert</url>
<layout>default</layout>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<distributionManagement>
<repository>
<uniqueVersion>false</uniqueVersion>
<id>knarcraft1</id>
<name>KnarCraft Repository</name>
<url>https://jenkins.knarcraft.net/releases/</url>
<layout>default</layout>
</repository>
<downloadUrl>https://git.knarcraft.net/KnarCraft/FFmpegConvert</downloadUrl>
</distributionManagement>
<build>
<directory>${project.basedir}/target</directory>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<finalName>${project.artifactId}-${project.version}</finalName>
<testOutputDirectory>${project.build.directory}/test-classes</testOutputDirectory>
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
<testSourceDirectory>${project.basedir}/src/test/java</testSourceDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/main/resources</directory>
</resource>
</resources>
<testResources>
<testResource>
<directory>${project.basedir}/src/test/resources</directory>
</testResource>
</testResources>
</build>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
</project> </project>

View File

@ -0,0 +1,19 @@
package ffmpegconverter;
import ffmpegconverter.converter.AnimeConverter;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class AnimeConverterTest {
@Before
public void setUp() {
AnimeConverter converter = new AnimeConverter("ffprobe", "ffmpeg", new String[]{"jpn","eng","nor","swe"}, new String[]{"nor","eng","swe","fin"}, false, false);
}
@Test
public void weirdTest() {
assertEquals(0, 0);
}
}