Skip to content

Commit

Permalink
Merge pull request #8 from UniversalMediaServer/revert-7-revert-6-main
Browse files Browse the repository at this point in the history
Revert "Revert "merge commits""
  • Loading branch information
SurfaceS authored Feb 7, 2024
2 parents 2b9974e + ce798b2 commit 1a6dbbd
Showing 1 changed file with 34 additions and 29 deletions.
63 changes: 34 additions & 29 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,40 @@
<artifactId>tmdbapi</artifactId>
<version>0.3</version>
<packaging>jar</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.release>17</maven.compiler.release>
</properties>
<name>TMDb API</name>
<description>A java library that makes the interaction with themoviedb.org V4 API easy.</description>
<url>https://github.com/UniversalMediaServer/tmdb-api</url>
<organization>
<name>Universal Media Server</name>
<url>https://www.universalmediaserver.com/</url>
</organization>
<developers>
<developer>
<name>Surf@ceS</name>
</developer>
</developers>
<developers>
<developer>
<name>Surf@ceS</name>
</developer>
</developers>
<licenses>
<license>
<name>GNU General Public License version 3</name>
<url>https://www.gnu.org/licenses/gpl-3.0.txt</url>
<distribution>manual</distribution>
</license>
</licenses>
<description>A java library that makes the interaction with themoviedb.org V4 API easy.</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.plugin.version>3.12.1</maven.compiler.plugin.version>
<maven.source.plugin.version>3.3.0</maven.source.plugin.version>
<maven.javadoc.plugin.version>3.6.3</maven.javadoc.plugin.version>
<maven.deploy.plugin.version>3.1.1</maven.deploy.plugin.version>
<maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
<maven.gpg.plugin.version>3.1.0</maven.gpg.plugin.version>
<maven.checkstyle.plugin.version>3.3.1</maven.checkstyle.plugin.version>
<gson.version>2.10.1</gson.version>
<junit.jupiter.version>5.10.2</junit.jupiter.version>
<puppycrawl.checkstyle.version>10.13.0</puppycrawl.checkstyle.version>
</properties>
<scm>
<url>https://github.com/UniversalMediaServer/tmdb-api.git</url>
</scm>
Expand All @@ -47,35 +57,30 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<version>${maven.compiler.plugin.version}</version>
<configuration>
<showDeprecation>true</showDeprecation>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<version>${maven.source.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.6.3</version>
<version>${maven.javadoc.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>3.1.1</version>
<version>${maven.deploy.plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<version>${maven.surefire.plugin.version}</version>
<configuration>
<argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
<runOrder>alphabetical</runOrder>
Expand All @@ -87,13 +92,13 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.10.1</version>
<version>${gson.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.10.2</version>
<version>${junit.jupiter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand All @@ -105,7 +110,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<version>${maven.source.plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -118,7 +123,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<version>${maven.javadoc.plugin.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -131,7 +136,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.1.0</version>
<version>${maven.gpg.plugin.version}</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand All @@ -152,12 +157,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.3.1</version>
<version>${maven.checkstyle.plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.13.0</version>
<version>${puppycrawl.checkstyle.version}</version>
</dependency>
</dependencies>
<configuration>
Expand All @@ -180,7 +185,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.2.5</version>
<version>${maven.surefire.plugin.version}</version>
<configuration>
<skipTests>false</skipTests>
</configuration>
Expand Down

0 comments on commit 1a6dbbd

Please sign in to comment.