Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Maven cleanup #128

Merged
merged 3 commits into from
Dec 19, 2023
Merged

[WIP] Maven cleanup #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b55ad4c
Move all dependency version/exclusion into parent dependencyManagement
bivashy Dec 11, 2023
8f4b67e
Clean up relocations
bivashy Dec 12, 2023
d053326
Exclude conflicting dependencies in velocity module
bivashy Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,6 @@
<groupId>com.bivashy.auth</groupId>
<artifactId>api</artifactId>

<properties>
<jbcrypt.version>0.4</jbcrypt.version>
<multimessenger.version>1.0.5</multimessenger.version>
<adventure.serializer.version>4.14.0</adventure.serializer.version>
<adventure.platform.version>4.3.1</adventure.platform.version>
<ormlite.version>6.1</ormlite.version>
<google.authenticator.version>1.5.0</google.authenticator.version>
<event-bus.version>1.3</event-bus.version>
<configuration-library.version>4.0.2</configuration-library.version>
<libby.version>2.0.0</libby.version>
</properties>

<repositories>
<repository>
<id>jitpack.io</id>
Expand All @@ -35,101 +23,74 @@
<dependency>
<groupId>org.mindrot</groupId>
<artifactId>jbcrypt</artifactId>
<version>${jbcrypt.version}</version>
</dependency>

<!-- MultiMessenger library -->
<dependency>
<groupId>com.github.bivashy.MultiMessenger</groupId>
<artifactId>common</artifactId>
<version>${multimessenger.version}</version>
</dependency>
<dependency>
<groupId>com.github.bivashy.MultiMessenger</groupId>
<artifactId>vk</artifactId>
<version>${multimessenger.version}</version>
</dependency>
<dependency>
<groupId>com.github.bivashy.MultiMessenger</groupId>
<artifactId>telegram</artifactId>
<version>${multimessenger.version}</version>
<exclusions>
<exclusion>
<groupId>com.github.pengrad</groupId>
<artifactId>java-telegram-bot-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.github.bivashy.MultiMessenger</groupId>
<artifactId>discord</artifactId>
<version>${multimessenger.version}</version>
<exclusions>
<exclusion>
<artifactId>JDA</artifactId>
<groupId>net.dv8tion</groupId>
</exclusion>
</exclusions>
</dependency>


<!-- Adventure platform -->
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-platform-api</artifactId>
<version>${adventure.platform.version}</version>
</dependency>

<!-- Adventure serializers -->
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId>
<version>${adventure.serializer.version}</version>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-legacy</artifactId>
<version>${adventure.serializer.version}</version>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-plain</artifactId>
<version>${adventure.serializer.version}</version>
</dependency>

<!-- ORMLite -->
<dependency>
<groupId>com.j256.ormlite</groupId>
<artifactId>ormlite-jdbc</artifactId>
<version>${ormlite.version}</version>
</dependency>

<!-- GoogleAuthenticator library -->
<dependency>
<groupId>com.warrenstrange</groupId>
<artifactId>googleauth</artifactId>
<version>${google.authenticator.version}</version>
</dependency>

<!-- Event Bus -->
<dependency>
<groupId>com.github.Revxrsal</groupId>
<artifactId>EventBus</artifactId>
<version>${event-bus.version}</version>
</dependency>

<!-- Configuration library core -->
<dependency>
<groupId>com.github.bivashy.ConfigurationLibrary</groupId>
<artifactId>core</artifactId>
<version>${configuration-library.version}</version>
</dependency>

<!-- Libby runtime dependency management -->
<dependency>
<groupId>com.github.bivashy.libby</groupId>
<artifactId>libby-core</artifactId>
<version>${libby.version}</version>
</dependency>
</dependencies>
</project>
31 changes: 1 addition & 30 deletions bungee/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,6 @@
</parent>
<artifactId>bungee</artifactId>

<properties>
<bungeecord.version>1.19-R0.1-SNAPSHOT</bungeecord.version>
<lamp.command-library.version>3.1.8</lamp.command-library.version>
<adventure.bungee.version>4.3.0</adventure.bungee.version>
<telegram.api.version>6.9.1</telegram.api.version>
<vk.api.version>0.4.2</vk.api.version>
<libby.version>2.0.0</libby.version>
<nanolimbo.version>1.0.8</nanolimbo.version>
</properties>

<repositories>
<repository>
<id>jitpack.io</id>
Expand All @@ -37,74 +27,55 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>core</artifactId>
<version>${project.version}</version>
</dependency>

<!-- BungeeCord API -->
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>${bungeecord.version}</version>
<type>jar</type>
<scope>provided</scope>
</dependency>

<!-- BungeeCord Javadoc API -->
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>${bungeecord.version}</version>
<type>javadoc</type>
<scope>provided</scope>
</dependency>

<!-- Lamp Bungee Module -->
<!-- Lamp -->
<dependency>
<groupId>com.github.Revxrsal.Lamp</groupId>
<artifactId>bungee</artifactId>
<version>${lamp.command-library.version}</version>
</dependency>

<!-- Adventure BungeeCord platform -->
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-platform-bungeecord</artifactId>
<version>${adventure.bungee.version}</version>
</dependency>

<!-- VK API -->
<dependency>
<groupId>com.github.bivashy</groupId>
<artifactId>VK-API-PluginAdapter</artifactId>
<version>${vk.api.version}</version>
<scope>provided</scope>
</dependency>

<!-- Telegram API -->
<dependency>
<groupId>com.github.pengrad</groupId>
<artifactId>java-telegram-bot-api</artifactId>
<version>${telegram.api.version}</version>
<scope>provided</scope>
</dependency>

<!-- NanoLimboPlugin API -->
<dependency>
<groupId>com.github.bivashy.NanoLimboPlugin</groupId>
<artifactId>api</artifactId>
<version>${nanolimbo.version}</version>
<scope>provided</scope>
</dependency>

<!-- Libby -->
<dependency>
<groupId>com.github.bivashy.libby</groupId>
<artifactId>libby-bungee</artifactId>
<version>${libby.version}</version>
</dependency>
</dependencies>


<build>
<plugins>
<plugin>
Expand Down
64 changes: 6 additions & 58 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,6 @@
</parent>
<artifactId>core</artifactId>

<properties>
<auth.api.version>${project.version}</auth.api.version>
<jbcrypt.version>0.4</jbcrypt.version>
<zxing.library.version>3.5.2</zxing.library.version>
<configuration-library.version>4.0.2</configuration-library.version>
<configurate.version>4.1.2</configurate.version>
<lamp.command-library.version>3.1.8</lamp.command-library.version>
<vk-lamp-module.version>1.0.0</vk-lamp-module.version>
<telegram-lamp-module.version>1.0.0</telegram-lamp-module.version>
<java-telegram-bot-api.version>6.9.1</java-telegram-bot-api.version>
<minimessage.version>4.14.0</minimessage.version>
<vk.api.version>0.4.2</vk.api.version>
<password4j.version>1.7.3</password4j.version>
<yaml-config-updater.version>1.4.2</yaml-config-updater.version>
<jda.version>5.0.0-beta.18</jda.version>
<nanolimbo.version>1.0.8</nanolimbo.version>
<maven-resolver.version>1.9.15</maven-resolver.version>
<maven-resolver-provider.version>3.9.4</maven-resolver-provider.version>
</properties>

<repositories>
<repository>
<id>jitpack.io</id>
Expand All @@ -38,137 +18,105 @@
</repositories>

<dependencies>
<!-- MC-Auth API -->
<!-- Internal API -->
<dependency>
<groupId>com.bivashy.auth</groupId>
<artifactId>api</artifactId>
<version>${auth.api.version}</version>
</dependency>

<!-- BCrypt library -->
<!-- BCrypt -->
<dependency>
<groupId>org.mindrot</groupId>
<artifactId>jbcrypt</artifactId>
<version>${jbcrypt.version}</version>
</dependency>

<!-- Barcode, QR library -->
<!-- QR library -->
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>${zxing.library.version}</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>javase</artifactId>
<version>${zxing.library.version}</version>
</dependency>

<!-- Configuration library for Configurate -->
<dependency>
<groupId>com.github.bivashy.ConfigurationLibrary</groupId>
<artifactId>configurate</artifactId>
<version>${configuration-library.version}</version>
</dependency>

<!-- SpongePowered Configurate core library -->
<!-- Configurate -->
<dependency>
<groupId>org.spongepowered</groupId>
<artifactId>configurate-core</artifactId>
<version>${configurate.version}</version>
</dependency>

<!-- SpongePowered Configurate YAML library -->
<dependency>
<groupId>org.spongepowered</groupId>
<artifactId>configurate-yaml</artifactId>
<version>${configurate.version}</version>
</dependency>

<!-- Lamp Core Command Library -->
<!-- Lamp -->
<dependency>
<groupId>com.github.Revxrsal.Lamp</groupId>
<artifactId>common</artifactId>
<version>${lamp.command-library.version}</version>
</dependency>

<!-- Lamp Vk Module -->
<dependency>
<groupId>com.github.bivashy</groupId>
<artifactId>VkLampModule</artifactId>
<version>${vk-lamp-module.version}</version>
<exclusions>
<exclusion>
<groupId>com.vk.api</groupId>
<artifactId>sdk</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Lamp telegram module -->
<dependency>
<groupId>com.github.bivashy</groupId>
<artifactId>TelegramLampModule</artifactId>
<version>${telegram-lamp-module.version}</version>
</dependency>

<!-- Lamp discord module -->
<dependency>
<groupId>com.github.Revxrsal.Lamp</groupId>
<artifactId>jda</artifactId>
<version>${lamp.command-library.version}</version>
</dependency>

<!-- VK API -->
<dependency>
<groupId>com.github.bivashy</groupId>
<artifactId>VK-API-PluginAdapter</artifactId>
<version>${vk.api.version}</version>
<scope>provided</scope>
</dependency>

<!-- Java telegram bot api -->
<!-- Telegram API -->
<dependency>
<groupId>com.github.pengrad</groupId>
<artifactId>java-telegram-bot-api</artifactId>
<version>${java-telegram-bot-api.version}</version>
<scope>provided</scope>
</dependency>

<!-- Mini message -->
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-text-minimessage</artifactId>
<version>${minimessage.version}</version>
</dependency>

<!-- Password4j -->
<dependency>
<groupId>com.password4j</groupId>
<artifactId>password4j</artifactId>
<version>${password4j.version}</version>
</dependency>

<!-- Yaml Config Updater -->
<dependency>
<groupId>ru.vyarus</groupId>
<artifactId>yaml-config-updater</artifactId>
<version>${yaml-config-updater.version}</version>
</dependency>

<!-- Java Discord API -->
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>${jda.version}</version>
<scope>provided</scope>
</dependency>

<!-- NanoLimboPlugin API -->
<dependency>
<groupId>com.github.bivashy.NanoLimboPlugin</groupId>
<artifactId>api</artifactId>
<version>${nanolimbo.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
Loading
Loading