From 40e8d009682f0b5b23430f50f501e8f85669b2b1 Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 10:33:31 -0700 Subject: [PATCH] POM Changes - Require Java 8 - Deploy to destroystokyo mvn repo diff --git a/api/pom.xml b/api/pom.xml index 96a46738..2a3c5eae 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,42 +4,42 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-api + io.github.waterfallmc + waterfall-api 1.12-SNAPSHOT jar - BungeeCord-API + Waterfall-API API implemented by the Elastic Portal Suite - net.md-5 - bungeecord-chat + io.github.waterfallmc + waterfall-chat ${project.version} compile - net.md-5 - bungeecord-config + io.github.waterfallmc + waterfall-config ${project.version} compile - net.md-5 - bungeecord-event + io.github.waterfallmc + waterfall-event ${project.version} compile - net.md-5 - bungeecord-protocol + io.github.waterfallmc + waterfall-protocol ${project.version} compile diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml index 9b5c98f7..7bc2dff7 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -4,19 +4,19 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-bootstrap + io.github.waterfallmc + waterfall-bootstrap 1.12-SNAPSHOT jar - BungeeCord-Bootstrap - Java 1.6 loader for BungeeCord + Waterfall-Bootstrap + Java 1.6 loader for Waterfall true @@ -27,8 +27,8 @@ - net.md-5 - bungeecord-proxy + io.github.waterfallmc + waterfall-proxy ${project.version} compile @@ -41,7 +41,7 @@ - BungeeCord + Waterfall org.apache.maven.plugins @@ -50,7 +50,7 @@ - net.md_5.bungee.Bootstrap + net.md_5.bungee.Bootstrap ${describe} ${maven.build.timestamp} diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java index b7cb81e2..a4516ed9 100644 --- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java +++ b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java @@ -5,9 +5,9 @@ public class Bootstrap public static void main(String[] args) throws Exception { - if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 51.0 ) + if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 52.0 ) { - System.err.println( "*** ERROR *** BungeeCord requires Java 7 or above to function! Please download and install it!" ); + System.err.println( "*** ERROR *** Waterfall requires Java 8 or above to function! Please download and install it!" ); System.out.println( "You can check your Java version with the command: java -version" ); return; } diff --git a/chat/pom.xml b/chat/pom.xml index 970e3097..a908c13e 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -4,23 +4,24 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-chat + io.github.waterfallmc + waterfall-chat 1.12-SNAPSHOT jar - BungeeCord-Chat - Minecraft JSON chat API intended for use with BungeeCord + Waterfall-Chat + Minecraft JSON chat API intended for use with Waterfall - 1.6 - 1.6 + + 1.8 + 1.8 diff --git a/config/pom.xml b/config/pom.xml index 253bfdff..d3146344 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -4,19 +4,19 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-config + io.github.waterfallmc + waterfall-config 1.12-SNAPSHOT jar - BungeeCord-Config - Generic java configuration API intended for use with BungeeCord + Waterfall-Config + Generic java configuration API intended for use with Waterfall diff --git a/event/pom.xml b/event/pom.xml index 6132e8e9..a387b2c0 100644 --- a/event/pom.xml +++ b/event/pom.xml @@ -4,17 +4,17 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-event + io.github.waterfallmc + waterfall-event 1.12-SNAPSHOT jar - BungeeCord-Event - Generic java event dispatching API intended for use with BungeeCord + Waterfall-Event + Generic java event dispatching API intended for use with Waterfall. diff --git a/log/pom.xml b/log/pom.xml index 2fcbbad6..b54e01a0 100644 --- a/log/pom.xml +++ b/log/pom.xml @@ -4,19 +4,19 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-log + io.github.waterfallmc + waterfall-log 1.12-SNAPSHOT jar - BungeeCord-Log - Simplistic and performant java.util.Logger based logger and console API designed for use with BungeeCord and Minecraft related applications. + Waterfall-Log + Simplistic and performant java.util.Logger based logger and console API designed for use with Waterfall and Minecraft related applications. @@ -26,8 +26,8 @@ compile - net.md-5 - bungeecord-chat + io.github.waterfallmc + waterfall-chat ${project.version} compile diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml index 220f0421..2d81204b 100644 --- a/module/cmd-alert/pom.xml +++ b/module/cmd-alert/pom.xml @@ -4,14 +4,14 @@ 4.0.0 - net.md-5 - bungeecord-module + io.github.waterfallmc + waterfall-module 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module-cmd-alert + io.github.waterfallmc + waterfall-module-cmd-alert 1.12-SNAPSHOT jar diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml index 928f63a8..f22790a3 100644 --- a/module/cmd-find/pom.xml +++ b/module/cmd-find/pom.xml @@ -4,14 +4,14 @@ 4.0.0 - net.md-5 - bungeecord-module + io.github.waterfallmc + waterfall-module 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module-cmd-find + io.github.waterfallmc + waterfall-module-cmd-find 1.12-SNAPSHOT jar diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml index 689b83ee..0e693f11 100644 --- a/module/cmd-list/pom.xml +++ b/module/cmd-list/pom.xml @@ -4,14 +4,14 @@ 4.0.0 - net.md-5 - bungeecord-module + io.github.waterfallmc + waterfall-module 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module-cmd-list + io.github.waterfallmc + waterfall-module-cmd-list 1.12-SNAPSHOT jar diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml index e50a4bec..ba6de230 100644 --- a/module/cmd-send/pom.xml +++ b/module/cmd-send/pom.xml @@ -4,14 +4,14 @@ 4.0.0 - net.md-5 - bungeecord-module + io.github.waterfallmc + waterfall-module 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module-cmd-send + io.github.waterfallmc + waterfall-module-cmd-send 1.12-SNAPSHOT jar diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml index daf146dc..e00697fe 100644 --- a/module/cmd-server/pom.xml +++ b/module/cmd-server/pom.xml @@ -4,14 +4,14 @@ 4.0.0 - net.md-5 - bungeecord-module + io.github.waterfallmc + waterfall-module 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module-cmd-server + io.github.waterfallmc + waterfall-module-cmd-server 1.12-SNAPSHOT jar diff --git a/module/pom.xml b/module/pom.xml index aff2c070..2b827bb0 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -4,19 +4,19 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module + io.github.waterfallmc + waterfall-module 1.12-SNAPSHOT pom - BungeeCord Modules - Parent project for all BungeeCord modules. + Waterfall Modules + Parent project for all Waterfall modules. cmd-alert @@ -28,14 +28,14 @@ - SpigotMC + WaterfallMC true - net.md-5 - bungeecord-api + io.github.waterfallmc + waterfall-api ${project.version} compile diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml index 8e82446f..091ea8cf 100644 --- a/module/reconnect-yaml/pom.xml +++ b/module/reconnect-yaml/pom.xml @@ -4,14 +4,14 @@ 4.0.0 - net.md-5 - bungeecord-module + io.github.waterfallmc + waterfall-module 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module-reconnect-yaml + io.github.waterfallmc + waterfall-module-reconnect-yaml 1.12-SNAPSHOT jar diff --git a/native/pom.xml b/native/pom.xml index 082f0908..8b045e3b 100644 --- a/native/pom.xml +++ b/native/pom.xml @@ -4,19 +4,19 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-native + io.github.waterfallmc + waterfall-native 1.12-SNAPSHOT jar - BungeeCord-Native - Optional native code to speed up and enhance BungeeCord functionality. + Waterfall-Native + Optional native code to speed up and enhance Waterfall functionality. diff --git a/pom.xml b/pom.xml index fbbe6717..8ab84091 100644 --- a/pom.xml +++ b/pom.xml @@ -3,18 +3,25 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - net.md-5 - bungeecord-parent + + io.github.waterfallmc + waterfall-super + dev-SNAPSHOT + ../pom.xml + + + io.github.waterfallmc + waterfall-parent 1.12-SNAPSHOT pom - BungeeCord-Parent - Parent project for all BungeeCord modules. - https://github.com/SpigotMC/BungeeCord - 2012 + Waterfall-Parent + Parent project for all Waterfall modules. + https://github.com/WaterfallMC/Waterfall + 2015 - SpigotMC - https://github.com/SpigotMC + WaterfallMC + https://github.com/WaterfallMC @@ -26,7 +33,19 @@ - md_5 + Tux + + + Techcable + + + kashike + + + jamierocks + + + fuzzybot @@ -45,31 +64,36 @@ - scm:git:git@github.com:SpigotMC/BungeeCord.git - scm:git:git@github.com:SpigotMC/BungeeCord.git - git@github.com:SpigotMC/BungeeCord.git + scm:git:git@github.com:com:WaterfallMC/Waterfall.git + scm:git:git@github.com:WaterfallMC/Waterfall.git + git@github.com:WaterfallMC/Waterfall.git GitHub - https://github.com/SpigotMC/BungeeCord/issues + https://github.com/WaterfallMC/Waterfall/issues jenkins - http://ci.md-5.net/job/BungeeCord + https://ci.aquifermc.org/job/Waterfall/ + + destroystokyo-releases + https://repo.destroystokyo.com/repository/maven-releases/ + - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ + destroystokyo-snapshots + https://repo.destroystokyo.com/repository/maven-snapshots/ unknown 4.1.15.Final - 1.7 - 1.7 + + 1.8 + 1.8 UTF-8 @@ -118,24 +142,13 @@ + - org.codehaus.mojo - animal-sniffer-maven-plugin - 1.16 - - - process-classes - - check - - - + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 - - org.codehaus.mojo.signature - java17 - 1.0 - + -Xdoclint:none @@ -171,4 +184,49 @@ + + + + deployment + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + attach-javadocs + package + + jar + + + -Xdoclint:none + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.4 + + + attach-sources + package + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + + + diff --git a/protocol/pom.xml b/protocol/pom.xml index bf4b399a..9a4b6529 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -4,24 +4,24 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-protocol + io.github.waterfallmc + waterfall-protocol 1.12-SNAPSHOT jar - BungeeCord-Protocol - Minimal implementation of the Minecraft protocol for use in BungeeCord + Waterfall-Protocol + Minimal implementation of the Minecraft protocol for use in Waterfall - net.md-5 - bungeecord-chat + io.github.waterfallmc + waterfall-chat ${project.version} compile diff --git a/proxy/pom.xml b/proxy/pom.xml index 211f4ded..7aedbc45 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -4,18 +4,18 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-proxy + io.github.waterfallmc + waterfall-proxy 1.12-SNAPSHOT jar - BungeeCord-Proxy + Waterfall-Proxy Proxy component of the Elastic Portal Suite @@ -55,32 +55,32 @@ compile - net.md-5 - bungeecord-api + io.github.waterfallmc + waterfall-api ${project.version} compile - net.md-5 - bungeecord-log + io.github.waterfallmc + waterfall-log ${project.version} compile - net.md-5 - bungeecord-native + io.github.waterfallmc + waterfall-native ${project.version} compile - net.md-5 - bungeecord-protocol + io.github.waterfallmc + waterfall-protocol ${project.version} compile - net.md-5 - bungeecord-query + io.github.waterfallmc + waterfall-query ${project.version} compile diff --git a/query/pom.xml b/query/pom.xml index 9ecb2612..4b3613fa 100644 --- a/query/pom.xml +++ b/query/pom.xml @@ -4,19 +4,19 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.12-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-query + io.github.waterfallmc + waterfall-query 1.12-SNAPSHOT jar - BungeeCord-Query - Minecraft query implementation based on the BungeeCord API. + Waterfall-Query + Minecraft query implementation based on the Waterfall API. @@ -26,8 +26,8 @@ compile - net.md-5 - bungeecord-api + io.github.waterfallmc + waterfall-api ${project.version} compile -- 2.14.1