From b4ed5f0da599c5c40dfccff7ddf0f0aea8cf1e66 Mon Sep 17 00:00:00 2001 From: William Collishaw Date: Wed, 1 May 2019 13:36:11 -0600 Subject: [PATCH] Upgrade Maven Plugin packages Set maven package versions to variables and defining the variables in the parent pom when the package is used in multiple modules Upgrade maven packages Prevent trimming stack trace to maven surefire which caused newer versions to not display stacktrace in Netbeans. Upgrade Maven jar plugin from 3.0.2 to 3.1.1 Upgrade Maven compiler plugin version from 3.6.1 to 3.8.0 Upgrade Maven checkstyle plugin version from 2.17 to 3.0.0 Upgrade Maven javadoc plugin from 3.0.0-M1 to 3.1.0 Upgrade Maven surefire plugin from 2.18 to 2.22 Upgrade Maven plugin api from 3.0.5 to 3.6.1 Upgrade Maven plugin annotations from 3.4 to 3.6.0 Upgrade Maven plugin plugin from 3.4 to 3.6.0 Upgrade Maven git commit id plugin from 2.2.5 to 2.2.6 Upgrade Maven jarsigner plugin from 1.4 to 3.0.0 Upgrade Maven resource plugin from 3.0.2 to 3.1.0 --- cache-client/pom.xml | 4 +- cache-updater/pom.xml | 7 ++-- cache/pom.xml | 16 ++++---- http-api/pom.xml | 16 +++++--- http-service/pom.xml | 24 +++++++----- pom.xml | 49 +++++++++++++++++------- protocol-api/pom.xml | 2 +- protocol/pom.xml | 4 +- runelite-api/pom.xml | 8 +++- runelite-client/pom.xml | 42 ++++++++++++-------- runelite-mixins/pom.xml | 10 +++-- runelite-script-assembler-plugin/pom.xml | 12 ++++-- scripts/pom.xml | 6 ++- 13 files changed, 132 insertions(+), 68 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 1daaf23e24..9e3fb75ac9 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -50,13 +50,13 @@ junit junit - 4.12 + ${junit.version} test org.slf4j slf4j-simple - 1.7.12 + ${slf4j.version} test diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index fb3edeb171..cc14496c34 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -36,6 +36,7 @@ 1.5.6.RELEASE + 5.1.45 @@ -58,7 +59,7 @@ mysql mysql-connector-java - 5.1.45 + ${mysql.connector.version} net.runelite @@ -68,12 +69,12 @@ org.sql2o sql2o - 1.5.4 + ${sql2o.version} io.minio minio - 3.0.6 + ${minio.version} org.projectlombok diff --git a/cache/pom.xml b/cache/pom.xml index 051e0bbcfc..752cb60a72 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -36,9 +36,11 @@ Cache - 165 - + 1.3.1 + 1.10 4.6 + + 165 @@ -59,7 +61,7 @@ org.apache.commons commons-compress - 1.10 + ${commons.compress.version} com.google.code.gson @@ -68,7 +70,7 @@ io.netty netty-buffer - 4.1.0.Final + ${netty.version} org.antlr @@ -78,7 +80,7 @@ commons-cli commons-cli - 1.3.1 + ${commons.cli.version} org.projectlombok @@ -89,13 +91,13 @@ junit junit - 4.12 + ${junit.version} test org.slf4j slf4j-simple - 1.7.12 + ${slf4j.version} test diff --git a/http-api/pom.xml b/http-api/pom.xml index bdebfd7020..74f8138ef3 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -35,6 +35,10 @@ http-api + 1.4 + + 2.2.6 + nogit false @@ -43,7 +47,7 @@ com.squareup.okhttp3 okhttp - 3.7.0 + ${okhttp3.version} com.google.code.gson @@ -61,25 +65,25 @@ org.apache.commons commons-csv - 1.4 + ${commons.csv.version} junit junit - 4.12 + ${junit.version} test org.slf4j slf4j-simple - 1.7.12 + ${slf4j.version} test com.squareup.okhttp3 mockwebserver - 3.7.0 + ${okhttp3.version} test @@ -95,7 +99,7 @@ pl.project13.maven git-commit-id-plugin - 2.2.5 + ${maven.git.commit.id.version} query-git-info diff --git a/http-service/pom.xml b/http-service/pom.xml index c12a91fa11..373f055930 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -38,6 +38,12 @@ 1.5.6.RELEASE 1.2.0.Final + 2.2.3 + 3.10.1 + 4.1.0 + 3.1.8 + 2.10.0 + 2.3.1 @@ -85,13 +91,13 @@ org.mariadb.jdbc mariadb-java-client - 2.2.3 + ${maria.java.client.version} provided org.sql2o sql2o - 1.5.4 + ${sql2o.version} com.google.guava @@ -104,17 +110,17 @@ com.github.scribejava scribejava-apis - 4.1.0 + ${scribejava.apis.version} io.minio minio - 3.0.6 + ${minio.version} redis.clients jedis - 2.10.0 + ${redis.clients.version} org.apache.commons @@ -125,7 +131,7 @@ org.mongodb mongodb-driver-sync - 3.10.1 + ${mongodb.driver.version} @@ -136,7 +142,7 @@ com.squareup.okhttp3 mockwebserver - 3.7.0 + ${okhttp3.version} test @@ -188,13 +194,13 @@ com.github.kongchen swagger-maven-plugin - 3.1.8 + ${swagger.maven.plugin.version} javax.xml.bind jaxb-api - 2.3.1 + ${jaxb.api.version} diff --git a/pom.xml b/pom.xml index 0d505fccac..af359595ab 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,25 @@ UTF-8 1.8 1.18.4 + 8.3 + 1.2.3 + 2.8.5 + 23.2-jre + 4.12 + 1.7.12 + 4.1.0.Final + 1.10.19 + 1.5.4 + 3.0.6 + 3.7.0 + 0.7 + + 3.1.1 + 3.8.0 + 3.0.0 + 3.1.0 + 2.5.3 + 2.22.1 true true @@ -131,7 +150,7 @@ com.google.guava guava - 23.2-jre + ${guava.version} org.projectlombok @@ -142,12 +161,12 @@ com.google.code.gson gson - 2.8.5 + ${gson.version} ch.qos.logback logback-parent - 1.2.3 + ${logback.version} pom import @@ -159,7 +178,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.6.1 + ${maven.compiler.plugin.version} ${java.version} ${java.version} @@ -168,24 +187,24 @@ org.apache.maven.plugins maven-surefire-plugin - - 2.18 + ${maven.surefire-plugin.version} true -Xmx512m + false org.apache.maven.plugins maven-release-plugin - 2.5.3 + ${maven.release.plugin.version} org.apache.maven.plugins maven-javadoc-plugin - 3.0.0-M1 + ${maven.javadoc.plugin.version} 8 @@ -202,12 +221,12 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.17 + ${maven.checkstyle.plugin.version} com.puppycrawl.tools checkstyle - 8.3 + ${checkstyle.version} @@ -222,14 +241,16 @@ checkstyle.xml - ${project.build.sourceDirectory} + + ${project.build.sourceDirectory} + true io.github.zlika reproducible-build-maven-plugin - 0.7 + ${zlika.reproducible.build.maven.plugin.version} @@ -246,12 +267,12 @@ org.apache.maven.plugins maven-jar-plugin - 3.0.2 + ${maven.jar.plugin.version} org.apache.maven.plugins maven-compiler-plugin - 3.6.1 + ${maven.compiler.plugin.version} diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index 09b1d2c28c..41b70cb0c9 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -58,7 +58,7 @@ junit junit - 4.12 + ${junit.version} test diff --git a/protocol/pom.xml b/protocol/pom.xml index 8416894b5e..5938a0deef 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -54,7 +54,7 @@ io.netty netty-all - 4.1.0.Final + ${netty.version} org.projectlombok @@ -65,7 +65,7 @@ junit junit - 4.12 + ${junit.version} test diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 00117b581e..d44e2bdaff 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -35,6 +35,10 @@ runelite-api RuneLite API + + 1.3.9 + + org.slf4j @@ -48,13 +52,13 @@ com.google.code.findbugs jsr305 - 1.3.9 + ${jsr305.version} junit junit - 4.12 + ${junit.version} test diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index b3d4ab64fc..8eb433fef7 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -38,6 +38,18 @@ 4.1.0 2.3.2 + 1.3 + 5.0.1 + 1.2 + 1.0 + 4.5.1 + 8.0.02 + 1.5.00 + 1.1 + 1.0 + 3.1.0 + 3.0.0 + 3.2.1 true @@ -54,7 +66,7 @@ net.sf.jopt-simple jopt-simple - 5.0.1 + ${jopt.version} com.google.guava @@ -73,12 +85,12 @@ net.runelite.pushingpixels substance - 8.0.02 + ${runelite.pushingpixels.substance.version} net.runelite.pushingpixels trident - 1.5.00 + ${runelite.pushingpixels.trident.version} runtime @@ -89,7 +101,7 @@ org.apache.commons commons-text - 1.2 + ${commons.text.version} org.jogamp.jogl @@ -160,7 +172,7 @@ io.sigpipe jbsdiff - 1.0 + ${sigpipe.jbsdiff.version} org.tukaani @@ -172,12 +184,12 @@ net.java.dev.jna jna - 4.5.1 + ${java.dev.jna.version} net.java.dev.jna jna-platform - 4.5.1 + ${java.dev.jna.version} @@ -205,31 +217,31 @@ net.runelite discord - 1.1 + ${runelite.discord.version} net.runelite orange-extensions - 1.0 + ${runelite.orange.extensions.version} provided junit junit - 4.12 + ${junit.version} test org.hamcrest hamcrest-library - 1.3 + ${hamcrest.version} test org.mockito mockito-all - 1.10.19 + ${mockito.version} test @@ -267,7 +279,7 @@ org.apache.maven.plugins maven-resources-plugin - 3.0.2 + ${maven.resources.plugin.version} ttf @@ -279,7 +291,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.0.0 + ${maven.shade.plugin.version} package @@ -355,7 +367,7 @@ org.apache.maven.plugins maven-jarsigner-plugin - 1.4 + ${maven.jarsigner.plugin.version} sign diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml index 747256e0ed..f621363afa 100644 --- a/runelite-mixins/pom.xml +++ b/runelite-mixins/pom.xml @@ -35,6 +35,10 @@ mixins RuneLite Mixins + + 1 + + org.slf4j @@ -55,20 +59,20 @@ javax.inject javax.inject - 1 + ${javax.inject.version} provided junit junit - 4.12 + ${junit.version} test org.mockito mockito-all - 1.10.19 + ${mockito.version} test diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 2ee5a13a39..8459e3af01 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -36,6 +36,12 @@ Script Assembler Plugin maven-plugin + + 3.6.1 + 3.6.0 + 3.6.0 + + net.runelite @@ -51,12 +57,12 @@ org.apache.maven maven-plugin-api - 3.0.5 + ${maven.plugin.api.version} org.apache.maven.plugin-tools maven-plugin-annotations - 3.4 + ${maven.plugin.annotations.version} @@ -65,7 +71,7 @@ org.apache.maven.plugins maven-plugin-plugin - 3.4 + ${maven.plugin.plugin.version} default-descriptor diff --git a/scripts/pom.xml b/scripts/pom.xml index 7898c2e8fb..e033f3d764 100644 --- a/scripts/pom.xml +++ b/scripts/pom.xml @@ -31,12 +31,16 @@ 1.0.0 Scripts + + 2.12 + + org.apache.maven.wagon wagon-webdav-jackrabbit - 2.12 + ${webdav.version}