From c443615c1d23f88cca93c7db14786b2119b33232 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 14 Oct 2022 13:45:26 -0400 Subject: [PATCH] Fix cache never being used for Spigot dependencies (#105) --- pom.xml | 10 ++++++++++ scripts/install_spigot_dependencies.sh | 6 ++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3dbb75a..b6f15d5 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,16 @@ + + + maven-dependency-plugin + org.apache.maven.plugins + 3.3.0 + + maven-shade-plugin diff --git a/scripts/install_spigot_dependencies.sh b/scripts/install_spigot_dependencies.sh index dd3cbfc..61668d4 100644 --- a/scripts/install_spigot_dependencies.sh +++ b/scripts/install_spigot_dependencies.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2011-2021 lishid. All rights reserved. +# Copyright (C) 2011-2022 lishid. All rights reserved. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -34,9 +34,7 @@ readarray -t versions <<< "$(. ./scripts/get_spigot_versions.sh)" echo Found Spigot dependencies: "${versions[@]}" # Install dependencies aside from Spigot prior to running in offline mode. -# Note that the default SuperPOM declares maven-dependency-plugin 2.8.0. -# Unfortunately, we run into MDEP-204 and require a version >= 3.1.2. -mvn org.apache.maven.plugins:maven-dependency-plugin:3.2.0:go-offline -DexcludeArtifactIds=spigot +mvn dependency:go-offline -DexcludeArtifactIds=spigot for version in "${versions[@]}"; do set -e