From 041676eaef5c8b5793adf3429fbc488186894e29 Mon Sep 17 00:00:00 2001 From: tesshucom <webmaster@tesshu.com> Date: Fri, 26 Mar 2021 12:12:30 +0900 Subject: [PATCH] Delete unnecessary profiles (#920) --- .github/CONTRIBUTING.md | 2 +- .github/workflows/ci.yml | 4 ++-- pom.xml | 28 ---------------------------- 3 files changed, 3 insertions(+), 31 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 6ca0714858..cd155f753b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -57,7 +57,7 @@ $ mvn clean package -Dmaven.test.skip=true -Dpmd.skip=true -Pjetty-embed When using the Java 15 compiler and JVM: ``` -$ mvn clean package -Dmaven.test.skip=true -Dpmd.skip=true -Pjetty-embed -Prelease15 +$ mvn clean package -Dmaven.test.skip=true -Dpmd.skip=true -Pjetty-embed -Dmaven.compiler.release=15 ``` See [the documentation](https://tesshu.com/update/how-to-compile-jpsonic) for more information. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 34b32b0929..4d30a625c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -114,7 +114,7 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Verify with Maven - run: mvn clean verify -B -Prelease${{ matrix.java }} -Punit-test + run: mvn clean verify -B -Dmaven.compiler.release=${{ matrix.java }} -Punit-test ########################################################################## package: if: github.ref == 'refs/heads/master' @@ -148,7 +148,7 @@ jobs: gpg --quiet --import ~/.gnupg/private.key - name: Create jetty.war run: | - mvn clean package -Dmaven.test.skip=true -Dpmd.skip=true -Pjetty-embed -Prelease${{ matrix.java }} + mvn clean package -Dmaven.test.skip=true -Dpmd.skip=true -Pjetty-embed -Dmaven.compiler.release${{ matrix.java }} gpg2 --clearsign jpsonic-main/target/artifacts-checksums.sha - name: Copy README # Due to the specifications of actions/upload-artifact@v2. diff --git a/pom.xml b/pom.xml index 73e771f7b2..ef5eaf7ea1 100644 --- a/pom.xml +++ b/pom.xml @@ -796,34 +796,6 @@ </plugins> </reporting> <profiles> - <profile> - <id>release12</id> - <properties> - <maven.compiler.release>12</maven.compiler.release> - <compile.version>12</compile.version> - </properties> - </profile> - <profile> - <id>release13</id> - <properties> - <maven.compiler.release>13</maven.compiler.release> - <compile.version>13</compile.version> - </properties> - </profile> - <profile> - <id>release14</id> - <properties> - <maven.compiler.release>14</maven.compiler.release> - <compile.version>14</compile.version> - </properties> - </profile> - <profile> - <id>release15</id> - <properties> - <maven.compiler.release>15</maven.compiler.release> - <compile.version>15</compile.version> - </properties> - </profile> <profile> <id>unit-test</id> <modules>