Skip to content

Commit

Permalink
Merge pull request meiskam#23 from crashdemons/v5.2.14-release
Browse files Browse the repository at this point in the history
Update upstream to v5.2.14
  • Loading branch information
crashdemons authored Feb 12, 2021
2 parents 9e82ffd + eb38b43 commit ddd7bd1
Show file tree
Hide file tree
Showing 286 changed files with 5,758 additions and 16,844 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@

#personal
/test-in-spigot.bat
/update-docs-now.bat


/PlayerHeads-api/target/
/PlayerHeads-craftbukkit-1.16-support/target/
Expand Down
123 changes: 82 additions & 41 deletions PlayerHeads-api/dependency-reduced-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>PlayerHeads</artifactId>
<groupId>org.shininet.bukkit</groupId>
<version>5.2.13-SNAPSHOT</version>
<version>5.2.14-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>PlayerHeads-api</artifactId>
Expand Down Expand Up @@ -43,18 +43,22 @@
</execution>
</executions>
<configuration>
<quiet>true</quiet>
<quiet>false</quiet>
<notimestamp>true</notimestamp>
<links>
<link>https://hub.spigotmc.org/javadocs/bukkit/</link>
<link>https://hub.spigotmc.org/javadocs/spigot</link>
<link>https://hub.spigotmc.org/javadocs/spigot/</link>
<link>https://javadoc.io/doc/org.jetbrains/annotations-java5/15.0.0/</link>
</links>
<includeDependencySources>true</includeDependencySources>
<dependencySourceExcludes>
<dependencySourceExclude>org.shininet.bukkit:PlayerHeads-compatibility</dependencySourceExclude>
<dependencySourceExclude>org.shininet.bukkit:PlayerHeads-compatibility-api</dependencySourceExclude>
</dependencySourceExcludes>
<dependencySourceIncludes>
<dependencySourceInclude>org.shininet.bukkit:*</dependencySourceInclude>
<dependencySourceInclude>com.github.crashdemons:*</dependencySourceInclude>
<dependencySourceInclude>org.shininet.bukkit:PlayerHeads-base-api</dependencySourceInclude>
</dependencySourceIncludes>
<source>7</source>
</configuration>
</plugin>
<plugin>
Expand All @@ -76,21 +80,6 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<configuration>
<archive>
<manifestEntries>
<Built-By>Maven</Built-By>
<Implementation-Title>${project.name}</Implementation-Title>
<Implementation-Version>${project.version}</Implementation-Version>
<Implementation-Vendor-Id>${project.groupId}</Implementation-Vendor-Id>
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
Expand Down Expand Up @@ -131,21 +120,11 @@
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>crashdemons-repo</id>
<url>https://meme.tips/java-repos/</url>
</repository>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.16.1-R0.1-SNAPSHOT</version>
<groupId>org.shininet.bukkit</groupId>
<artifactId>PlayerHeads-compatibility-api</artifactId>
<version>5.2.14-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand All @@ -155,10 +134,76 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.shininet.bukkit</groupId>
<artifactId>PlayerHeads-compatibility-api</artifactId>
<version>5.2.13-SNAPSHOT</version>
<scope>compile</scope>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>hamcrest-core</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>2.0.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>powermock-module-junit4-common</artifactId>
<groupId>org.powermock</groupId>
</exclusion>
<exclusion>
<artifactId>hamcrest-core</artifactId>
<groupId>org.hamcrest</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
<version>2.0.7</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>powermock-api-support</artifactId>
<groupId>org.powermock</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>3.5.11</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>byte-buddy</artifactId>
<groupId>net.bytebuddy</groupId>
</exclusion>
<exclusion>
<artifactId>byte-buddy-agent</artifactId>
<groupId>net.bytebuddy</groupId>
</exclusion>
<exclusion>
<artifactId>objenesis</artifactId>
<groupId>org.objenesis</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito-common</artifactId>
<version>1.7.4</version>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>powermock-api-support</artifactId>
<groupId>org.powermock</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<reporting>
Expand All @@ -173,8 +218,4 @@
</plugin>
</plugins>
</reporting>
<properties>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
</properties>
</project>
Loading

0 comments on commit ddd7bd1

Please sign in to comment.