diff --git a/.travis.yml b/.travis.yml index cf340e29..5678ed91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,7 @@ language: java jdk: - openjdk8 -script: - - chmod +x ./gradlew - - ./gradlew clean compileJava compileTestJava test +script: mvn clean test install: true notifications: email: diff --git a/build.gradle b/build.gradle deleted file mode 100644 index bd653530..00000000 --- a/build.gradle +++ /dev/null @@ -1,74 +0,0 @@ -import org.apache.tools.ant.filters.ReplaceTokens - -plugins { - id 'com.github.johnrengelman.shadow' version '2.0.4' - id 'maven-publish' - id 'java' -} - -group 'com.comphenix.protocol' -version '4.5.0-SNAPSHOT' - -sourceCompatibility = 1.8 - -repositories { - mavenCentral() - jcenter() - maven { url 'http://repo.dmulloy2.net/nexus/repository/public/' } - maven { url 'https://hub.spigotmc.org/nexus/content/groups/public/' } -} - -dependencies { - compile group: 'com.github.jengelman.gradle.plugins', name: 'shadow', version: '2.0.4' - compile group: 'io.netty', name: 'netty-all', version: '4.0.23.Final' - compile group: 'org.spigotmc', name: 'spigot-api', version: '1.14.4-R0.1-SNAPSHOT' - compile group: 'org.spigotmc', name: 'spigot', version: '1.14.4-R0.1-SNAPSHOT' - compile group: 'cglib', name: 'cglib-nodep', version: '3.2.5' - compile group: 'com.comphenix.executors', name: 'BukkitExecutors', version: '1.1-SNAPSHOT' - testCompile group: 'junit', name: 'junit', version: '4.12' - testCompile group: 'org.mockito', name: 'mockito-core', version: '2.21.0' - testCompile group: 'org.powermock', name: 'powermock-module-junit4', version: '1.7.4' - testCompile group: 'org.powermock', name: 'powermock-api-mockito2', version: '1.7.4' -} - -shadowJar { - dependencies { - include(dependency('cglib:.*')) - include(dependency('com.comphenix.executors:.*')) - } - relocate 'net.sf.cglib', 'com.comphenix.net.sf.cglib' - archiveName = 'ProtocolLib.jar' -} - -javadoc { - failOnError = false -} - -processResources { - def fullVersion = version - if (System.getenv('BUILD_NUMBER')) { - fullVersion = version + '-' + System.getenv('BUILD_NUMBER') - } - - with copySpec { - from 'src/main/resources' - filter(ReplaceTokens, tokens: ['$fullVersion': fullVersion]) - } -} - -publishing { - publications { - mavenJava(MavenPublication) { - from components.java - afterEvaluate { - artifactId = 'ProtocolLib' - } - } - } - repositories { - maven { - url = version.endsWith('SNAPSHOT') ? 'http://repo.dmulloy2.net/nexus/repository/snapshots/' : - 'http://repo.dmulloy2.net/nexus/repository/releases/' - } - } -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 1948b907..00000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 62f3d20d..00000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Fri Sep 14 19:43:24 EDT 2018 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip diff --git a/gradlew b/gradlew deleted file mode 100644 index cccdd3d5..00000000 --- a/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index e95643d6..00000000 --- a/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..b0890aa3 --- /dev/null +++ b/pom.xml @@ -0,0 +1,331 @@ + + 4.0.0 + com.comphenix.protocol + ProtocolLib + ProtocolLib + 4.5.0-SNAPSHOT + + Provides read/write access to the Minecraft protocol. + http://www.spigotmc.org/resources/protocollib.1997/ + jar + 2012 + + + UTF-8 + + ${project.version} + + 2.0.4 + 1.14.4-R0.1-SNAPSHOT + + + + clean install + src/main/java + src/test/java + + + src/main/resources + true + + **/*.java + + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.1.1 + + + package + + shade + + + false + false + + + + net.sf + com.comphenix.net.sf + + + + + + org.spigotmc:spigot + org.spigotmc:spigot-api + junit:junit + io.netty:* + + + + + + + + + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.1.0 + + + + com.comphenix.protocol.Application + ProtocolLib + ${project.fullVersion} + dmulloy2 + + + ${project.name} + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.0 + + + + projectVersion + ${project.version} + + + + + + + maven-javadoc-plugin + 3.0.1 + + false + ISO-8859-1 + ProtocolLib JavaDocs + ProtocolLib JavaDocs + Copyright © {inceptionYear}–{currentYear} + Comphenix and dmulloy2. Licensed under the GNU GPL v2. + + + + install + + aggregate + + + + + + + + + + jenkins + + + env.BUILD_NUMBER + + + + -b${env.BUILD_NUMBER} + ${project.version}${project.build.number} + + + + + release-sign-artifacts + + + performRelease + true + + + + ${project.version} + + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.0 + + + attach-sources + + jar + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.3 + + + attach-javadocs + + jar + + + + + + + + + + + + + + scm:git:git://github.com/dmulloy2/ProtocolLib.git + scm:git:git@github.com:dmulloy2/ProtocolLib.git + https://github.com/dmulloy2/ProtocolLib + + + + + GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + http://www.gnu.org/licenses/gpl-2.0.txt + repo + + + + + + dmulloy2 + Dan Mulloy + http://dmulloy2.net/ + + developer + maintainer + + + + aadnk + Kristian S. Stangeland + kr_stang@hotmail.com + http://comphenix.net/ + + former author + + 1 + + + + + + dmulloy2-releases + http://repo.dmulloy2.net/nexus/repository/releases/ + + + dmulloy2-snapshots + http://repo.dmulloy2.net/nexus/repository/snapshots/ + + + + + + dmulloy2-repo + http://repo.dmulloy2.net/nexus/repository/public/ + + + spigot-repo + https://hub.spigotmc.org/nexus/content/groups/public/ + + + + + + + io.netty + netty-all + 4.0.23.Final + provided + + + org.spigotmc + spigot-api + ${spigot.version} + provided + + + org.spigotmc + spigot + ${spigot.version} + provided + + + cglib + cglib-nodep + 3.2.5 + compile + + + + + com.comphenix.executors + BukkitExecutors + 1.1-SNAPSHOT + compile + + + + + junit + junit + 4.12 + test + + + org.mockito + mockito-core + 2.21.0 + test + + + org.powermock + powermock-module-junit4 + ${powermock.version} + test + + + org.powermock + powermock-api-mockito2 + ${powermock.version} + test + + + diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index a6a8fbfd..00000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'ProtocolLib' -