diff --git a/.gitignore b/.gitignore index a3546808..0bdb0d2d 100644 --- a/.gitignore +++ b/.gitignore @@ -219,3 +219,5 @@ nbdist/ .nb-gradle/ # End of https://www.gitignore.io/api/git,java,maven,eclipse,netbeans,jetbrains+all +gradle/ +**/.gradle/ diff --git a/api/build.gradle.kts b/api/build.gradle.kts index e6b69051..0bd75df1 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -1,7 +1,6 @@ dependencies { api("org.geysermc", "common", Versions.geyserVersion) api("org.geysermc.cumulus", "cumulus", Versions.cumulusVersion) + compileOnly("io.netty", "netty-transport", Versions.nettyVersion) } - -description = "api" diff --git a/api/pom.xml b/api/pom.xml deleted file mode 100644 index 08406568..00000000 --- a/api/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - 4.0.0 - - - parent - org.geysermc.floodgate - 2.1.1-SNAPSHOT - - - api - - - - io.netty - netty-transport - ${netty.version} - provided - - - org.geysermc - common - ${geyser.version} - - - org.geysermc.cumulus - cumulus - ${cumulus.version} - - - - - - opencollab-release-repo - https://repo.opencollab.dev/maven-releases/ - - true - - - false - - - - opencollab-snapshot-repo - https://repo.opencollab.dev/maven-snapshots/ - - false - - - true - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - - - ${outputName} - true - - - - - diff --git a/build-logic/src/main/kotlin/extensions.kt b/build-logic/src/main/kotlin/extensions.kt new file mode 100644 index 00000000..03d253e9 --- /dev/null +++ b/build-logic/src/main/kotlin/extensions.kt @@ -0,0 +1,28 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import org.gradle.api.Project +import org.gradle.api.artifacts.ProjectDependency +import org.gradle.kotlin.dsl.named + +fun Project.relocate(pattern: String) { + tasks.named("shadowJar") { + relocate(pattern, "org.geysermc.floodgate.shaded.$pattern") + } +} + +val providedDependencies = mutableMapOf>() + +fun Project.provided(pattern: String, name: String, version: String, excludedOn: Int = 0b110) { + providedDependencies.getOrPut(project.name) { mutableSetOf() } + .add("${calcExclusion(pattern, 0b100, excludedOn)}:" + + "${calcExclusion(name, 0b10, excludedOn)}:" + + calcExclusion(version, 0b1, excludedOn)) + dependencies.add("compileOnlyApi", "$pattern:$name:$version") +} + +fun Project.provided(dependency: ProjectDependency) { + provided(dependency.group!!, dependency.name, dependency.version!!) +} + +private fun calcExclusion(section: String, bit: Int, excludedOn: Int): String { + return if (excludedOn and bit > 0) section else "" +} \ No newline at end of file diff --git a/build-logic/src/main/kotlin/floodgate.base-conventions.gradle.kts b/build-logic/src/main/kotlin/floodgate.base-conventions.gradle.kts index 90fc8f97..168456d8 100644 --- a/build-logic/src/main/kotlin/floodgate.base-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/floodgate.base-conventions.gradle.kts @@ -4,6 +4,10 @@ plugins { // id("net.ltgt.errorprone") } +dependencies { + compileOnly("org.checkerframework", "checker-qual", Versions.checkerQual) +} + tasks { processResources { filesMatching(listOf("plugin.yml", "bungee.yml", "velocity-plugin.json")) { diff --git a/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts b/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts index 435b9340..5c7d4a1f 100644 --- a/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/floodgate.shadow-conventions.gradle.kts @@ -15,17 +15,23 @@ tasks { archiveBaseName.set("floodgate-${project.name}") archiveVersion.set("") archiveClassifier.set("") - configureRelocations() + + val sJar: ShadowJar = this + + doFirst { + providedDependencies[project.name]?.forEach { string -> + sJar.dependencies { + println("Excluding $string from ${project.name}") + exclude(dependency(string)) + } + } + } } named("build") { dependsOn(shadowJar) } } -fun ShadowJar.configureRelocations() { - //todo platform-independent relocations -} - publishing { publications.named("mavenJava") { artifact(tasks["shadowJar"]) diff --git a/build.gradle.kts b/build.gradle.kts index 0ad0b8fe..b7b50c48 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,9 +5,10 @@ plugins { id("io.freefair.lombok") version "6.3.0" apply false } -allprojects{ +allprojects { group = "org.geysermc.floodgate" version = "2.1.1-SNAPSHOT" + description = "Allows Bedrock players to join Java edition servers while keeping the server in online mode" } val platforms = setOf( @@ -16,6 +17,9 @@ val platforms = setOf( projects.velocity ).map { it.dependencyProject } +//todo re-add git properties (or at least build number, branch and commit) +// re-add pmd and organisation/license/sdcm/issuemanagement stuff + val api: Project = projects.api.dependencyProject subprojects { @@ -40,8 +44,4 @@ subprojects { else -> plugins.apply("floodgate.base-conventions") } } - - dependencies { - compileOnly("org.checkerframework", "checker-qual", Versions.checkerQual) - } } \ No newline at end of file diff --git a/bungee/build.gradle.kts b/bungee/build.gradle.kts index dd36089e..d98b65e1 100644 --- a/bungee/build.gradle.kts +++ b/bungee/build.gradle.kts @@ -1,16 +1,23 @@ -var bungeeCommit = "bda1605"; -var gsonVersion = "2.8.0"; -var guavaVersion = "21.0"; +var bungeeCommit = "bda1605" +var gsonVersion = "2.8.0" +var guavaVersion = "21.0" dependencies { - api(project(":core")) - implementation("cloud.commandframework", "cloud-bungee", "1.5.0") + api(projects.core) + + implementation("cloud.commandframework", "cloud-bungee", Versions.cloudVersion) implementation("net.kyori", "adventure-text-serializer-gson", Versions.adventureApiVersion) implementation("net.kyori", "adventure-text-serializer-bungeecord", Versions.adventurePlatformVersion) - compileOnly("com.github.SpigotMC.BungeeCord", "bungeecord-proxy", bungeeCommit) - compileOnly("com.google.code.gson", "gson", gsonVersion) - compileOnly("com.google.guava", "guava", guavaVersion) - compileOnly("org.yaml", "snakeyaml", Versions.snakeyamlVersion) } -description = "bungee" +relocate("com.google.inject") +relocate("net.kyori") +relocate("cloud.commandframework") +// used in cloud +relocate("io.leangen.geantyref") + +// these dependencies are already present on the platform +provided("com.github.SpigotMC.BungeeCord", "bungeecord-proxy", bungeeCommit) +provided("com.google.code.gson", "gson", gsonVersion) +provided("com.google.guava", "guava", guavaVersion) +provided("org.yaml", "snakeyaml", Versions.snakeyamlVersion) diff --git a/bungee/pom.xml b/bungee/pom.xml deleted file mode 100644 index b369d3bc..00000000 --- a/bungee/pom.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - 4.0.0 - - - parent - org.geysermc.floodgate - 2.1.1-SNAPSHOT - - - bungee - - - bda1605 - 2.8.0 - 21.0 - - - - - com.github.SpigotMC.BungeeCord - bungeecord-proxy - ${bungeecord.commit} - provided - - - org.geysermc.floodgate - core - ${project.version} - - - - cloud.commandframework - cloud-bungee - ${cloud.version} - - - net.kyori - adventure-text-serializer-gson - ${adventure-api.version} - - - net.kyori - adventure-text-serializer-bungeecord - ${adventure-platform.version} - - - - com.google.code.gson - gson - ${gson.version} - provided - - - com.google.guava - guava - ${guava.version} - provided - - - org.yaml - snakeyaml - ${snakeyaml.version} - provided - - - - - - bungeecord-repo - https://oss.sonatype.org/content/repositories/snapshots - - - jitpack - https://jitpack.io - - - - - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - - - com.google.inject - org.geysermc.floodgate.shaded.com.google.inject - - - net.kyori - org.geysermc.floodgate.shaded.net.kyori - - - cloud.commandframework - org.geysermc.floodgate.shaded.cloud.commandframework - - - - io.leangen.geantyref - org.geysermc.floodgate.shaded.io.leangen.geantyref - - - - - - - ${outputName} - true - - - - - diff --git a/core/build.gradle.kts b/core/build.gradle.kts index e5ed8985..e7c9db1c 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -1,5 +1,6 @@ dependencies { - api(project(":api")) + api(projects.api) + api("com.google.inject", "guice", Versions.guiceVersion) api("com.nukkitx.fastutil", "fastutil-short-object-maps", Versions.fastutilVersion) api("com.nukkitx.fastutil", "fastutil-int-object-maps", Versions.fastutilVersion) @@ -7,8 +8,8 @@ dependencies { api("net.kyori", "adventure-api", Versions.adventureApiVersion) api("cloud.commandframework", "cloud-core", Versions.cloudVersion) api("org.yaml", "snakeyaml", Versions.snakeyamlVersion) - compileOnly("io.netty", "netty-transport", Versions.nettyVersion) - compileOnly("io.netty", "netty-codec", Versions.nettyVersion) } -description = "core" +// present on all platforms +provided("io.netty", "netty-transport", Versions.nettyVersion) +provided("io.netty", "netty-codec", Versions.nettyVersion) diff --git a/core/pom.xml b/core/pom.xml deleted file mode 100644 index 193914ea..00000000 --- a/core/pom.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - 4.0.0 - - - parent - org.geysermc.floodgate - 2.1.1-SNAPSHOT - - - core - - - 1.5.2 - - - - - org.geysermc.floodgate - api - ${project.parent.version} - - - org.geysermc.cumulus - cumulus - ${cumulus.version} - - - com.google.inject - guice - ${guice.version} - - - com.nukkitx.fastutil - fastutil-short-object-maps - ${fastutil.version} - - - com.nukkitx.fastutil - fastutil-int-object-maps - ${fastutil.version} - - - org.java-websocket - Java-WebSocket - ${java-websocket.version} - - - net.kyori - adventure-api - ${adventure-api.version} - - - cloud.commandframework - cloud-core - ${cloud.version} - - - org.yaml - snakeyaml - ${snakeyaml.version} - - - - io.netty - netty-transport - ${netty.version} - provided - - - io.netty - netty-codec - ${netty.version} - provided - - - - - - opencollab-release-repo - https://repo.opencollab.dev/maven-releases/ - - true - - - false - - - - opencollab-snapshot-repo - https://repo.opencollab.dev/maven-snapshots/ - - false - - - true - - - - minecraft-libraries - Minecraft Libraries - https://libraries.minecraft.net - - - paper repo - https://papermc.io/repo/repository/maven-public/ - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - - - ${outputName} - true - - - - - diff --git a/core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java b/core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java index 58706ac4..f35b2c52 100644 --- a/core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java +++ b/core/src/main/java/org/geysermc/floodgate/FloodgatePlatform.java @@ -47,7 +47,6 @@ import org.geysermc.floodgate.link.PlayerLinkLoader; import org.geysermc.floodgate.module.ConfigLoadedModule; import org.geysermc.floodgate.module.PostInitializeModule; import org.geysermc.floodgate.news.NewsChecker; -import org.geysermc.floodgate.util.FloodgateInfoHolder; import org.geysermc.floodgate.util.GitProperties; import org.geysermc.floodgate.util.PrefixCheckTask; @@ -106,7 +105,7 @@ public class FloodgatePlatform { InstanceHolder.set(api, link, this.injector, packetHandlers, handshakeHandlers, KEY); // for Geyser dump - FloodgateInfoHolder.setGitProperties(properties.getProperties()); +// FloodgateInfoHolder.setGitProperties(properties.getProperties()); guice.getInstance(NewsChecker.class).start(); } diff --git a/core/src/main/java/org/geysermc/floodgate/util/GitProperties.java b/core/src/main/java/org/geysermc/floodgate/util/GitProperties.java index 66d33b53..15af1d8f 100644 --- a/core/src/main/java/org/geysermc/floodgate/util/GitProperties.java +++ b/core/src/main/java/org/geysermc/floodgate/util/GitProperties.java @@ -31,7 +31,9 @@ public class GitProperties { private final Properties properties; public GitProperties() { - properties = Utils.readProperties("git.properties"); +// properties = Utils.readProperties("git.properties"); + properties = new Properties(); + properties.setProperty("git.branch", "dev/2.1.1"); } public Properties getProperties() { diff --git a/database/mysql/build.gradle.kts b/database/mysql/build.gradle.kts index 3f785fed..cc59658b 100644 --- a/database/mysql/build.gradle.kts +++ b/database/mysql/build.gradle.kts @@ -1,10 +1,10 @@ -plugins { - war -} +val mariadbClientVersion = "2.7.4" dependencies { - providedCompile(projects.core) - implementation("org.mariadb.jdbc:mariadb-java-client:2.7.4") + provided(projects.core) + implementation("org.mariadb.jdbc", "mariadb-java-client" , mariadbClientVersion) } -description = "mysql" +description = "The Floodgate database extension for MySQL" + +relocate("org.mariadb") diff --git a/database/mysql/pom.xml b/database/mysql/pom.xml deleted file mode 100644 index 36f8e857..00000000 --- a/database/mysql/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - 4.0.0 - - - parent - org.geysermc.floodgate.database - 2.1.1-SNAPSHOT - - - mysql - - - 2.7.4 - - - - - org.mariadb.jdbc - mariadb-java-client - ${mariadb-client.version} - compile - - - org.geysermc.floodgate - core - ${parent.version} - provided - - - - - - - src/main/resources/ - true - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - - - org.mariadb - org.geysermc.floodgate.shaded.org.mariadb - - - - - - - ${outputName} - true - - - - - \ No newline at end of file diff --git a/database/pom.xml b/database/pom.xml deleted file mode 100644 index d241562b..00000000 --- a/database/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - - parent - org.geysermc.floodgate - 2.1.1-SNAPSHOT - - - org.geysermc.floodgate.database - parent - pom - - database - - - - sqlite - mysql - - - - floodgate-${project.name}-database - - \ No newline at end of file diff --git a/database/sqlite/build.gradle.kts b/database/sqlite/build.gradle.kts index 85eba6e6..2e7882d8 100644 --- a/database/sqlite/build.gradle.kts +++ b/database/sqlite/build.gradle.kts @@ -1,10 +1,8 @@ -plugins { - war -} +val sqliteJdbcVersion = "3.36.0.3" dependencies { - providedCompile(projects.core) - implementation("org.xerial:sqlite-jdbc:3.36.0.3") + provided(projects.core) + implementation("org.xerial", "sqlite-jdbc", sqliteJdbcVersion) } -description = "sqlite" +description = "The Floodgate database extension for SQLite" diff --git a/database/sqlite/pom.xml b/database/sqlite/pom.xml deleted file mode 100644 index a18ed23f..00000000 --- a/database/sqlite/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - 4.0.0 - - - parent - org.geysermc.floodgate.database - 2.1.1-SNAPSHOT - - - sqlite - - - 3.36.0.3 - - - - - org.xerial - sqlite-jdbc - ${sqlite-jdbc.version} - compile - - - org.geysermc.floodgate - core - ${parent.version} - provided - - - - - - - src/main/resources/ - true - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - - - ${outputName} - true - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 85e8c649..00000000 --- a/pom.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - 4.0.0 - - org.geysermc.floodgate - parent - 2.1.1-SNAPSHOT - pom - - floodgate - Allows Bedrock players to join Java edition servers while keeping the server in online mode - https://github.com/GeyserMC/Floodgate - 2019 - - GeyserMC - https://geysermc.org/ - - - - MIT License - https://opensource.org/licenses/MIT - repo - - - - - api - core - spigot - bungee - velocity - database - - - - scm:git:https://github.com/GeyserMC/Floodgate.git - scm:git:git@github.com:GeyserMC/Floodgate.git - https://github.com/GeyserMC/Floodgate/ - - - GitHub Issues - https://github.com/GeyserMC/Floodgate/issues - - - - 2.0.0-SNAPSHOT - 1.0-SNAPSHOT - 1.13-R0.1-SNAPSHOT - 8.5.3 - 1.18.20 - 5.0.1 - - 4.1.49.Final - 1.28 - 1.5.0 - 4.9.1 - 4.0.0 - - floodgate-${project.name} - UTF-8 - UTF-8 - 1.8 - 1.8 - - - - - org.projectlombok - lombok - ${lombok.version} - provided - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.14.0 - - - ${session.executionRootDirectory}/ruleset.xml - - true - - - - - check - - - - - - pl.project13.maven - git-commit-id-plugin - 4.0.0 - - - get-the-git-infos - - revision - - - - - true - ${project.build.outputDirectory}/git.properties - properties - false - false - false - true - false - - git.user.* - git.*.user.* - git.closest.* - git.commit.id.describe - git.commit.id.describe-short - git.commit.message.short - - flat - - true - - - - - - - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.14.0 - - - ${session.executionRootDirectory}/ruleset.xml - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.3 - - - - diff --git a/spigot/build.gradle.kts b/spigot/build.gradle.kts index 56f2c23c..f0d0fe9a 100644 --- a/spigot/build.gradle.kts +++ b/spigot/build.gradle.kts @@ -3,19 +3,30 @@ var guavaVersion = "21.0" var gsonVersion = "2.8.5" dependencies { - api(project(":core")) + api(projects.core) + // hack to make pre 1.12 work implementation("com.google.guava", "guava", guavaVersion) + implementation("cloud.commandframework", "cloud-bukkit", Versions.cloudVersion) implementation("net.kyori", "adventure-text-serializer-legacy", Versions.adventureApiVersion) implementation("net.kyori", "adventure-text-serializer-gson", Versions.adventureApiVersion) - - compileOnly("org.spigotmc", "spigot-api", Versions.spigotVersion) - compileOnly("com.mojang", "authlib", authlibVersion) - compileOnly("io.netty", "netty-transport", Versions.nettyVersion) - compileOnly("io.netty", "netty-codec", Versions.nettyVersion) - compileOnly("com.google.code.gson", "gson", gsonVersion) - compileOnly("org.yaml", "snakeyaml", Versions.snakeyamlVersion) } -description = "spigot" +relocate("com.google.inject") +relocate("net.kyori") +relocate("cloud.commandframework") +relocate("io.leangen.geantyref") // used in cloud +// hack to make pre 1.12 work +relocate("com.google.common") +relocate("com.google.guava") +// hack to make (old versions? of) Paper work +relocate("it.unimi") + +// these dependencies are already present on the platform +provided("org.spigotmc", "spigot-api", Versions.spigotVersion) +provided("com.mojang", "authlib", authlibVersion) +provided("io.netty", "netty-transport", Versions.nettyVersion) +provided("io.netty", "netty-codec", Versions.nettyVersion) +provided("com.google.code.gson", "gson", gsonVersion) +provided("org.yaml", "snakeyaml", Versions.snakeyamlVersion) diff --git a/spigot/pom.xml b/spigot/pom.xml deleted file mode 100644 index 3ff95438..00000000 --- a/spigot/pom.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - 4.0.0 - - - org.geysermc.floodgate - parent - 2.1.1-SNAPSHOT - - - spigot - - - 1.5.21 - 21.0 - 2.8.5 - - - - - org.spigotmc - spigot-api - ${spigot.version} - provided - - - com.mojang - authlib - ${authlib.version} - provided - - - io.netty - netty-transport - ${netty.version} - provided - - - io.netty - netty-codec - ${netty.version} - provided - - - - com.google.guava - guava - ${guava.version} - compile - - - - org.geysermc.floodgate - core - ${project.version} - - - - cloud.commandframework - cloud-bukkit - ${cloud.version} - - - net.kyori - adventure-text-serializer-legacy - ${adventure-api.version} - - - net.kyori - adventure-text-serializer-gson - ${adventure-api.version} - - - - com.google.code.gson - gson - ${gson.version} - provided - - - org.yaml - snakeyaml - ${snakeyaml.version} - provided - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - minecraft-libraries - https://libraries.minecraft.net/ - - - - - - - src/main/resources/ - true - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - - - com.google.inject - org.geysermc.floodgate.shaded.com.google.inject - - - net.kyori - org.geysermc.floodgate.shaded.net.kyori - - - cloud.commandframework - org.geysermc.floodgate.shaded.cloud.commandframework - - - - io.leangen.geantyref - org.geysermc.floodgate.shaded.io.leangen.geantyref - - - - com.google.common - org.geysermc.floodgate.shaded.com.google.common - - - com.google.guava - org.geysermc.floodgate.shaded.com.google.guava - - - - it.unimi - org.geysermc.floodgate.shaded.it.unimi - - - - - - - ${outputName} - true - - - - - diff --git a/velocity/build.gradle.kts b/velocity/build.gradle.kts index 973162eb..086e2ccc 100644 --- a/velocity/build.gradle.kts +++ b/velocity/build.gradle.kts @@ -4,17 +4,20 @@ var gsonVersion = "2.8.8" var guavaVersion = "25.1-jre" dependencies { - implementation(project(":core")) + api(projects.core) api("cloud.commandframework", "cloud-velocity", Versions.cloudVersion) - compileOnly("net.kyori", "adventure-api", Versions.adventureApiVersion) - compileOnly("com.google.code.gson", "gson", gsonVersion) - compileOnly("com.google.guava", "guava", guavaVersion) - compileOnly("com.google.inject", "guice", Versions.guiceVersion) - compileOnly("org.yaml", "snakeyaml", Versions.snakeyamlVersion) - compileOnly("com.velocitypowered", "velocity-api", velocityVersion) - compileOnly("org.apache.logging.log4j", "log4j-core", log4jVersion) - compileOnly("io.netty", "netty-transport", Versions.nettyVersion) - compileOnly("io.netty", "netty-codec", Versions.nettyVersion) } -description = "velocity" +relocate("cloud.commandframework") +// used in cloud +relocate("io.leangen.geantyref") + + +// these dependencies are already present on the platform +provided("net.kyori", "adventure-api", Versions.adventureApiVersion, 0b100) +provided("com.google.code.gson", "gson", gsonVersion) +provided("com.google.guava", "guava", guavaVersion) +provided("com.google.inject", "guice", Versions.guiceVersion) +provided("org.yaml", "snakeyaml", Versions.snakeyamlVersion) // included in Configurate +provided("com.velocitypowered", "velocity-api", velocityVersion) +provided("org.apache.logging.log4j", "log4j-core", log4jVersion) diff --git a/velocity/pom.xml b/velocity/pom.xml deleted file mode 100644 index fa5dcba1..00000000 --- a/velocity/pom.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - 4.0.0 - - - parent - org.geysermc.floodgate - 2.1.1-SNAPSHOT - - - velocity - - - 3.0.1 - 2.11.2 - 2.8.8 - 25.1-jre - - - - - org.geysermc.floodgate - core - ${project.version} - - - cloud.commandframework - cloud-velocity - ${cloud.version} - - - - net.kyori - adventure-api - ${adventure-api.version} - provided - - - com.google.code.gson - gson - ${gson.version} - provided - - - com.google.guava - guava - ${guava.version} - provided - - - com.google.inject - guice - ${guice.version} - provided - - - - org.yaml - snakeyaml - ${snakeyaml.version} - provided - - - com.velocitypowered - velocity-api - ${velocity.version} - provided - - - org.apache.logging.log4j - log4j-core - ${log4j.version} - provided - - - io.netty - netty-transport - ${netty.version} - provided - - - io.netty - netty-codec - ${netty.version} - provided - - - - - - velocity-repo - https://repo.velocitypowered.com/snapshots/ - - - - minecraft-repo - https://libraries.minecraft.net/ - - - sponge-repo - https://repo.spongepowered.org/maven/ - - - - - - - src/main/resources - true - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - - - cloud.commandframework - org.geysermc.floodgate.shaded.cloud.commandframework - - - - io.leangen.geantyref - org.geysermc.floodgate.shaded.io.leangen.geantyref - - - - - - - ${outputName} - true - - - - -