Skip to content

Commit

Permalink
Merge pull request #1 from PixelOutlaw/develop
Browse files Browse the repository at this point in the history 
Release 1.3.2
  • Loading branch information
@UltraFaceguy
UltraFaceguy authored Mar 8, 2020
2 parents 7e4f472 + d6182e3 commit 91844f5
Show file tree
Hide file tree
Showing 163 changed files with 10,677 additions and 14,079 deletions.
15 changes: 9 additions & 6 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
language: java
jdk:
- oraclejdk7
branches:
only:
- master
before_install:
- wget https://gist.githubusercontent.com/Nunnery/2716c87ed5657884fcc2/raw/31c95c52d21d5b28c61c334da68618b4a7bdcca3/settings.xml -P target/maven/
script: mvn clean deploy --settings target/maven/settings.xml
script:
- wget https://gist.githubusercontent.com/Nunnery/2716c87ed5657884fcc2/raw/2d7dcc0328a68eb624cdc13475834d179c24d255/settings.xml
- mvn clean deploy --settings settings.xml
env:
global:
secure: DOTJB3bu11X2u/vs7VHi+IeWi0DD0qr4+dQqEAr5qzhZVzdYcZFJYeFWFIXkp8d11YlK6Ivw9cTydN0lvEexJp6+mV427w/g1/11oNoR/d0bf9p21xJN+MKU6bQ5nPtq1tMHGfkB8++wZSXOooiW1RrNeRvSJpF8+WZRd+rIAec=
notifications:
slack:
secure: chb5QLHiKYRDN0PghSyn8rWeI/vcLbCFLh3x0r/t8tt7cz/dfkeSF7C34HhIFkUaE+VPziB5lvjtkUsf50BM+DEHyGBz2QCTJgd6kwg3z+vzeUfZ2Zuva+rpHgCEf1K0y/sDrtHN8Skk17JfEWlSC1dsHJl1QCSHAo8aa1jlML4=
144 changes: 68 additions & 76 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!--
The MIT License
Copyright (c) 2015 Teal Cube Games
Copyright © 2015 Pixel Outlaw
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -22,88 +22,80 @@
THE SOFTWARE.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.tealcube.minecraft.bukkit</groupId>
<artifactId>bukkit-plugin-parent</artifactId>
<version>0.0.4</version>
</parent>
<parent>
<groupId>io.pixeloutlaw</groupId>
<artifactId>spigot-plugin-parent</artifactId>
<version>1.15.2.0</version>
</parent>

<artifactId>loot</artifactId>
<version>1.1.0</version>
<packaging>jar</packaging>
<artifactId>loot</artifactId>
<version>1.3.2</version>
<packaging>jar</packaging>

<name>loot</name>
<name>loot</name>

<inceptionYear>2015</inceptionYear>
<inceptionYear>2015</inceptionYear>

<scm>
<connection>scm:git:https://github.com/TealCube/loot.git</connection>
<developerConnection>scm:git:https://github.com/TealCube/loot.git</developerConnection>
<url>https://github.com/TealCube/loot.git</url>
<tag>HEAD</tag>
</scm>
<scm>
<connection>scm:git:https://github.com/TealCube/loot.git</connection>
<developerConnection>scm:git:https://github.com/TealCube/loot.git</developerConnection>
<url>https://github.com/TealCube/loot.git</url>
<tag>HEAD</tag>
</scm>

<dependencies>
<dependency>
<groupId>com.tealcube.minecraft.bukkit</groupId>
<artifactId>facecore</artifactId>
<version>2.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
</dependencies>
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.pixeloutlaw</groupId>
<artifactId>facecore</artifactId>
<version>1.15.2.4</version>
</dependency>
<dependency>
<groupId>io.pixeloutlaw</groupId>
<artifactId>strife</artifactId>
<version>3.0.4</version>
</dependency>
<dependency>
<groupId>com.github.MilkBowl</groupId>
<artifactId>VaultAPI</artifactId>
<version>1.7</version>
</dependency>
</dependencies>

<build>
<defaultGoal>install</defaultGoal>
<resources>
<resource>
<targetPath>.</targetPath>
<directory>${project.basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>${project.build.javaVersion}</source>
<target>${project.build.javaVersion}</target>
</configuration>
</plugin>
</plugins>
</build>
<build>
<defaultGoal>install</defaultGoal>
<resources>
<resource>
<targetPath>.</targetPath>
<directory>${project.basedir}/src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>${project.build.javaVersion}</source>
<target>${project.build.javaVersion}</target>
</configuration>
</plugin>
</plugins>
</build>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.javaVersion>1.7</project.build.javaVersion>
</properties>

<profiles>
<profile>
<id>java8-disable-doclint</id>
<activation>
<jdk>[1.8,</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.javaVersion>1.8</project.build.javaVersion>
</properties>

</project>
Loading

0 comments on commit 91844f5

Please sign in to comment.