From 40986aeb91280195823f8db867e46548074bf81b Mon Sep 17 00:00:00 2001 From: Tux Date: Thu, 19 May 2016 19:33:31 +0200 Subject: [PATCH] POM Changes - Require Java 8 - Deploy to papermc mvn repo diff --git a/api/pom.xml b/api/pom.xml index e64231f5..338864f8 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-api + io.github.waterfallmc + waterfall-api 1.17-R0.1-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 f9dc01f4..bd5df16e 100644 --- a/bootstrap/pom.xml +++ b/bootstrap/pom.xml @@ -4,39 +4,40 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-bootstrap + io.github.waterfallmc + waterfall-bootstrap 1.17-R0.1-SNAPSHOT jar - BungeeCord-Bootstrap - Java 1.6 loader for BungeeCord + Waterfall-Bootstrap + Java 1.6 loader for Waterfall true true - 1.6 - 1.6 + + 1.8 + 1.8 yyyyMMdd - net.md-5 - bungeecord-proxy + io.github.waterfallmc + waterfall-proxy ${project.version} compile - BungeeCord + Waterfall org.apache.maven.plugins @@ -45,7 +46,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 6be22739..a4516ed9 100644 --- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java +++ b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java @@ -7,7 +7,7 @@ public class Bootstrap { if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 52.0 ) { - System.err.println( "*** ERROR *** BungeeCord requires Java 8 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 fb797b1e..cfa0e16e 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -4,25 +4,25 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-chat + io.github.waterfallmc + waterfall-chat 1.17-R0.1-SNAPSHOT jar - BungeeCord-Chat - Minecraft JSON chat API intended for use with BungeeCord + Waterfall-Chat + Minecraft JSON chat API intended for use with Waterfall com.google.code.gson gson - 2.8.0 + 2.8.7 compile diff --git a/config/pom.xml b/config/pom.xml index 4f3c1773..d210e093 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-config + io.github.waterfallmc + waterfall-config 1.17-R0.1-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 3a9c7634..563783e9 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-event + io.github.waterfallmc + waterfall-event 1.17-R0.1-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 6d6242e1..3663d6d9 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-log + io.github.waterfallmc + waterfall-log 1.17-R0.1-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 4b3a82ea..11e990d9 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module-cmd-alert + io.github.waterfallmc + waterfall-module-cmd-alert 1.17-R0.1-SNAPSHOT jar diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml index 1c7f2515..b732d67f 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module-cmd-find + io.github.waterfallmc + waterfall-module-cmd-find 1.17-R0.1-SNAPSHOT jar diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml index 91fadc2b..d17cb787 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module-cmd-list + io.github.waterfallmc + waterfall-module-cmd-list 1.17-R0.1-SNAPSHOT jar diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml index 30097fc3..d1972708 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module-cmd-send + io.github.waterfallmc + waterfall-module-cmd-send 1.17-R0.1-SNAPSHOT jar diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml index d69f1e61..3b2c4952 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module-cmd-server + io.github.waterfallmc + waterfall-module-cmd-server 1.17-R0.1-SNAPSHOT jar diff --git a/module/pom.xml b/module/pom.xml index dbc316dd..0ef98d58 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module + io.github.waterfallmc + waterfall-module 1.17-R0.1-SNAPSHOT pom - BungeeCord Modules - Parent project for all BungeeCord modules. + Waterfall Modules + Parent project for all Waterfall modules. cmd-alert @@ -28,15 +28,15 @@ - SpigotMC + WaterfallMC true 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 8d1df1fd..b88398cf 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-module-reconnect-yaml + io.github.waterfallmc + waterfall-module-reconnect-yaml 1.17-R0.1-SNAPSHOT jar diff --git a/native/pom.xml b/native/pom.xml index f8bacabd..652a869d 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-native + io.github.waterfallmc + waterfall-native 1.17-R0.1-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 5f4cbce3..93d22dba 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.17-R0.1-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 @@ -46,28 +65,24 @@ - 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/PaperMC/Waterfall/issues - - jenkins - http://ci.md-5.net/job/BungeeCord - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + papermc-releases + https://papermc.io/repo/repository/maven-releases/ + + papermc-snapshots + https://papermc.io/repo/repository/maven-snapshots/ + @@ -124,12 +139,21 @@ + org.apache.maven.plugins maven-compiler-plugin 3.8.1 + maven-javadoc-plugin + 3.2.0 + + none + + + org.codehaus.mojo animal-sniffer-maven-plugin @@ -321,5 +346,88 @@ + + + deployment + + + + org.projectlombok + lombok-maven-plugin + 1.18.12.0 + + + delombok + generate-sources + + delombok + + + false + src/main/java + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.0 + + none + + + + attach-javadocs + package + + jar + + + target/generated-sources/delombok + + + + aggregate-javadocs + package + + javadoc + + false + + Waterfall ${project.version} API + Waterfall ${project.version} API + + api/target/generated-sources/delombok; + chat/target/generated-sources/delombok + + 8 + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.4 + + + attach-sources + package + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.7 + + + + + diff --git a/protocol/pom.xml b/protocol/pom.xml index f66ca6ca..dbc0a3ab 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -4,19 +4,19 @@ 4.0.0 - net.md-5 - bungeecord-parent + io.github.waterfallmc + waterfall-parent 1.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-protocol + io.github.waterfallmc + waterfall-protocol 1.17-R0.1-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 @@ -41,8 +41,8 @@ compile - net.md-5 - bungeecord-chat + io.github.waterfallmc + waterfall-chat ${project.version} compile diff --git a/proxy/pom.xml b/proxy/pom.xml index 0f0af3dc..46b12fc1 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-proxy + io.github.waterfallmc + waterfall-proxy 1.17-R0.1-SNAPSHOT jar - BungeeCord-Proxy + Waterfall-Proxy Proxy component of the Elastic Portal Suite @@ -50,32 +50,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 4212899e..dea7d85f 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.17-R0.1-SNAPSHOT ../pom.xml - net.md-5 - bungeecord-query + io.github.waterfallmc + waterfall-query 1.17-R0.1-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.30.0