-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9 from kingjan1999/master
Updated to 1.7.2
- Loading branch information
Showing
8 changed files
with
1,508 additions
and
1,420 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="src" path="src/main/java"/> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"> | ||
| <attributes> | ||
| <attribute name="maven.pomderived" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> | ||
| <attributes> | ||
| <attribute name="maven.pomderived" value="true"/> | ||
| </attributes> | ||
| </classpathentry> | ||
| <classpathentry kind="output" path="target/classes"/> | ||
| </classpath> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /target |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>milkAdmin</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.m2e.core.maven2Builder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.m2e.core.maven2Nature</nature> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| </natures> | ||
| </projectDescription> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| eclipse.preferences.version=1 | ||
| encoding/<project>=UTF-8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| eclipse.preferences.version=1 | ||
| org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled | ||
| org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 | ||
| org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve | ||
| org.eclipse.jdt.core.compiler.compliance=1.5 | ||
| org.eclipse.jdt.core.compiler.debug.lineNumber=generate | ||
| org.eclipse.jdt.core.compiler.debug.localVariable=generate | ||
| org.eclipse.jdt.core.compiler.debug.sourceFile=generate | ||
| org.eclipse.jdt.core.compiler.problem.assertIdentifier=error | ||
| org.eclipse.jdt.core.compiler.problem.enumIdentifier=error | ||
| org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning | ||
| org.eclipse.jdt.core.compiler.source=1.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| activeProfiles= | ||
| eclipse.preferences.version=1 | ||
| resolveWorkspaceProjects=true | ||
| version=1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,94 +1,95 @@ | ||
| <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> | ||
| <groupId>com.sectorgamer.sharkiller</groupId> | ||
| <artifactId>milkAdmin</artifactId> | ||
| <version>2.00-dev</version> | ||
| <name>milkAdmin</name> | ||
| <url>http://www.sectorgamer.com</url> | ||
| <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> | ||
| <groupId>com.sectorgamer.sharkiller</groupId> | ||
| <artifactId>milkAdmin</artifactId> | ||
| <version>2.00-dev</version> | ||
| <name>milkAdmin</name> | ||
| <url>http://www.sectorgamer.com</url> | ||
|
|
||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| </properties> | ||
|
|
||
| <repositories> | ||
| <repository> | ||
| <id>spout-repo</id> | ||
| <url>http://nexus.spout.org/content/groups/public</url> | ||
| </repository> | ||
| <repository> | ||
| <id>bukkit-repo</id> | ||
| <url>http://repo.bukkit.org/content/groups/public</url> | ||
| </repository> | ||
| <repository> | ||
| <id>drdanick-repo</id> | ||
| <url>http://dev.drdanick.com/repo/content/groups/public/</url> | ||
| </repository> | ||
| </repositories> | ||
| <properties> | ||
| <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.bukkit</groupId> | ||
| <artifactId>bukkit</artifactId> | ||
| <version>1.2.5-R4.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>net.milkbowl</groupId> | ||
| <artifactId>vault</artifactId> | ||
| <version>1.2.17-SNAPSHOT</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.yaml</groupId> | ||
| <artifactId>snakeyaml</artifactId> | ||
| <version>1.9</version> | ||
| <type>jar</type> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.drdanick.McRKit</groupId> | ||
| <artifactId>McRKitLauncher</artifactId> | ||
| <version>R10A12</version> | ||
| </dependency> | ||
| </dependencies> | ||
| <repositories> | ||
| <repository> | ||
| <id>vault-repo</id> | ||
| <url>http://nexus.theyeticave.net/content/repositories/pub_releases/</url> | ||
| </repository> | ||
| <repository> | ||
| <id>bukkit-repo</id> | ||
| <url>http://repo.bukkit.org/content/groups/public</url> | ||
| </repository> | ||
| <repository> | ||
| <id>drdanick-repo</id> | ||
| <url>http://dev.drdanick.com/repo/content/groups/public/</url> | ||
| </repository> | ||
| </repositories> | ||
|
|
||
| <build> | ||
| <resources> | ||
| <resource> | ||
| <targetPath>.</targetPath> | ||
| <directory>${project.basedir}/src/main/resources/</directory> | ||
| <filtering>true</filtering> | ||
| <includes> | ||
| <include>*.yml</include> | ||
| <include>*.ini</include> | ||
| </includes> | ||
| </resource> | ||
| <resource> | ||
| <targetPath>.</targetPath> | ||
| <directory>${project.basedir}/src/main/resources/</directory> | ||
| <filtering>false</filtering> | ||
| <includes> | ||
| <include>milkAdmin.zip</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
|
|
||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>2.3.2</version> | ||
| <configuration> | ||
| <showDeprecation>true</showDeprecation> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <scm> | ||
| <url>https://github.com/sharkiller/milkAdmin</url> | ||
| <developerConnection>scm:git:git@github.com:sharkiller/milkAdmin.git</developerConnection> | ||
| <connection>scm:git:git://github.com/sharkiller/milkAdmin.git</connection> | ||
| </scm> | ||
| <ciManagement> | ||
| <system>jenkins</system> | ||
| <url>http://mc.sectorgamer.com:8080/</url> | ||
| </ciManagement> | ||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.bukkit</groupId> | ||
| <artifactId>bukkit</artifactId> | ||
| <version>1.7.2-R0.1</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>net.milkbowl.vault</groupId> | ||
| <artifactId>Vault</artifactId> | ||
| <version>1.2.30</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.yaml</groupId> | ||
| <artifactId>snakeyaml</artifactId> | ||
| <version>1.9</version> | ||
| <type>jar</type> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.drdanick.McRKit</groupId> | ||
| <artifactId>McRKitLauncher</artifactId> | ||
| <version>R10A12</version> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <resources> | ||
| <resource> | ||
| <targetPath>.</targetPath> | ||
| <directory>${project.basedir}/src/main/resources/</directory> | ||
| <filtering>true</filtering> | ||
| <includes> | ||
| <include>*.yml</include> | ||
| <include>*.ini</include> | ||
| </includes> | ||
| </resource> | ||
| <resource> | ||
| <targetPath>.</targetPath> | ||
| <directory>${project.basedir}/src/main/resources/</directory> | ||
| <filtering>false</filtering> | ||
| <includes> | ||
| <include>milkAdmin.zip</include> | ||
| </includes> | ||
| </resource> | ||
| </resources> | ||
|
|
||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <version>3.1</version> | ||
| <configuration> | ||
| <showDeprecation>true</showDeprecation> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| <scm> | ||
| <url>https://github.com/sharkiller/milkAdmin</url> | ||
| <developerConnection>scm:git:git@github.com:sharkiller/milkAdmin.git</developerConnection> | ||
| <connection>scm:git:git://github.com/sharkiller/milkAdmin.git</connection> | ||
| </scm> | ||
| <ciManagement> | ||
| <system>jenkins</system> | ||
| <url>http://mc.sectorgamer.com:8080/</url> | ||
| </ciManagement> | ||
| </project> |
Oops, something went wrong.