From eda2ea0dda868ef9e46066067137feeb51ad277b Mon Sep 17 00:00:00 2001 From: 4drian3d Date: Sun, 5 Sep 2021 16:24:07 -0500 Subject: [PATCH 1/2] changes --- pom.xml | 14 ++++++++++++++ proxy/pom.xml | 10 ++++++++++ spigot/pom.xml | 10 ++++++++++ 3 files changed, 34 insertions(+) diff --git a/pom.xml b/pom.xml index 684c7c4..cd9d85e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.8.1 16 16 @@ -51,6 +52,19 @@ com.glyart.authmevelocity.libs.simplixstorage + + + + + + + *:* + + META-INF/maven/ + META-INF/*.MF + + + diff --git a/proxy/pom.xml b/proxy/pom.xml index d5abaef..d4fc845 100644 --- a/proxy/pom.xml +++ b/proxy/pom.xml @@ -36,4 +36,14 @@ compile + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + diff --git a/spigot/pom.xml b/spigot/pom.xml index e19bd4c..d466ae6 100644 --- a/spigot/pom.xml +++ b/spigot/pom.xml @@ -42,4 +42,14 @@ provided + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.2.0 + + + From 39fa5bb78b87fb5246f8e4bd1a0083d73dcb5d8b Mon Sep 17 00:00:00 2001 From: 4drian3d Date: Sun, 5 Sep 2021 16:29:50 -0500 Subject: [PATCH 2/2] Action changes --- .github/workflows/maven.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a7aeccf..3b66e79 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -4,33 +4,26 @@ on: [push, pull_request] jobs: build: - runs-on: ubuntu-latest steps: - name: Checkout Repository uses: actions/checkout@v2 - + - name: Set up JDK 16 - uses: actions/setup-java@v2 + uses: actions/setup-java@v2.3.0 with: java-version: 16 - distribution: 'adopt' - - - name: Cache Maven packages - uses: actions/cache@v2.1.6 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + distribution: 'temurin' + cache: 'maven' - name: Build with Maven uses: nick-invision/retry@v2 with: timeout_minutes: 5 - max_attempts: 3 + max_attempts: 2 command: mvn -B package --file pom.xml - + - name: Upload artifact uses: actions/upload-artifact@v2.2.4 with: